diff options
author | Александр Зацепин <az@mapswithme.com> | 2017-07-31 13:31:55 +0300 |
---|---|---|
committer | Roman Kuznetsov <r.kuznetsow@gmail.com> | 2017-07-31 13:51:38 +0300 |
commit | 32735b3f4ce4270e23f73e30f4e52e71156fc54c (patch) | |
tree | 9a872689e2771a65f6cd5643e7b7e7bb4898c12c | |
parent | 507365cc548a1acc61f137f8347fd4189b5361aa (diff) |
[android] Remove google buttonbeta-941
-rw-r--r-- | android/res/layout/fragment_auth_editor.xml | 25 | ||||
-rw-r--r-- | android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java | 6 |
2 files changed, 3 insertions, 28 deletions
diff --git a/android/res/layout/fragment_auth_editor.xml b/android/res/layout/fragment_auth_editor.xml index 0aa98cb564..dabea940cb 100644 --- a/android/res/layout/fragment_auth_editor.xml +++ b/android/res/layout/fragment_auth_editor.xml @@ -115,27 +115,6 @@ tools:ignore="ButtonStyle"> <Button - android:id="@+id/login_google" - android:layout_width="0dp" - android:layout_height="@dimen/editor_auth_btn_height" - android:layout_marginBottom="@dimen/margin_half_plus" - android:layout_marginEnd="@dimen/margin_half_plus" - android:layout_marginRight="@dimen/margin_half_plus" - android:layout_weight="1" - android:background="@drawable/button_editor_light" - android:drawableLeft="@drawable/ic_login_google" - android:drawableStart="@drawable/ic_login_google" - android:fontFamily="@string/robotoMedium" - android:paddingLeft="@dimen/margin_half" - android:paddingStart="@dimen/margin_half" - android:paddingRight="@dimen/margin_half" - android:paddingEnd="@dimen/margin_half" - android:text="@string/google" - android:textAppearance="@style/MwmTextAppearance.Body1" - android:textColor="@color/text_dark" - tools:targetApi="jelly_bean"/> - - <Button android:id="@+id/login_facebook" android:layout_width="0dp" android:layout_height="@dimen/editor_auth_btn_height" @@ -147,8 +126,8 @@ android:fontFamily="@string/robotoMedium" android:paddingLeft="@dimen/margin_half" android:paddingStart="@dimen/margin_half" - android:paddingRight="@dimen/margin_half" - android:paddingEnd="@dimen/margin_half" + android:paddingRight="@dimen/margin_double" + android:paddingEnd="@dimen/margin_double" android:text="@string/facebook" android:textAppearance="@style/MwmTextAppearance.Body1.Light" android:textColor="@color/text_light" diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java b/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java index 8023e0ae8b..31e04ccd93 100644 --- a/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java +++ b/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java @@ -35,7 +35,7 @@ public abstract class OsmAuthFragmentDelegate implements View.OnClickListener public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { - for (@IdRes int childId : new int[] {R.id.login_osm, R.id.login_facebook, R.id.login_google, R.id.register}) + for (@IdRes int childId : new int[] {R.id.login_osm, R.id.login_facebook, R.id.register}) { final View v = view.findViewById(childId); if (v != null) @@ -57,10 +57,6 @@ public abstract class OsmAuthFragmentDelegate implements View.OnClickListener Statistics.INSTANCE.trackAuthRequest(OsmOAuth.AuthType.FACEBOOK); loginWebview(OsmOAuth.AuthType.FACEBOOK); break; - case R.id.login_google: - Statistics.INSTANCE.trackAuthRequest(OsmOAuth.AuthType.GOOGLE); - loginWebview(OsmOAuth.AuthType.GOOGLE); - break; case R.id.register: Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_REG_REQUEST); register(); |