diff options
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 | ||||
| -rw-r--r-- | res/values/strings.xml | 8 | ||||
| -rw-r--r-- | res/values/styles.xml | 1 |
11 files changed, 138 insertions, 61 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> diff --git a/res/values/strings.xml b/res/values/strings.xml index f9bd79e0c..a59ea4741 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -17,12 +17,14 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- Directory partition name --> + + <!-- Application name used in Settings/Apps. Default label for activities + that don't specify a label. --> <string name="applicationLabel">Dialer</string> <!-- Title for the activity that dials the phone. This is the name - used in the Launcher icon. --> - <string name="launcherDialer">Phone</string> + used in the Launcher icon. --> + <string name="launcherActivityLabel">Phone</string> <!-- The description text for the dialer tab. diff --git a/res/values/styles.xml b/res/values/styles.xml index 9d0fcd0ea..74a5231f9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -76,6 +76,7 @@ <item name="android:colorPrimary">@color/dialer_theme_color</item> <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item> <item name="dialpad_key_button_touch_tint">@color/dialer_dialpad_touch_tint</item> + <item name="android:colorControlActivated">@color/dialer_theme_color</item> </style> <!-- Action bar overflow menu icon. --> |
