diff options
author | wangqi <wangqi@google.com> | 2018-03-20 10:37:13 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-03-20 11:06:21 -0700 |
commit | 96d7d2247bd36938133d4b9cd540f75ddfb31184 (patch) | |
tree | 85c831eaed6cc439dd2052d68c690f72f77a3f37 /java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml | |
parent | 9bc97d1d423599e1c56a59537349b0a097865557 (diff) |
Fix animation of first time showing dialpad FAB.
In order to correctly show animation, we have to ensure:
1. fab.scaleIn() is not called before dialpad is slide up.
2. fab is invisible before scaleIn is called.
Caveat:
This change is not tested on old UI (DialtactsActivity) since it's deprecated.
Test: manual
PiperOrigin-RevId: 189765153
Change-Id: Iada96b2789f96ca1612ae2048020a649f8b57b6b
Diffstat (limited to 'java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml')
-rw-r--r-- | java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml | 59 |
1 files changed, 30 insertions, 29 deletions
diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml index 6389853d9..a2fbbab18 100644 --- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml +++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml @@ -20,33 +20,33 @@ android:layout_height="wrap_content"> <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> <!-- spacer view --> <View - android:id="@+id/spacer" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="4" - android:background="#00000000"/> + android:id="@+id/spacer" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="4" + android:background="#00000000"/> <!-- Dialpad shadow --> <View - android:layout_width="@dimen/shadow_length" - android:layout_height="match_parent" - android:background="@drawable/shadow_fade_left"/> + android:layout_width="@dimen/shadow_length" + android:layout_height="match_parent" + android:background="@drawable/shadow_fade_left"/> <RelativeLayout - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="6"> + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="6"> <include - layout="@layout/dialpad_view" - android:layout_width="match_parent" - android:layout_height="match_parent"/> + layout="@layout/dialpad_view" + android:layout_width="match_parent" + android:layout_height="match_parent"/> <!-- "Dialpad chooser" UI, shown only when the user brings up the Dialer while a call is already in progress. @@ -54,18 +54,18 @@ (the textfield/button and the dialpad) are hidden. --> <ListView - android:id="@+id/dialpadChooser" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/background_dialer_light" - android:visibility="gone"/> + android:id="@+id/dialpadChooser" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/background_dialer_light" + android:visibility="gone"/> <!-- Margin bottom and alignParentBottom don't work well together, so use a Space instead. --> <Space - android:id="@+id/dialpad_floating_action_button_margin_bottom" - android:layout_width="match_parent" - android:layout_height="@dimen/floating_action_button_margin_bottom" - android:layout_alignParentBottom="true"/> + android:id="@+id/dialpad_floating_action_button_margin_bottom" + android:layout_width="match_parent" + android:layout_height="@dimen/floating_action_button_margin_bottom" + android:layout_alignParentBottom="true"/> <android.support.design.widget.FloatingActionButton android:id="@+id/dialpad_floating_action_button" @@ -73,10 +73,11 @@ android:layout_height="@dimen/floating_action_button_height" android:layout_above="@id/dialpad_floating_action_button_margin_bottom" android:layout_centerHorizontal="true" - android:src="@drawable/quantum_ic_call_white_24" android:contentDescription="@string/description_dial_button" - app:elevation="@dimen/floating_action_button_translation_z" - app:backgroundTint="@color/dialpad_fab_green"/> + android:src="@drawable/quantum_ic_call_white_24" + android:visibility="invisible" + app:backgroundTint="@color/dialpad_fab_green" + app:elevation="@dimen/floating_action_button_translation_z"/> </RelativeLayout> </LinearLayout> </view> |