diff options
Diffstat (limited to 'java/com/android/dialer/dialpadview/res/layout')
3 files changed, 3 insertions, 113 deletions
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_chooser_list_item.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_chooser_list_item.xml deleted file mode 100644 index e00529614..000000000 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_chooser_list_item.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!-- Layout of a single item in the Dialer's "Dialpad chooser" UI. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal"> - - <ImageView - android:id="@+id/icon" - android:layout_width="64dp" - android:layout_height="64dp" - android:scaleType="center"/> - - <TextView - android:id="@+id/text" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/dialpad_primary_text_color"/> - -</LinearLayout> diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml deleted file mode 100644 index 2f62e1407..000000000 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<view xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - class="com.android.dialer.dialpadview.DialpadFragment$DialpadSlidingRelativeLayout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <LinearLayout - android:layout_width="match_parent" - 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/floating_action_button_margin_bottom" - android:layout_alignParentBottom="true"/> - - <android.support.design.widget.FloatingActionButton - android:id="@+id/dialpad_floating_action_button" - 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" - android:contentDescription="@string/description_dial_button" - android:src="@drawable/quantum_ic_call_vd_theme_24" - app:backgroundTint="@color/dialpad_fab_green" - app:colorControlNormal="#ffffff" - app:elevation="@dimen/floating_action_button_translation_z"/> -</view> diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml index 4401c5bbd..88594401f 100644 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml +++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml @@ -18,8 +18,7 @@ android:id="@+id/one" style="@style/DialpadKeyButtonStyle"> <LinearLayout - android:layout_marginTop="1dp" - style="@style/DialpadKeyInternalLayoutStyle"> + style="@style/DialpadKeyInternalLayoutStyle"> <com.android.dialer.dialpadview.DialpadTextView android:id="@+id/dialpad_key_number" style="@style/DialpadKeyNumberStyle"/> @@ -29,8 +28,9 @@ <ImageView android:id="@+id/dialpad_key_voicemail" android:layout_width="wrap_content" - android:layout_height="@dimen/dialpad_voicemail_icon_size" + android:layout_height="wrap_content" android:layout_centerInParent="true" + android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top" android:scaleType="fitCenter" android:src="@drawable/quantum_ic_voicemail_white_24" android:tint="?attr/dialpad_voicemail_tint"/> |