diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/dialpad_fragment.xml | 4 | ||||
| -rw-r--r-- | res/layout/dialpad.xml | 126 | ||||
| -rw-r--r-- | res/layout/dialpad_fragment.xml | 182 | ||||
| -rw-r--r-- | res/layout/dialpad_smartdial_item.xml | 45 | ||||
| -rw-r--r-- | res/layout/dialtacts_activity.xml | 87 | ||||
| -rw-r--r-- | res/layout/dialtacts_custom_action_bar.xml | 45 | ||||
| -rw-r--r-- | res/layout/new_dialpad.xml | 111 | ||||
| -rw-r--r-- | res/layout/new_dialpad_fragment.xml | 122 | ||||
| -rw-r--r-- | res/layout/new_dialtacts_activity.xml | 78 | ||||
| -rw-r--r-- | res/layout/phone_favorites_fragment.xml (renamed from res/layout/new_phone_favorites_fragment.xml) | 0 | ||||
| -rw-r--r-- | res/menu/call_log_options.xml | 34 | ||||
| -rw-r--r-- | res/menu/call_log_options_new.xml | 22 | ||||
| -rw-r--r-- | res/menu/dialpad_options.xml | 7 | ||||
| -rw-r--r-- | res/menu/dialpad_options_new.xml | 32 | ||||
| -rw-r--r-- | res/menu/dialtacts_options.xml | 40 | ||||
| -rw-r--r-- | res/menu/dialtacts_options_new.xml | 30 |
16 files changed, 232 insertions, 733 deletions
diff --git a/res/layout-land/dialpad_fragment.xml b/res/layout-land/dialpad_fragment.xml index 658a03b7b..b3945f61e 100644 --- a/res/layout-land/dialpad_fragment.xml +++ b/res/layout-land/dialpad_fragment.xml @@ -84,9 +84,9 @@ <View android:layout_width="match_parent" android:layout_height="@dimen/dialpad_button_margin" - android:layout_above="@id/dialButton" + android:layout_above="@+id/dialButton" android:background="#33000000" /> - <ImageButton android:id="@+id/dialButton" + <ImageButton android:id="@id/dialButton" android:layout_width="match_parent" android:layout_height="@dimen/call_button_height" android:layout_alignParentBottom="true" diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml index f9a078543..60240bc3f 100644 --- a/res/layout/dialpad.xml +++ b/res/layout/dialpad.xml @@ -26,74 +26,86 @@ android:paddingStart="5dip" android:paddingEnd="5dip" android:paddingBottom="10dip" - android:background="@drawable/dialpad_background" + android:stretchColumns="0,1,2" android:layoutDirection="ltr" > <TableRow - android:layout_height="0px" - android:layout_weight="1"> - <com.android.dialer.dialpad.DialpadImageButton - android:id="@+id/one" style="@style/DialtactsDialpadButtonStyle" - android:src="@drawable/dial_num_1_wht" - android:contentDescription="@string/description_image_button_one" /> - <com.android.dialer.dialpad.DialpadImageButton - android:id="@+id/two" style="@style/DialtactsDialpadButtonStyle" - android:src="@drawable/dial_num_2_wht" - android:contentDescription="@string/description_image_button_two" /> - <com.android.dialer.dialpad.DialpadImageButton - android:id="@+id/three" style="@style/DialtactsDialpadButtonStyle" - android:src="@drawable/dial_num_3_wht" - android:contentDescription="@string/description_image_button_three" /> + android:layout_height="0px" + android:layout_weight="1"> + <com.android.dialer.dialpad.DialpadKeyButton + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/one" + style="@style/DialtactsDialpadButtonStyle" + android:clickable="true" > + <TextView + android:id="@+id/dialpad_key_number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/dialpad_primary_text_color" + android:textSize="@dimen/dialpad_key_numbers_size" + android:fontFamily="sans-serif-light" + android:layout_centerInParent="true" /> + <ImageView + android:id="@+id/dialpad_key_voicemail" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_dial_action_vm" + android:paddingRight="11dp" + android:layout_alignBaseline="@id/dialpad_key_number" + android:baselineAlignBottom="true" + android:layout_alignParentRight="true" /> + </com.android.dialer.dialpad.DialpadKeyButton> + <include layout="@layout/dialpad_key" android:id="@+id/two"/> + <include layout="@layout/dialpad_key" android:id="@+id/three"/> </TableRow> <TableRow - android:layout_height="0px" - android:layout_weight="1"> - <com.android.dialer.dialpad.DialpadImageButton - android:id="@+id/four" style="@style/DialtactsDialpadButtonStyle" - android:src="@drawable/dial_num_4_wht" - android:contentDescription="@string/description_image_button_four" /> - <com.android.dialer.dialpad.DialpadImageButton - android:id="@+id/five" style="@style/DialtactsDialpadButtonStyle" - android:src="@drawable/dial_num_5_wht" - android:contentDescription="@string/description_image_button_five" /> - <com.android.dialer.dialpad.DialpadImageButton - android:id="@+id/six" style="@style/DialtactsDialpadButtonStyle" - android:src="@drawable/dial_num_6_wht" - android:contentDescription="@string/description_image_button_six" /> + android:layout_height="0px" + android:layout_weight="1"> + <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 - android:layout_height="0px" - android:layout_weight="1"> - <com.android.dialer.dialpad.DialpadImageButton - android:id="@+id/seven" style="@style/DialtactsDialpadButtonStyle" - android:src="@drawable/dial_num_7_wht" - android:contentDescription="@string/description_image_button_seven" /> - <com.android.dialer.dialpad.DialpadImageButton - android:id="@+id/eight" style="@style/DialtactsDialpadButtonStyle" - android:src="@drawable/dial_num_8_wht" - android:contentDescription="@string/description_image_button_eight" /> - <com.android.dialer.dialpad.DialpadImageButton - android:id="@+id/nine" style="@style/DialtactsDialpadButtonStyle" - android:src="@drawable/dial_num_9_wht" - android:contentDescription="@string/description_image_button_nine" /> + android:layout_height="0px" + android:layout_weight="1"> + <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 - android:layout_height="0px" - android:layout_weight="1"> - <com.android.dialer.dialpad.DialpadImageButton - android:id="@+id/star" style="@style/DialtactsDialpadButtonStyle" - android:src="@drawable/dial_num_star_wht" - android:contentDescription="@string/description_image_button_star" /> - <com.android.dialer.dialpad.DialpadImageButton - android:id="@+id/zero" style="@style/DialtactsDialpadButtonStyle" - android:src="@drawable/dial_num_0_wht" - android:contentDescription="@string/description_image_button_zero" /> - <com.android.dialer.dialpad.DialpadImageButton - android:id="@+id/pound" style="@style/DialtactsDialpadButtonStyle" - android:src="@drawable/dial_num_pound_wht" - android:contentDescription="@string/description_image_button_pound" /> + android:layout_height="0px" + android:layout_weight="1"> + <com.android.dialer.dialpad.DialpadKeyButton + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/star" + style="@style/DialtactsDialpadButtonStyle" + android:clickable="true" > + <TextView + android:id="@id/dialpad_key_number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/dialpad_secondary_text_color" + android:textSize="@dimen/dialpad_key_special_characters_size" + android:fontFamily="sans-serif-light" + android:layout_centerInParent="true" /> + </com.android.dialer.dialpad.DialpadKeyButton> + <include layout="@layout/dialpad_key" android:id="@+id/zero"/> + <com.android.dialer.dialpad.DialpadKeyButton + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/pound" + style="@style/DialtactsDialpadButtonStyle" + android:clickable="true" > + <TextView + android:id="@id/dialpad_key_number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/dialpad_secondary_text_color" + android:textSize="@dimen/dialpad_key_special_characters_size" + android:fontFamily="sans-serif-light" + android:layout_centerInParent="true" /> + </com.android.dialer.dialpad.DialpadKeyButton> </TableRow> </TableLayout> diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml index f3bd2a213..178e33b8e 100644 --- a/res/layout/dialpad_fragment.xml +++ b/res/layout/dialpad_fragment.xml @@ -13,108 +13,110 @@ 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.DialpadFragment$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 --> + <Space + 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" > - - <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" /> + 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" > - <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/dialpad" /> - <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" /> + <View style="@style/DialpadHorizontalSeparator"/> - </FrameLayout> + <LinearLayout + 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="@color/dialpad_primary_text_color"> + <ImageButton + android:id="@+id/call_history_on_dialpad_button" + android:layout_height="@dimen/fake_action_bar_height" + android:layout_width="@dimen/fake_menu_button_min_width" + android:layout_gravity="bottom|start" + android:background="@drawable/btn_call" + android:contentDescription="@string/action_menu_call_history_description" + android:src="@drawable/ic_menu_history_lt"/> + <ImageButton + android:id="@+id/dialButton" + android:layout_width="0dp" + android:layout_weight="1" + 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" /> + <ImageButton + android:id="@+id/overflow_menu_on_dialpad" + android:layout_height="@dimen/fake_action_bar_height" + android:layout_width="@dimen/fake_menu_button_min_width" + android:layout_gravity="bottom|end" + android:background="@drawable/btn_call" + android:src="@drawable/ic_menu_overflow_lt" + android:contentDescription="@string/action_menu_overflow_description" /> + </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" - /> + <!-- "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> + </LinearLayout> +</view> diff --git a/res/layout/dialpad_smartdial_item.xml b/res/layout/dialpad_smartdial_item.xml deleted file mode 100644 index 32d801e80..000000000 --- a/res/layout/dialpad_smartdial_item.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="match_parent" - android:layout_marginTop="2dp" - android:layout_marginBottom="2dp" - android:background="?android:attr/selectableItemBackground"> - - <com.android.dialer.dialpad.SmartDialTextView - android:id="@+id/contact_name" - android:layout_width="match_parent" - android:layout_height="28sp" - android:padding="@dimen/smartdial_suggestions_padding" - android:textColor="@color/smartdial_name_primary_text_color" - android:textSize="16sp" - android:singleLine="true" - android:ellipsize="none" - android:gravity="center" - /> - <com.android.dialer.dialpad.SmartDialTextView - android:id="@+id/contact_number" - android:layout_width="match_parent" - android:layout_height="16sp" - android:textColor="@color/smartdial_number_primary_text_color" - android:textSize="13sp" - android:gravity="center" - /> -</LinearLayout> diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml index 079ce37d1..580e0bf43 100644 --- a/res/layout/dialtacts_activity.xml +++ b/res/layout/dialtacts_activity.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2006 The Android Open Source Project +<!-- Copyright (C) 2013 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. @@ -13,35 +13,66 @@ See the License for the specific language governing permissions and limitations under the License. --> - -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="?android:attr/actionBarSize" - android:id="@+id/dialtacts_frame" + android:focusable="true" + android:focusableInTouchMode="true" + android:clipChildren="false" + android:id="@+id/dialtacts_container" > - <android.support.v4.view.ViewPager - android:id="@+id/pager" + <!-- Overlapping dialpad fragment is inserted here --> + <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent" /> - - <ImageButton - android:id="@+id/searchButton" - android:layout_width="wrap_content" - android:layout_height="?android:attr/actionBarSize" - android:layout_gravity="bottom|start" - android:state_enabled="false" - android:background="?android:attr/selectableItemBackground" - android:contentDescription="@string/description_search_button" - android:src="@drawable/ic_dial_action_search"/> - - <ImageButton - android:id="@+id/overflow_menu" - android:layout_width="wrap_content" - android:layout_height="?android:attr/actionBarSize" - android:layout_gravity="bottom|end" - android:src="@drawable/ic_menu_overflow" - android:contentDescription="@string/action_menu_overflow_description" - android:nextFocusLeft="@id/digits" - android:background="?android:attr/selectableItemBackground"/> + android:layout_height="match_parent" + android:clipChildren="false" + android:orientation="vertical" > + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="23dp" + android:id="@+id/search_view_container" + android:background="@color/searchbox_background_color" + android:orientation="horizontal" + android:gravity="center_vertical"> + <EditText + android:id="@+id/search_view" + android:layout_width="0dp" + android:layout_height="56dp" + android:layout_weight="1" + android:inputType="textFilter"/> + <ImageView + android:id="@+id/search_close_button" + android:layout_height="40dp" + android:layout_width="40dp" + android:padding="6dp" + android:src="@drawable/ic_close_dk" + android:clickable="true" + android:background="?android:attr/selectableItemBackground" + android:visibility="gone" /> + <ImageView + android:id="@+id/voice_search_button" + android:layout_height="40dp" + android:layout_width="40dp" + android:padding="6dp" + android:src="@drawable/ic_voice_search" + android:clickable="true" + android:contentDescription="@string/description_start_voice_search" + android:background="?android:attr/selectableItemBackground" /> + </LinearLayout> + <FrameLayout + android:layout_height="0dp" + android:layout_weight="1" + android:layout_width="match_parent" + android:id="@+id/dialtacts_frame" + android:clipChildren="false"> + </FrameLayout> + <View + android:id="@+id/dialtacts_bottom_padding" + android:layout_width="match_parent" + android:layout_height="?android:attr/actionBarSize" + android:visibility="gone" /> + </LinearLayout> </FrameLayout> diff --git a/res/layout/dialtacts_custom_action_bar.xml b/res/layout/dialtacts_custom_action_bar.xml deleted file mode 100644 index c62e22596..000000000 --- a/res/layout/dialtacts_custom_action_bar.xml +++ /dev/null @@ -1,45 +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. ---> - -<!-- Dimensions are set at runtime in ActionBarAdapter --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="0dip" - android:layout_height="0dip" - android:orientation="horizontal"> - - <SearchView - android:id="@+id/search_view" - android:layout_width="0px" - android:layout_height="match_parent" - android:layout_weight="1" - android:iconifiedByDefault="false" - android:inputType="textFilter" /> - - <ImageButton - android:id="@+id/search_option" - android:layout_width="wrap_content" - android:paddingStart="4dip" - android:paddingEnd="4dip" - android:layout_height="match_parent" - android:layout_alignParentEnd="true" - android:contentDescription="@string/action_menu_overflow_description" - android:importantForAccessibility="yes" - android:src="@drawable/ic_menu_overflow" - android:background="?android:attr/selectableItemBackground" - android:visibility="gone" /> - -</LinearLayout> diff --git a/res/layout/new_dialpad.xml b/res/layout/new_dialpad.xml deleted file mode 100644 index 60240bc3f..000000000 --- a/res/layout/new_dialpad.xml +++ /dev/null @@ -1,111 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2006 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. ---> - -<!-- Dialpad in the Phone app. --> -<TableLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/dialpad" - android:layout_width="match_parent" - android:layout_height="0px" - android:layout_weight="@integer/dialpad_layout_weight_dialpad" - android:layout_gravity="center_horizontal" - android:layout_marginTop="@dimen/dialpad_vertical_margin" - android:paddingStart="5dip" - android:paddingEnd="5dip" - android:paddingBottom="10dip" - android:stretchColumns="0,1,2" - android:layoutDirection="ltr" > - - <TableRow - android:layout_height="0px" - android:layout_weight="1"> - <com.android.dialer.dialpad.DialpadKeyButton - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/one" - style="@style/DialtactsDialpadButtonStyle" - android:clickable="true" > - <TextView - android:id="@+id/dialpad_key_number" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/dialpad_primary_text_color" - android:textSize="@dimen/dialpad_key_numbers_size" - android:fontFamily="sans-serif-light" - android:layout_centerInParent="true" /> - <ImageView - android:id="@+id/dialpad_key_voicemail" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_dial_action_vm" - android:paddingRight="11dp" - android:layout_alignBaseline="@id/dialpad_key_number" - android:baselineAlignBottom="true" - android:layout_alignParentRight="true" /> - </com.android.dialer.dialpad.DialpadKeyButton> - <include layout="@layout/dialpad_key" android:id="@+id/two"/> - <include layout="@layout/dialpad_key" android:id="@+id/three"/> - </TableRow> - - <TableRow - android:layout_height="0px" - android:layout_weight="1"> - <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 - android:layout_height="0px" - android:layout_weight="1"> - <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 - android:layout_height="0px" - android:layout_weight="1"> - <com.android.dialer.dialpad.DialpadKeyButton - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/star" - style="@style/DialtactsDialpadButtonStyle" - android:clickable="true" > - <TextView - android:id="@id/dialpad_key_number" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/dialpad_secondary_text_color" - android:textSize="@dimen/dialpad_key_special_characters_size" - android:fontFamily="sans-serif-light" - android:layout_centerInParent="true" /> - </com.android.dialer.dialpad.DialpadKeyButton> - <include layout="@layout/dialpad_key" android:id="@+id/zero"/> - <com.android.dialer.dialpad.DialpadKeyButton - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/pound" - style="@style/DialtactsDialpadButtonStyle" - android:clickable="true" > - <TextView - android:id="@id/dialpad_key_number" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/dialpad_secondary_text_color" - android:textSize="@dimen/dialpad_key_special_characters_size" - android:fontFamily="sans-serif-light" - android:layout_centerInParent="true" /> - </com.android.dialer.dialpad.DialpadKeyButton> - </TableRow> -</TableLayout> diff --git a/res/layout/new_dialpad_fragment.xml b/res/layout/new_dialpad_fragment.xml deleted file mode 100644 index f5565c726..000000000 --- a/res/layout/new_dialpad_fragment.xml +++ /dev/null @@ -1,122 +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 class="com.android.dialer.dialpad.DialpadFragment$DialpadSlidingLinearLayout" - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > - <!-- spacer view --> - <Space - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" /> - <LinearLayout - android:id="@+id/top" - android:layout_width="match_parent" - 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" > - - - <!-- Text field and possibly soft menu button above the keypad where - the digits are displayed. --> - <LinearLayout - android:id="@+id/digits_container" - android:layout_width="match_parent" - android:layout_height="0px" - android:layout_weight="@integer/dialpad_layout_weight_digits_new" - android:layout_marginTop="@dimen/dialpad_vertical_margin" - android:gravity="center" > - - <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" /> - - <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> - - <!-- Keypad section --> - <include layout="@layout/new_dialpad" /> - - <View style="@style/DialpadHorizontalSeparator"/> - - <LinearLayout - 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="@color/dialpad_primary_text_color"> - <ImageButton - android:id="@+id/call_history_on_dialpad_button" - android:layout_height="@dimen/fake_action_bar_height" - android:layout_width="@dimen/fake_menu_button_min_width" - android:layout_gravity="bottom|start" - android:background="@drawable/btn_call" - android:contentDescription="@string/action_menu_call_history_description" - android:src="@drawable/ic_menu_history_lt"/> - <ImageButton - android:id="@+id/dialButton" - android:layout_width="0dp" - android:layout_weight="1" - 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" /> - <ImageButton - android:id="@+id/overflow_menu_on_dialpad" - android:layout_height="@dimen/fake_action_bar_height" - android:layout_width="@dimen/fake_menu_button_min_width" - android:layout_gravity="bottom|end" - android:background="@drawable/btn_call" - android:src="@drawable/ic_menu_overflow_lt" - android:contentDescription="@string/action_menu_overflow_description" /> - </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> diff --git a/res/layout/new_dialtacts_activity.xml b/res/layout/new_dialtacts_activity.xml deleted file mode 100644 index b9d417b36..000000000 --- a/res/layout/new_dialtacts_activity.xml +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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. ---> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:focusable="true" - android:focusableInTouchMode="true" - android:clipChildren="false" - android:id="@+id/dialtacts_container" - > - <!-- Overlapping dialpad fragment is inserted here --> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipChildren="false" - android:orientation="vertical" > - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="16dp" - android:paddingRight="23dp" - android:id="@+id/search_view_container" - android:background="@color/searchbox_background_color" - android:orientation="horizontal" - android:gravity="center_vertical"> - <EditText - android:id="@+id/search_view" - android:layout_width="0dp" - android:layout_height="56dp" - android:layout_weight="1" - android:inputType="textFilter"/> - <ImageView - android:id="@+id/search_close_button" - android:layout_height="40dp" - android:layout_width="40dp" - android:padding="6dp" - android:src="@drawable/ic_close_dk" - android:clickable="true" - android:background="?android:attr/selectableItemBackground" - android:visibility="gone" /> - <ImageView - android:id="@+id/voice_search_button" - android:layout_height="40dp" - android:layout_width="40dp" - android:padding="6dp" - android:src="@drawable/ic_voice_search" - android:clickable="true" - android:contentDescription="@string/description_start_voice_search" - android:background="?android:attr/selectableItemBackground" /> - </LinearLayout> - <FrameLayout - android:layout_height="0dp" - android:layout_weight="1" - android:layout_width="match_parent" - android:id="@id/dialtacts_frame" - android:clipChildren="false"> - </FrameLayout> - <View - android:id="@+id/dialtacts_bottom_padding" - android:layout_width="match_parent" - android:layout_height="?android:attr/actionBarSize" - android:visibility="gone" /> - </LinearLayout> -</FrameLayout> diff --git a/res/layout/new_phone_favorites_fragment.xml b/res/layout/phone_favorites_fragment.xml index 2b6bbe447..2b6bbe447 100644 --- a/res/layout/new_phone_favorites_fragment.xml +++ b/res/layout/phone_favorites_fragment.xml diff --git a/res/menu/call_log_options.xml b/res/menu/call_log_options.xml index bf2973f6c..50b1cad5b 100644 --- a/res/menu/call_log_options.xml +++ b/res/menu/call_log_options.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- Copyright (C) 2013 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. @@ -14,38 +14,6 @@ limitations under the License. --> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - - <item - android:id="@+id/show_all_calls" - android:title="@string/menu_show_all_calls" - android:showAsAction="never" - android:orderInCategory="1"/> - - <item - android:id="@+id/show_voicemails_only" - android:title="@string/menu_show_voicemails_only" - android:showAsAction="never" - android:orderInCategory="1"/> - - <item - android:id="@+id/show_missed_only" - android:title="@string/menu_show_missed_only" - android:showAsAction="never" - android:orderInCategory="1"/> - - <item - android:id="@+id/show_outgoing_only" - android:title="@string/menu_show_outgoing_only" - android:showAsAction="never" - android:orderInCategory="1"/> - - <item - android:id="@+id/show_incoming_only" - android:title="@string/menu_show_incoming_only" - android:showAsAction="never" - android:orderInCategory="1"/> - - <item android:id="@+id/delete_all" android:title="@string/recentCalls_deleteAll" diff --git a/res/menu/call_log_options_new.xml b/res/menu/call_log_options_new.xml deleted file mode 100644 index 50b1cad5b..000000000 --- a/res/menu/call_log_options_new.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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. ---> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:id="@+id/delete_all" - android:title="@string/recentCalls_deleteAll" - android:showAsAction="never" - android:orderInCategory="1"/> -</menu> diff --git a/res/menu/dialpad_options.xml b/res/menu/dialpad_options.xml index 6dda8fc9a..0727dd57c 100644 --- a/res/menu/dialpad_options.xml +++ b/res/menu/dialpad_options.xml @@ -24,16 +24,9 @@ android:title="@string/add_2sec_pause" android:showAsAction="withText" android:orderInCategory="1" /> - <item android:id="@+id/menu_add_wait" android:title="@string/add_wait" android:showAsAction="withText" android:orderInCategory="1" /> - - <item - android:id="@+id/menu_call_settings_dialpad" - android:title="@string/call_settings" - android:showAsAction="withText" - android:orderInCategory="1" /> </menu> diff --git a/res/menu/dialpad_options_new.xml b/res/menu/dialpad_options_new.xml deleted file mode 100644 index 0727dd57c..000000000 --- a/res/menu/dialpad_options_new.xml +++ /dev/null @@ -1,32 +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. ---> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:id="@+id/menu_add_contacts" - android:title="@string/recentCalls_addToContact" - android:showAsAction="withText" - android:orderInCategory="1" /> - <item - android:id="@+id/menu_2s_pause" - android:title="@string/add_2sec_pause" - android:showAsAction="withText" - android:orderInCategory="1" /> - <item - android:id="@+id/menu_add_wait" - android:title="@string/add_wait" - android:showAsAction="withText" - android:orderInCategory="1" /> -</menu> diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml index 8eaa91552..b30697956 100644 --- a/res/menu/dialtacts_options.xml +++ b/res/menu/dialtacts_options.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- Copyright (C) 2013 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. @@ -15,38 +15,16 @@ --> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:id="@+id/search_on_action_bar" - android:title="@string/menu_search" - android:icon="@drawable/ic_dial_action_search" - android:showAsAction="ifRoom" /> - - <!-- This should come after the other menus in CallLog and Dialpad --> - <item - android:id="@+id/menu_call_settings" - android:title="@string/call_settings" - android:showAsAction="withText" - android:orderInCategory="2" /> - + android:id="@+id/menu_import_export" + android:title="@string/menu_import_export" /> <item - android:id="@+id/filter_option" - android:title="@string/menu_contacts_filter" - android:showAsAction="withText" /> - + android:id="@+id/menu_clear_frequents" + android:title="@string/menu_clear_frequents" /> <item android:id="@+id/add_contact" - android:icon="@drawable/ic_add_contact_holo_dark" - android:title="@string/menu_newContact" - android:showAsAction="ifRoom" /> - - <!-- Ugly hack: empty item never clickable. - This is for forcing search icon on left even when there's a single item - in the bottom ActionBar. - We intentionally don't use android:icon to avoid other issues around item with - a null icon. - - TODO: look for better idea. --> + android:title="@string/menu_newContact"/> <item - android:id="@+id/empty_right_menu_item" - android:actionLayout="@layout/empty2" - android:showAsAction="ifRoom" /> + android:id="@+id/menu_call_settings" + android:title="@string/call_settings" + android:orderInCategory="2" /> </menu> diff --git a/res/menu/dialtacts_options_new.xml b/res/menu/dialtacts_options_new.xml deleted file mode 100644 index b30697956..000000000 --- a/res/menu/dialtacts_options_new.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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. ---> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:id="@+id/menu_import_export" - android:title="@string/menu_import_export" /> - <item - android:id="@+id/menu_clear_frequents" - android:title="@string/menu_clear_frequents" /> - <item - android:id="@+id/add_contact" - android:title="@string/menu_newContact"/> - <item - android:id="@+id/menu_call_settings" - android:title="@string/call_settings" - android:orderInCategory="2" /> -</menu> |