[android] Customized the google button in auth dialog

7 files changed, 27 insertions, 5 deletions

diff --git a/android/res/drawable-hdpi/ic_google.png b/android/res/drawable-hdpi/ic_google.png
new file mode 100644
index 0000000000..5637b47ba2
--- /dev/null
+++ b/android/res/drawable-hdpi/ic_google.png
diff --git a/android/res/drawable-mdpi/ic_google.png b/android/res/drawable-mdpi/ic_google.png
new file mode 100644
index 0000000000..7182fcf8a2
--- /dev/null
+++ b/android/res/drawable-mdpi/ic_google.png
diff --git a/android/res/drawable-xhdpi/ic_google.png b/android/res/drawable-xhdpi/ic_google.png
new file mode 100644
index 0000000000..7c781d0f6b
--- /dev/null
+++ b/android/res/drawable-xhdpi/ic_google.png
diff --git a/android/res/drawable-xxhdpi/ic_google.png b/android/res/drawable-xxhdpi/ic_google.png
new file mode 100644
index 0000000000..d42069264e
--- /dev/null
+++ b/android/res/drawable-xxhdpi/ic_google.png
diff --git a/android/res/drawable-xxxhdpi/ic_google.png b/android/res/drawable-xxxhdpi/ic_google.png
new file mode 100644
index 0000000000..84239c0a38
--- /dev/null
+++ b/android/res/drawable-xxxhdpi/ic_google.png
diff --git a/android/res/drawable/button_transparent_with_border.xml b/android/res/drawable/button_transparent_with_border.xml
new file mode 100644
index 0000000000..863460dc93
--- /dev/null
+++ b/android/res/drawable/button_transparent_with_border.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+  <corners android:radius="@dimen/button_small_corner_radius"/>
+  <solid android:color="@android:color/transparent"/>
+  <stroke android:color="@color/divider" android:width="@dimen/divider_width"/>
+</shape>
diff --git a/android/res/layout/fragment_auth_passport_dialog.xml b/android/res/layout/fragment_auth_passport_dialog.xml
index a8d023bb4b..74b892d7a9 100644
--- a/android/res/layout/fragment_auth_passport_dialog.xml
+++ b/android/res/layout/fragment_auth_passport_dialog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
   android:orientation="vertical"
@@ -20,19 +21,33 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/margin_half_plus_eight"
     android:textAppearance="@style/MwmTextAppearance.Body3"
-    android:text="@string/profile_authorization_message"
-    />
-  <com.google.android.gms.common.SignInButton
+    android:text="@string/profile_authorization_message"/>
+  <TextView
     android:id="@+id/google_button"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:foreground="?clickableBackground"
+    android:background="@drawable/button_transparent_with_border"
+    android:drawableStart="@drawable/ic_google"
+    android:drawableLeft="@drawable/ic_google"
+    android:paddingLeft="@dimen/margin_half_plus"
+    android:paddingStart="@dimen/margin_half_plus"
+    android:paddingRight="@dimen/margin_base_plus"
+    android:paddingEnd="@dimen/margin_base_plus"
+    android:textAppearance="@style/MwmTextAppearance.Body3.Primary"
+    android:fontFamily="@string/robotoMedium"
+    android:text="@string/google"
+    android:gravity="center"
     android:minHeight="@dimen/height_primary_button"
-    android:layout_marginTop="@dimen/margin_base"/>
+    android:layout_marginTop="@dimen/margin_base"
+    tools:targetApi="jelly_bean"/>
   <com.facebook.login.widget.LoginButton
     xmlns:fb="http://schemas.android.com/apk/res-auto"
     android:id="@+id/facebook_button"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/height_primary_button"
+    android:layout_height="wrap_content"
+    android:minHeight="@dimen/height_primary_button"
+    android:foreground="?clickableBackground"
     android:layout_marginTop="@dimen/margin_base"
     android:textSize="@dimen/text_size_body_3"
     fb:com_facebook_login_text="@string/facebook"
@@ -52,6 +67,7 @@
     android:textAppearance="@style/MwmTextAppearance.Button"
     android:textColor="?accentButtonTextColor"
     android:background="?accentButtonBackground"
+    android:foreground="?clickableBackground"
     android:gravity="center"
     android:text="@string/phone_number"/>
 </LinearLayout>