diff options
Diffstat (limited to 'res/layout/new_dialpad_fragment.xml')
| -rw-r--r-- | res/layout/new_dialpad_fragment.xml | 166 |
1 files changed, 77 insertions, 89 deletions
diff --git a/res/layout/new_dialpad_fragment.xml b/res/layout/new_dialpad_fragment.xml index f3bd2a213..4641e0091 100644 --- a/res/layout/new_dialpad_fragment.xml +++ b/res/layout/new_dialpad_fragment.xml @@ -13,108 +13,96 @@ See the License for the specific language governing permissions and limitations under the License. --> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/top" +<view class="com.android.dialer.dialpad.NewDialpadFragment$DialpadSlidingLinearLayout" + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - android:paddingStart="@dimen/dialpad_horizontal_margin" - android:paddingEnd="@dimen/dialpad_horizontal_margin" - android:layoutDirection="ltr" > - - <!-- Text field and possibly soft menu button above the keypad where - the digits are displayed. --> + android:orientation="vertical" > + <!-- spacer view --> + <View + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> <LinearLayout - android:id="@+id/digits_container" + android:id="@+id/top" android:layout_width="match_parent" - android:layout_height="0px" - android:layout_weight="@integer/dialpad_layout_weight_digits" - android:layout_marginTop="@dimen/dialpad_vertical_margin" - android:gravity="center" - android:background="@drawable/dialpad_background" > + android:layout_height="0dp" + android:layout_weight="2" + android:orientation="vertical" + android:paddingStart="@dimen/dialpad_horizontal_margin" + android:paddingEnd="@dimen/dialpad_horizontal_margin" + android:layoutDirection="ltr" + android:background="@color/background_dialpad" > - <com.android.dialer.dialpad.DigitsEditText - android:id="@+id/digits" - android:layout_width="0dip" - android:layout_weight="1" - android:layout_height="match_parent" - android:gravity="center" - android:textAppearance="@style/DialtactsDigitsTextAppearance" - android:textColor="?android:attr/textColorPrimary" - android:nextFocusRight="@+id/overflow_menu" - android:background="@android:color/transparent" /> - <ImageButton - android:id="@+id/deleteButton" - android:layout_width="56dip" - android:layout_height="match_parent" - android:layout_gravity="center_vertical" - android:gravity="center" - android:state_enabled="false" - android:background="?android:attr/selectableItemBackground" - android:contentDescription="@string/description_delete_button" - android:src="@drawable/ic_dial_action_delete" /> - </LinearLayout> - - <!-- Smart dial suggestion section. - sp is used here for this layout instead of dp in order for it to resize as - appropriate when the font size increases. This is a one-time exception that is - ok in this case because there is space for the suggestion strip to expand. --> - <RelativeLayout - android:id="@+id/dialpad_smartdial_container" - android:layout_width="match_parent" - android:layout_height="50sp" - android:layout_marginTop="@dimen/dialpad_vertical_margin"> - <View - android:id="@+id/dialpad_smartdial_list_background" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@drawable/dialpad_background"> - </View> + <!-- Text field and possibly soft menu button above the keypad where + the digits are displayed. --> <LinearLayout - android:id="@+id/dialpad_smartdial_list" + android:id="@+id/digits_container" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal" - android:gravity="center"> - </LinearLayout> - </RelativeLayout> + android:layout_height="0px" + android:layout_weight="@integer/dialpad_layout_weight_digits_new" + android:layout_marginTop="@dimen/dialpad_vertical_margin" + android:gravity="center" > - <!-- Keypad section --> - <include layout="@layout/dialpad" /> + <com.android.dialer.dialpad.DigitsEditText + android:id="@+id/digits" + android:layout_width="0dip" + android:layout_weight="1" + android:layout_height="match_parent" + android:gravity="center" + android:textAppearance="@style/DialtactsDigitsTextAppearance" + android:textColor="@color/dialpad_text_color" + android:nextFocusRight="@+id/overflow_menu" + android:background="@android:color/transparent" /> - <View style="@style/DialpadHorizontalSeparator"/> + <ImageButton + android:id="@+id/deleteButton" + android:layout_width="56dip" + android:layout_height="match_parent" + android:layout_gravity="center_vertical" + android:gravity="center" + android:state_enabled="false" + android:background="?android:attr/selectableItemBackground" + android:contentDescription="@string/description_delete_button" + android:src="@drawable/ic_dial_action_delete" /> + </LinearLayout> - <!-- left and right paddings will be modified by the code. See DialpadFragment. --> - <FrameLayout - android:id="@+id/dialButtonContainer" - android:layout_width="match_parent" - android:layout_height="0px" - android:layout_weight="@integer/dialpad_layout_weight_additional_buttons" - android:layout_gravity="center_horizontal" - android:background="@drawable/dialpad_background"> + <!-- Keypad section --> + <include layout="@layout/new_dialpad" /> - <ImageButton - android:id="@+id/dialButton" + <View style="@style/DialpadHorizontalSeparator"/> + + <!-- left and right paddings will be modified by the code. See DialpadFragment. --> + <FrameLayout + android:id="@+id/dialButtonContainer" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:state_enabled="false" - android:background="@drawable/btn_call" - android:contentDescription="@string/description_dial_button" - android:src="@drawable/ic_dial_action_call" /> + android:layout_height="0px" + android:layout_weight="@integer/dialpad_layout_weight_additional_buttons" + android:layout_gravity="center_horizontal" + android:background="@color/dialpad_primary_text_color"> - </FrameLayout> + <ImageButton + android:id="@+id/dialButton" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:state_enabled="false" + android:background="@drawable/btn_call" + android:contentDescription="@string/description_dial_button" + android:src="@drawable/ic_dial_action_call" /> - <!-- "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="1dip" - android:layout_weight="1" - /> + </FrameLayout> -</LinearLayout> + <!-- "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="1dip" + android:layout_weight="1" + /> + + </LinearLayout> +</view>
\ No newline at end of file |