diff options
author | Yorke Lee <yorkelee@google.com> | 2014-03-13 19:25:32 -0700 |
---|---|---|
committer | Yorke Lee <yorkelee@google.com> | 2014-03-13 19:25:32 -0700 |
commit | 82fe2bd10ff502abc91efd95cd4e16df33378785 (patch) | |
tree | 2be1839253611575e696cae5ead9096dc29db6cc /InCallUI | |
parent | 4a20bd1c407c007318e643f47695b144fdb735e3 (diff) |
Fix build break due to bad merge
Change-Id: If4a6d706d7465a4337ae0367e6c8ea0914f64a0e
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/res/layout/dialpad.xml | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/InCallUI/res/layout/dialpad.xml b/InCallUI/res/layout/dialpad.xml deleted file mode 100644 index 2b5644b11..000000000 --- a/InCallUI/res/layout/dialpad.xml +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 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. ---> - -<TableLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/dialpad" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:paddingLeft="@dimen/dialpad_horizontal_padding" - android:paddingRight="@dimen/dialpad_horizontal_padding" - android:background="@color/background_dialpad" - android:stretchColumns="*" - android:layoutDirection="ltr" > - - <TableRow> - <include layout="@layout/dialpad_key" android:id="@+id/one"/> - <include layout="@layout/dialpad_key" android:id="@+id/two"/> - <include layout="@layout/dialpad_key" android:id="@+id/three"/> - </TableRow> - - <TableRow> - <include layout="@layout/dialpad_key" android:id="@+id/four"/> - <include layout="@layout/dialpad_key" android:id="@+id/five"/> - <include layout="@layout/dialpad_key" android:id="@+id/six"/> - </TableRow> - - <TableRow> - <include layout="@layout/dialpad_key" android:id="@+id/seven"/> - <include layout="@layout/dialpad_key" android:id="@+id/eight"/> - <include layout="@layout/dialpad_key" android:id="@+id/nine"/> - </TableRow> - - <TableRow> - <com.android.dialer.dialpad.DialpadKeyButton - android:id="@+id/star" - style="@style/DialpadKeyButtonStyle"> - <LinearLayout - style="@style/DialpadKeyInternalLayoutStyle"> - <TextView - android:id="@+id/dialpad_key_number" - style="@style/DialpadKeyStarPoundStyle" /> - <View - android:layout_height="match_parent" - android:layout_width="@dimen/dialpad_key_letters_width" /> - </LinearLayout> - </com.android.dialer.dialpad.DialpadKeyButton> - <include layout="@layout/dialpad_key" android:id="@+id/zero"/> - <com.android.dialer.dialpad.DialpadKeyButton - android:id="@+id/pound" - style="@style/DialpadKeyButtonStyle"> - <LinearLayout - style="@style/DialpadKeyInternalLayoutStyle"> - <TextView - android:id="@id/dialpad_key_number" - style="@style/DialpadKeyStarPoundStyle" /> - <View - android:layout_height="match_parent" - android:layout_width="@dimen/dialpad_key_letters_width" /> - </LinearLayout> - </com.android.dialer.dialpad.DialpadKeyButton> - </TableRow> -</TableLayout> |