updaing the version to 5.2.2

payu-intrepos · Oct 7, 2015 · 6207af7 · 6207af7
1 parent 5f25d70
commit 6207af7
Show file tree

Hide file tree

Showing 31 changed files with 249 additions and 249 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.payu.custombrowser"
     android:versionCode="5"
-    android:versionName="5.2.1" >
+    android:versionName="5.2.2" >
 
     <uses-sdk
         android:minSdkVersion="9"

diff --git a/CustomBrowser-release.aar b/CustomBrowser-release.aar
diff --git a/libs/classes.jar b/libs/classes.jar
diff --git a/res/anim/cb_animation.xml b/res/anim/cb_animation.xml
@@ -24,4 +24,4 @@
     </set>
 
 
-</set><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/anim/cb_animation.xml -->
+</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/anim/cb_animation.xml -->
diff --git a/res/anim/cb_face_out.xml b/res/anim/cb_face_out.xml
@@ -8,4 +8,4 @@
         android:toAlpha="0.1"
         android:interpolator="@android:anim/accelerate_interpolator"
         android:duration="500"/>
-</set><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/anim/cb_face_out.xml -->
+</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/anim/cb_face_out.xml -->
diff --git a/res/anim/cb_fade_in.xml b/res/anim/cb_fade_in.xml
@@ -8,4 +8,4 @@
         android:toAlpha="1.0"
         android:interpolator="@android:anim/accelerate_interpolator"
         android:duration="500"/>
-</set><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/anim/cb_fade_in.xml -->
+</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/anim/cb_fade_in.xml -->
diff --git a/res/anim/cb_tranlateup.xml b/res/anim/cb_tranlateup.xml
@@ -9,4 +9,4 @@
         >
 
         </translate>
-</set><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/anim/cb_tranlateup.xml -->
+</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/anim/cb_tranlateup.xml -->
diff --git a/res/anim/cb_translate.xml b/res/anim/cb_translate.xml
@@ -8,4 +8,4 @@
         android:toYDelta="70%"
         android:duration="500" />
 
-</set><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/anim/cb_translate.xml -->
+</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/anim/cb_translate.xml -->
diff --git a/res/color/otp_approve_button_color.xml b/res/color/otp_approve_button_color.xml
@@ -3,4 +3,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/cb_otpDisabledTextColor" />
     <item android:color="@android:color/white"/>
-</selector><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/color/otp_approve_button_color.xml -->
+</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/color/otp_approve_button_color.xml -->
diff --git a/res/drawable-xhdpi/rectangle_box.xml b/res/drawable-xhdpi/rectangle_box.xml
@@ -21,4 +21,4 @@
             <stroke android:color="@color/cb_input_gray" android:width="2dp" />
         </shape>
     </item>
-</selector><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable-xhdpi/rectangle_box.xml -->
+</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable-xhdpi/rectangle_box.xml -->
diff --git a/res/drawable/approve_otp_button.xml b/res/drawable/approve_otp_button.xml
@@ -31,4 +31,4 @@
             <solid android:color="@color/cb_otpColor" />
         </shape>
     </item>
-</selector><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/approve_otp_button.xml -->
+</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/approve_otp_button.xml -->
diff --git a/res/drawable/background_drawable.xml b/res/drawable/background_drawable.xml
@@ -5,4 +5,4 @@
     <corners
         android:radius="0dp"/>
 
-</shape><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/background_drawable.xml -->
+</shape><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/background_drawable.xml -->
diff --git a/res/drawable/cb_edit_text.xml b/res/drawable/cb_edit_text.xml
@@ -20,4 +20,4 @@
             <solid android:color="#f6f6f6" />
         </shape>
     </item>
-</layer-list><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/cb_edit_text.xml -->
+</layer-list><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/cb_edit_text.xml -->
diff --git a/res/drawable/inner_circle.xml b/res/drawable/inner_circle.xml
@@ -4,4 +4,4 @@
     <solid android:angle="360"
         android:color="#1E90FF"/>
     <size android:width="8dp" android:height="8dp"/>
-</shape><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/inner_circle.xml -->
+</shape><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/inner_circle.xml -->
diff --git a/res/drawable/otp_button_selector.xml b/res/drawable/otp_button_selector.xml
@@ -5,4 +5,4 @@
     <item android:drawable="@drawable/otp_icon_large"
         android:state_focused="true" />
     <item android:drawable="@drawable/otp_icon_large" />
-</selector><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/otp_button_selector.xml -->
+</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/otp_button_selector.xml -->
diff --git a/res/drawable/outer_circle.xml b/res/drawable/outer_circle.xml
@@ -9,4 +9,4 @@
         android:color="#FFFFFF"
         />
     <size android:width="8dp" android:height="8dp"/>
-</shape><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/outer_circle.xml -->
+</shape><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/outer_circle.xml -->
diff --git a/res/drawable/pin_button_selector.xml b/res/drawable/pin_button_selector.xml
@@ -5,4 +5,4 @@
     <item android:drawable="@drawable/password_icon_large"
         android:state_focused="true" />
     <item android:drawable="@drawable/password_icon_large" />
-</selector><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/pin_button_selector.xml -->
+</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/pin_button_selector.xml -->
diff --git a/res/drawable/shape_progress.xml b/res/drawable/shape_progress.xml
@@ -11,4 +11,4 @@
         android:left="10dp"
         android:right="10dp"
         android:top="10dp" />
-</shape><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/shape_progress.xml -->
+</shape><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/shape_progress.xml -->
diff --git a/res/layout/bank.xml b/res/layout/bank.xml
@@ -32,9 +32,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textColor="@color/cb_textColor"
-                android:textSize="@dimen/sixteenScaled"
-                android:layout_marginTop="@dimen/eight"
-                android:layout_marginBottom="@dimen/eight"
+                android:textSize="@dimen/cb_sixteenScaled"
+                android:layout_marginTop="@dimen/cb_eight"
+                android:layout_marginBottom="@dimen/cb_eight"
                 android:drawableTop="@drawable/slider"
                 android:gravity="center"/>
         </LinearLayout>
@@ -50,4 +50,4 @@
         </ImageView>-->
 
     </RelativeLayout>
-</LinearLayout><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/bank.xml -->
+</LinearLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/bank.xml -->
diff --git a/res/layout/cb_prog_dialog.xml b/res/layout/cb_prog_dialog.xml
@@ -51,4 +51,4 @@
 
 
 
-</RelativeLayout><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/cb_prog_dialog.xml -->
+</RelativeLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/cb_prog_dialog.xml -->
diff --git a/res/layout/cb_progressdialog.xml b/res/layout/cb_progressdialog.xml
@@ -105,7 +105,7 @@
         android:layout_centerInParent="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/twelve" />
+        android:paddingTop="@dimen/cb_twelve" />
 
 
-</RelativeLayout><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/cb_progressdialog.xml -->
+</RelativeLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/cb_progressdialog.xml -->
diff --git a/res/layout/choose_action.xml b/res/layout/choose_action.xml
@@ -25,9 +25,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textColor="@color/cb_textColor"
-                android:textSize="@dimen/sixteenScaled"
-                android:layout_marginBottom="@dimen/twelve"
-                android:layout_marginTop="@dimen/eight"
+                android:textSize="@dimen/cb_sixteenScaled"
+                android:layout_marginBottom="@dimen/cb_twelve"
+                android:layout_marginTop="@dimen/cb_eight"
                 android:drawableTop="@drawable/slider"
                 android:gravity="center"/>
         </LinearLayout>
@@ -47,18 +47,18 @@
                 android:textStyle="normal"
                 android:textColor="@color/cb_errorRed"
                 android:text="Incorrect OTP!"
-                android:layout_marginBottom="@dimen/four"/>
+                android:layout_marginBottom="@dimen/cb_four"/>
 
             <TextView
                 android:id="@+id/choose_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/authenticate_with"
+                android:text="@string/cb_authenticate_with"
                 android:textColor="@color/cb_dark_grey"
 
                 android:fontFamily="sans-serif-light"
                 android:textSize="18sp"
-                android:layout_marginBottom="@dimen/twelve"
+                android:layout_marginBottom="@dimen/cb_twelve"
                 android:gravity="center"/>
             <LinearLayout
                 android:layout_width="match_parent"
@@ -67,7 +67,7 @@
 
                 <LinearLayout
                     android:orientation="horizontal"
-                    android:layout_marginBottom="@dimen/sixteen"
+                    android:layout_marginBottom="@dimen/cb_sixteen"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
@@ -109,7 +109,7 @@
                             android:textSize="13sp"
                             android:layout_gravity="right"
                             android:layout_centerInParent="true"
-                            android:text="@string/sms_otp"
+                            android:text="@string/cb_sms_otp"
                             android:textColor="@color/cb_textColor"
                             android:textStyle="bold"
                             android:drawableTop="@drawable/otp_button_selector"/>
@@ -139,9 +139,9 @@
                             android:layout_width="wrap_content"
                             android:layout_height="30dp"
                             android:gravity="center_vertical"
-                            android:textSize="@dimen/twelveScaled"
+                            android:textSize="@dimen/cb_twelveScaled"
                             android:textColor="@color/cb_textColor"
-                            android:drawablePadding="@dimen/four"
+                            android:drawablePadding="@dimen/cb_four"
                             android:textStyle="bold"
                             android:layout_marginLeft="5dp"
                             android:drawableRight="@drawable/trusticon"
@@ -153,20 +153,20 @@
                             android:text="Powered by"
                             android:gravity="center_vertical"
                             android:textColor="@color/cb_textColor"
-                            android:drawablePadding="@dimen/four"
-                            android:layout_marginLeft="@dimen/four"
+                            android:drawablePadding="@dimen/cb_four"
+                            android:layout_marginLeft="@dimen/cb_four"
                             android:textStyle="normal"
 
                             />
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:gravity="center"
-                            android:textSize="@dimen/twelveScaled"
+                            android:textSize="@dimen/cb_twelveScaled"
                             android:textColor="@color/cb_textColor"
-                            android:drawablePadding="@dimen/four"
+                            android:drawablePadding="@dimen/cb_four"
                             android:textStyle="bold"
-                            android:layout_marginLeft="@dimen/four"
+                            android:layout_marginLeft="@dimen/cb_four"
                             android:drawableLeft="@drawable/logo_payu"
                             />
                     </LinearLayout>
@@ -189,4 +189,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</LinearLayout><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/choose_action.xml -->
+</LinearLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/choose_action.xml -->
diff --git a/res/layout/error_page.xml b/res/layout/error_page.xml
@@ -37,15 +37,15 @@
            android:layout_weight="1">
            </View>
     <Button
-        android:text="@string/b_cancel"
+        android:text="@string/cb_b_cancel"
         android:id="@+id/cancel"
         android:layout_width="150dp"
         android:layout_height="36dp"
         android:background="@drawable/approve_otp_button"
-        style="@style/approve_otp"
+        style="@style/cb_approve_otp"
         android:textSize="12sp"
-        android:paddingRight="@dimen/eight"
-        android:paddingLeft="@dimen/eight"
+        android:paddingRight="@dimen/cb_eight"
+        android:paddingLeft="@dimen/cb_eight"
         android:textStyle="bold"/>
      <!--  <View
            android:layout_width="0dp"
@@ -70,4 +70,4 @@
        </View>
    </LinearLayout>
 
-</LinearLayout><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/error_page.xml -->
+</LinearLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/error_page.xml -->
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,4 +24,4 @@
		</set>


		</set><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/anim/cb_animation.xml -->
		</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/anim/cb_animation.xml -->
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,4 +51,4 @@



		</RelativeLayout><!-- From: file:/Users/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/cb_prog_dialog.xml -->
		</RelativeLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/cb_prog_dialog.xml -->