diff options
author | Andrew Lee <anwlee@google.com> | 2014-08-20 15:02:16 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-09-02 15:15:21 -0700 |
commit | 405a6e6822fb19a9d14329da92e03e75e2e72703 (patch) | |
tree | 71c5c7db40e52be5c4ba89b1addbc24693f19598 /res | |
parent | 3186c3723e143be8c0ab9389118f695ea7c183b4 (diff) |
Use different FAB for dialpad, and use new animations.
+ Use scaleIn/scaleOut for FABs in the Dialer application.
+ Add assets for green fab.
+ Update dialpad fragment, both the Java and layouts, to have their
own FAB containers and FABs.
+ Change DialpadSlidingLinearLayout into
DialpadSlidingRelativeLayout.
- Removed or relocated dial some FAB handling, visibility, and
translation functions. Now that the FABs in the dialpad fragment
and DialtactsActivity are distinct, the logic can be scoped more
precisely to a particular fragment/view.
Bug: 16399233
Change-Id: I86f9f0053dc3c50fe0d5046389632af7ddff9f67
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/fab_green.png | bin | 0 -> 2798 bytes | |||
-rw-r--r-- | res/drawable-mdpi/fab_green.png | bin | 0 -> 1845 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/fab_green.png | bin | 0 -> 4092 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/fab_green.png | bin | 0 -> 7004 bytes | |||
-rw-r--r-- | res/drawable-xxxhdpi/fab_green.png | bin | 0 -> 9900 bytes | |||
-rw-r--r-- | res/drawable/floating_action_button.xml | 4 | ||||
-rw-r--r-- | res/layout-land/dialpad_fragment.xml | 98 | ||||
-rw-r--r-- | res/layout/dialpad_fragment.xml | 75 | ||||
-rw-r--r-- | res/layout/dialtacts_activity.xml | 13 |
9 files changed, 132 insertions, 58 deletions
diff --git a/res/drawable-hdpi/fab_green.png b/res/drawable-hdpi/fab_green.png Binary files differnew file mode 100644 index 000000000..ff9753c18 --- /dev/null +++ b/res/drawable-hdpi/fab_green.png diff --git a/res/drawable-mdpi/fab_green.png b/res/drawable-mdpi/fab_green.png Binary files differnew file mode 100644 index 000000000..947aac142 --- /dev/null +++ b/res/drawable-mdpi/fab_green.png diff --git a/res/drawable-xhdpi/fab_green.png b/res/drawable-xhdpi/fab_green.png Binary files differnew file mode 100644 index 000000000..e8bab3fec --- /dev/null +++ b/res/drawable-xhdpi/fab_green.png diff --git a/res/drawable-xxhdpi/fab_green.png b/res/drawable-xxhdpi/fab_green.png Binary files differnew file mode 100644 index 000000000..7e4fd3e49 --- /dev/null +++ b/res/drawable-xxhdpi/fab_green.png diff --git a/res/drawable-xxxhdpi/fab_green.png b/res/drawable-xxxhdpi/fab_green.png Binary files differnew file mode 100644 index 000000000..aa8849e86 --- /dev/null +++ b/res/drawable-xxxhdpi/fab_green.png diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml index cbbfb8542..e5ae14a2b 100644 --- a/res/drawable/floating_action_button.xml +++ b/res/drawable/floating_action_button.xml @@ -16,6 +16,4 @@ --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="@color/floating_action_button_touch_tint"> - <item android:drawable="@drawable/fab_blue" /> -</ripple> + android:color="@color/floating_action_button_touch_tint" />
\ No newline at end of file diff --git a/res/layout-land/dialpad_fragment.xml b/res/layout-land/dialpad_fragment.xml index aac0daf3b..680c2d770 100644 --- a/res/layout-land/dialpad_fragment.xml +++ b/res/layout-land/dialpad_fragment.xml @@ -13,35 +13,75 @@ See the License for the specific language governing permissions and limitations under the License. --> -<view class="com.android.dialer.dialpad.DialpadFragment$DialpadSlidingLinearLayout" +<view class="com.android.dialer.dialpad.DialpadFragment$DialpadSlidingRelativeLayout" xmlns:android="http://schemas.android.com/apk/res/android" 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="1" - android:background="#00000000" /> - <!-- Dialpad shadow --> - <View - android:layout_width="@dimen/shadow_length" - android:layout_height="match_parent" - android:background="@drawable/shadow_fade_left" /> - <include layout="@layout/dialpad_view" - android:layout_height="match_parent" - android:layout_width="0dp" - android:layout_weight="1" /> - <!-- "Dialpad chooser" UI, shown only when the user brings up the - Dialer while a call is already in progress. - When this UI is visible, the other Dialer elements - (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:layout_height="wrap_content"> + + <LinearLayout + 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="1" + android:background="#00000000" /> + + <!-- Dialpad shadow --> + <View + android:layout_width="@dimen/shadow_length" + android:layout_height="match_parent" + android:background="@drawable/shadow_fade_left" /> + + <RelativeLayout + android:layout_height="match_parent" + android:layout_width="0dp" + android:layout_weight="1"> + + <include layout="@layout/dialpad_view" + android:layout_height="match_parent" + android:layout_width="match_parent" /> + + <!-- "Dialpad chooser" UI, shown only when the user brings up the + Dialer while a call is already in progress. + When this UI is visible, the other Dialer elements + (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" /> + + <!-- 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="8dp" + android:layout_alignParentBottom="true" /> + + <FrameLayout + android:id="@+id/dialpad_floating_action_button_container" + android:background="@drawable/fab_green" + android:layout_width="@dimen/floating_action_button_width" + android:layout_height="@dimen/floating_action_button_height" + android:layout_above="@id/dialpad_floating_action_button_margin_bottom" + android:layout_centerHorizontal="true"> + + <ImageButton + android:id="@+id/dialpad_floating_action_button" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/floating_action_button" + android:contentDescription="@string/description_dial_button" + android:src="@drawable/fab_ic_call"/> + + </FrameLayout> + + </RelativeLayout> + + </LinearLayout> </view> diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml index 01bbecc00..21cb58654 100644 --- a/res/layout/dialpad_fragment.xml +++ b/res/layout/dialpad_fragment.xml @@ -13,31 +13,64 @@ See the License for the specific language governing permissions and limitations under the License. --> -<view class="com.android.dialer.dialpad.DialpadFragment$DialpadSlidingLinearLayout" +<view class="com.android.dialer.dialpad.DialpadFragment$DialpadSlidingRelativeLayout" xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" > - <!-- spacer view --> - <View - android:id="@+id/spacer" + android:orientation="horizontal"> + + <LinearLayout android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:background="#00000000" /> - <!-- Dialpad shadow --> - <View + android:layout_height="wrap_content" + android:orientation="vertical"> + + <!-- spacer view --> + <View + android:id="@+id/spacer" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:background="#00000000" /> + <!-- Dialpad shadow --> + <View + android:layout_width="match_parent" + android:layout_height="@dimen/shadow_length" + android:background="@drawable/shadow_fade_up" /> + <include layout="@layout/dialpad_view" /> + <!-- "Dialpad chooser" UI, shown only when the user brings up the + Dialer while a call is already in progress. + When this UI is visible, the other Dialer elements + (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" /> + + </LinearLayout> + + <!-- 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/shadow_length" - android:background="@drawable/shadow_fade_up" /> - <include layout="@layout/dialpad_view" /> - <!-- "Dialpad chooser" UI, shown only when the user brings up the - Dialer while a call is already in progress. - When this UI is visible, the other Dialer elements - (the textfield/button and the dialpad) are hidden. --> - <ListView android:id="@+id/dialpadChooser" + android:layout_height="@dimen/floating_action_button_margin_bottom" + android:layout_alignParentBottom="true" /> + + <FrameLayout + android:id="@+id/dialpad_floating_action_button_container" + android:background="@drawable/fab_green" + android:layout_width="@dimen/floating_action_button_width" + android:layout_height="@dimen/floating_action_button_height" + android:layout_above="@id/dialpad_floating_action_button_margin_bottom" + android:layout_centerHorizontal="true"> + + <ImageButton + android:id="@+id/dialpad_floating_action_button" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/background_dialer_light" - android:visibility="gone" /> + android:layout_height="match_parent" + android:background="@drawable/floating_action_button" + android:contentDescription="@string/description_dial_button" + android:src="@drawable/fab_ic_call"/> + + </FrameLayout> + </view> diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml index aa4ce9409..0f1f2bbdb 100644 --- a/res/layout/dialtacts_activity.xml +++ b/res/layout/dialtacts_activity.xml @@ -22,9 +22,8 @@ android:focusable="true" android:focusableInTouchMode="true" android:clipChildren="false" - android:animateLayoutChanges="true" - android:background="@color/background_dialer_light" - > + android:background="@color/background_dialer_light"> + <FrameLayout android:id="@+id/dialtacts_container" android:layout_width="match_parent" @@ -37,22 +36,25 @@ android:id="@+id/dialtacts_frame" android:clipChildren="false" /> </FrameLayout> + <FrameLayout android:id="@+id/floating_action_button_container" + android:background="@drawable/fab_blue" android:layout_width="@dimen/floating_action_button_width" android:layout_height="@dimen/floating_action_button_height" android:layout_marginBottom="@dimen/floating_action_button_margin_bottom" - android:layout_gravity="center_horizontal|bottom" > + android:layout_gravity="center_horizontal|bottom"> <ImageButton android:id="@+id/floating_action_button" + android:background="@drawable/floating_action_button" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/floating_action_button" android:contentDescription="@string/action_menu_dialpad_button" android:src="@drawable/fab_ic_dial"/> </FrameLayout> + <!-- Host container for the contact tile drag shadow --> <FrameLayout android:id="@+id/activity_overlay" @@ -65,4 +67,5 @@ android:visibility="gone" android:importantForAccessibility="no" /> </FrameLayout> + </FrameLayout> |