summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/anim/slide_in.xml23
-rw-r--r--res/anim/slide_out.xml23
-rw-r--r--res/layout/call_log_activity_new.xml27
-rw-r--r--res/layout/new_call_log_fragment.xml1
-rw-r--r--res/layout/new_call_log_list_item.xml7
-rw-r--r--res/layout/new_dialpad.xml1
-rw-r--r--res/layout/new_dialpad_fragment.xml166
-rw-r--r--res/layout/new_dialtacts_activity.xml58
-rw-r--r--res/layout/new_phone_favorites_fragment.xml36
-rw-r--r--res/layout/phone_favorite_regular_row_view.xml106
-rw-r--r--res/layout/phone_favorite_tile_view.xml78
-rw-r--r--res/menu/call_log_options_new.xml34
-rw-r--r--res/menu/dialtacts_options_new.xml43
-rw-r--r--res/values/colors.xml15
-rw-r--r--res/values/dimens.xml1
-rw-r--r--res/values/strings.xml27
-rw-r--r--res/values/styles.xml60
17 files changed, 513 insertions, 193 deletions
diff --git a/res/anim/slide_in.xml b/res/anim/slide_in.xml
new file mode 100644
index 000000000..b7836f0c3
--- /dev/null
+++ b/res/anim/slide_in.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+<objectAnimator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:interpolator="@android:anim/linear_interpolator"
+ android:valueFrom="0.67"
+ android:valueTo="0"
+ android:valueType="floatType"
+ android:propertyName="yFraction"
+ android:duration="200" /> \ No newline at end of file
diff --git a/res/anim/slide_out.xml b/res/anim/slide_out.xml
new file mode 100644
index 000000000..7df102dfa
--- /dev/null
+++ b/res/anim/slide_out.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+<objectAnimator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:interpolator="@android:anim/linear_interpolator"
+ android:valueFrom="0"
+ android:valueTo="0.67"
+ android:valueType="floatType"
+ android:propertyName="yFraction"
+ android:duration="200" /> \ No newline at end of file
diff --git a/res/layout/call_log_activity_new.xml b/res/layout/call_log_activity_new.xml
new file mode 100644
index 000000000..f9806e802
--- /dev/null
+++ b/res/layout/call_log_activity_new.xml
@@ -0,0 +1,27 @@
+<?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:layout_marginTop="?android:attr/actionBarSize"
+ android:id="@+id/calllog_frame">
+ <android.support.v4.view.ViewPager
+ android:id="@+id/call_log_pager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="?android:attr/actionBarSize" />
+</FrameLayout>
diff --git a/res/layout/new_call_log_fragment.xml b/res/layout/new_call_log_fragment.xml
index 041ca7bb4..e58e160a5 100644
--- a/res/layout/new_call_log_fragment.xml
+++ b/res/layout/new_call_log_fragment.xml
@@ -16,7 +16,6 @@
<!-- Layout parameters are set programmatically. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/FragmentActionBarPadding"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
diff --git a/res/layout/new_call_log_list_item.xml b/res/layout/new_call_log_list_item.xml
index 54f4fff63..c674f2e8c 100644
--- a/res/layout/new_call_log_list_item.xml
+++ b/res/layout/new_call_log_list_item.xml
@@ -127,13 +127,6 @@
/>
</LinearLayout>
</LinearLayout>
- <View
- android:id="@+id/divider"
- android:layout_width="1px"
- android:layout_height="@dimen/call_log_call_action_size"
- android:background="@drawable/ic_divider_dashed_holo_dark"
- android:layout_gravity="center_vertical"
- />
<ImageButton
android:id="@+id/secondary_action_icon"
android:layout_width="@dimen/call_log_call_action_width"
diff --git a/res/layout/new_dialpad.xml b/res/layout/new_dialpad.xml
index f9a078543..29f9cf0e9 100644
--- a/res/layout/new_dialpad.xml
+++ b/res/layout/new_dialpad.xml
@@ -26,7 +26,6 @@
android:paddingStart="5dip"
android:paddingEnd="5dip"
android:paddingBottom="10dip"
- android:background="@drawable/dialpad_background"
android:layoutDirection="ltr" >
<TableRow
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
diff --git a/res/layout/new_dialtacts_activity.xml b/res/layout/new_dialtacts_activity.xml
index 079ce37d1..a9960d8e3 100644
--- a/res/layout/new_dialtacts_activity.xml
+++ b/res/layout/new_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,37 @@
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"
+ <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" >
+ <SearchView
+ android:id="@+id/search_view"
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/actionBarSize"
+ android:iconifiedByDefault="false"
+ android:inputType="textFilter" />
+ <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/new_phone_favorites_fragment.xml
index 8931cf6c6..33a3eb43a 100644
--- a/res/layout/new_phone_favorites_fragment.xml
+++ b/res/layout/new_phone_favorites_fragment.xml
@@ -17,15 +17,16 @@
<!-- Use LinearLayout + FrameLayout, just to rely on android:divider and android:showDividers -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/FragmentActionBarPadding"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:divider="?android:attr/dividerHorizontal"
- android:showDividers="end">
+ android:showDividers="end"
+ android:clipChildren="false">
<FrameLayout
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="0dp"
+ android:layout_weight="1">
<ListView
android:id="@+id/contact_tile_list"
android:layout_width="match_parent"
@@ -44,4 +45,33 @@
android:textColor="?android:attr/textColorSecondary"
android:textAppearance="?android:attr/textAppearanceLarge"/>
</FrameLayout>
+ <FrameLayout
+ android:layout_height="?android:attr/actionBarSize"
+ android:layout_width="match_parent"
+ android:id="@+id/fake_action_bar">
+ <ImageButton
+ android:id="@+id/call_history_button"
+ android:layout_width="@dimen/fake_menu_button_min_width"
+ android:layout_height="match_parent"
+ android:layout_gravity="bottom|start"
+ android:background="?android:attr/selectableItemBackground"
+ android:contentDescription="@string/description_search_button"
+ android:src="@drawable/ic_dial_action_search"/>
+ <ImageButton
+ android:id="@+id/dialpad_button"
+ android:layout_width="@dimen/fake_menu_button_min_width"
+ android:layout_height="match_parent"
+ android:layout_gravity="bottom|center"
+ 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="@dimen/fake_menu_button_min_width"
+ android:layout_height="match_parent"
+ android:layout_gravity="bottom|end"
+ android:src="@drawable/ic_menu_overflow"
+ android:contentDescription="@string/action_menu_overflow_description"
+ android:background="?android:attr/selectableItemBackground"/>
+ </FrameLayout>
</LinearLayout>
diff --git a/res/layout/phone_favorite_regular_row_view.xml b/res/layout/phone_favorite_regular_row_view.xml
new file mode 100644
index 000000000..30e109f9e
--- /dev/null
+++ b/res/layout/phone_favorite_regular_row_view.xml
@@ -0,0 +1,106 @@
+<?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.
+-->
+
+<!-- Layout parameters are set programmatically. -->
+<view
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/contact_tile_frequent_phone"
+ class="com.android.dialer.list.PhoneFavoriteRegularRowView"
+ android:focusable="true"
+ android:background="?android:attr/selectableItemBackground"
+ android:nextFocusLeft="@+id/contact_tile_quick">
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <com.android.contacts.common.widget.LayoutSuppressingQuickContactBadge
+ android:id="@id/contact_tile_quick"
+ android:layout_width="64dip"
+ android:layout_height="64dip"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:nextFocusRight="@id/contact_tile_frequent_phone"
+ android:scaleType="centerCrop"
+ android:focusable="true" />
+
+ <TextView
+ android:id="@+id/contact_tile_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="8dip"
+ android:layout_marginStart="8dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_marginTop="8dip"
+ android:layout_toRightOf="@id/contact_tile_quick"
+ android:layout_toEndOf="@id/contact_tile_quick"
+ android:singleLine="true"
+ android:fadingEdge="horizontal"
+ android:fadingEdgeLength="3dip"
+ android:ellipsize="marquee"
+ android:textAlignment="viewStart" />
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/contact_tile_name"
+ android:layout_toRightOf="@id/contact_tile_quick"
+ android:layout_toEndOf="@id/contact_tile_quick"
+ android:gravity="center_vertical">
+
+ <TextView
+ android:id="@+id/contact_tile_phone_number"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="?attr/list_item_data_width_weight"
+ android:textSize="14sp"
+ android:ellipsize="marquee"
+ android:textColor="@color/dialtacts_secondary_text_color"
+ android:layout_marginLeft="8dip"
+ android:layout_marginStart="8dip"
+ android:singleLine="true"
+ android:layout_gravity="bottom"
+ android:textDirection="ltr"
+ android:textAlignment="viewStart" />
+
+ <TextView
+ android:id="@+id/contact_tile_phone_type"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="?attr/list_item_label_width_weight"
+ android:textSize="12sp"
+ android:ellipsize="marquee"
+ android:singleLine="true"
+ android:textAllCaps="true"
+ android:textColor="@color/dialtacts_secondary_text_color"
+ android:layout_marginLeft="8dip"
+ android:layout_marginStart="8dip"
+ android:gravity="end"
+ android:layout_gravity="bottom" />
+
+ </LinearLayout>
+
+ <View
+ android:id="@+id/contact_tile_horizontal_divider"
+ android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:background="?android:attr/listDivider"
+ android:layout_below="@id/contact_tile_quick" />
+
+ </RelativeLayout>
+
+</view>
diff --git a/res/layout/phone_favorite_tile_view.xml b/res/layout/phone_favorite_tile_view.xml
new file mode 100644
index 000000000..f6e44d857
--- /dev/null
+++ b/res/layout/phone_favorite_tile_view.xml
@@ -0,0 +1,78 @@
+<?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"
+ android:background="@null"
+ android:paddingBottom="1dip"
+ android:paddingRight="1dip"
+ android:paddingEnd="1dip"
+ class="com.android.dialer.list.PhoneFavoriteTileView" >
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <com.android.contacts.common.widget.LayoutSuppressingImageView
+ android:id="@+id/contact_tile_image"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scaleType="centerCrop" />
+
+ <TextView
+ android:id="@+id/contact_tile_name"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/contact_tile_shadowbox_height"
+ android:background="@color/contact_tile_shadow_box_color"
+ android:gravity="center_vertical"
+ android:textColor="@android:color/white"
+ android:singleLine="true"
+ android:textSize="16sp"
+ android:fadingEdge="horizontal"
+ android:fadingEdgeLength="3dip"
+ android:ellipsize="marquee"
+ android:layout_alignParentBottom="true"
+ android:paddingLeft="8dip"
+ android:paddingRight="47dip"
+ android:paddingStart="8dip"
+ android:paddingEnd="47dip"
+ android:textAlignment="viewStart" />
+
+ <View
+ android:id="@+id/contact_tile_push_state"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:focusable="true"
+ android:nextFocusRight="@+id/contact_tile_secondary_button"
+ android:background="?android:attr/selectableItemBackground" />
+
+ <ImageButton
+ android:id="@id/contact_tile_secondary_button"
+ android:src="@drawable/ic_contacts_holo_dark"
+ android:background="?android:attr/selectableItemBackground"
+ android:layout_height="@dimen/contact_tile_shadowbox_height"
+ android:layout_width="48dip"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip"
+ android:paddingStart="8dip"
+ android:paddingEnd="8dip"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
+ android:contentDescription="@string/description_view_contact_detail" />
+
+ </RelativeLayout>
+
+</view>
diff --git a/res/menu/call_log_options_new.xml b/res/menu/call_log_options_new.xml
index bf2973f6c..50b1cad5b 100644
--- a/res/menu/call_log_options_new.xml
+++ b/res/menu/call_log_options_new.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/dialtacts_options_new.xml b/res/menu/dialtacts_options_new.xml
index 8eaa91552..92708fec0 100644
--- a/res/menu/dialtacts_options_new.xml
+++ b/res/menu/dialtacts_options_new.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,19 @@
-->
<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 -->
+ android:id="@+id/menu_import_export"
+ android:title="@string/menu_import_export" />
<item
- android:id="@+id/menu_call_settings"
- android:title="@string/call_settings"
- android:showAsAction="withText"
- android:orderInCategory="2" />
-
- <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/menu_show_hide_all_contacts"
+ android:title="@string/show_all_contacts" />
<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/values/colors.xml b/res/values/colors.xml
index 1aa217fe8..672c970b3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,7 +17,9 @@
<resources>
<!-- Secondary text color in the Phone app -->
+ <color name="dialtacts_primary_text_color">#111111</color>
<color name="dialtacts_secondary_text_color">#888888</color>
+ <color name="dialpad_text_color">#ffffff</color>
<color name="smartdial_name_primary_text_color">#0099cc</color>
<color name="smartdial_name_highlighted_text_color">#39c9ff</color>
<color name="smartdial_number_primary_text_color">#bbbbbb</color>
@@ -40,4 +42,17 @@
<!-- Standard color for selected items. -->
<color name="item_selected">#660099cc</color>
+
+ <!-- Background color of new dialer activity -->
+ <color name="background_dial_holo_light">#ffffff</color>
+
+ <!-- Background color of new dialpad -->
+ <color name="background_dialpad">#ee020709</color>
+
+ <!-- Primary color of dialpad text, including the call button -->
+ <color name="dialpad_primary_text_color">#0099cc</color>
+ <!-- Secondary color of dialpad text (mainly used for the letters corresponding to each digit
+ -->
+ <color name="dialpad_secondary_text_color">#888888</color>
+
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 5d7412b87..474f57227 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -45,6 +45,7 @@
LinearLayout (dialpad_fragment.xml), configuring dialpad screen's vertical
ratio. -->
<integer name="dialpad_layout_weight_digits">20</integer>
+ <integer name="dialpad_layout_weight_digits_new">15</integer>
<integer name="dialpad_layout_weight_dialpad">65</integer>
<integer name="dialpad_layout_weight_additional_buttons">15</integer>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9bf0ee842..9be7481b9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -511,4 +511,31 @@
<!-- Message displayed when there is no application available to handle the add contact menu option. [CHAR LIMIT=NONE] -->
<string name="add_contact_not_available">Re-enable the People application to use this feature.</string>
+ <!-- Hint displayed in dialer search box when there is no query that is currently typed.
+ [CHAR LIMIT=25] -->
+ <string name="dialer_hint_find_contact">Type a name or phone</string>
+
+ <!-- Title for the call log tab containing the list of all voicemails and calls
+ [CHAR LIMIT=10] -->
+ <string name="call_log_all_title">All</string>
+
+ <!-- Title for the call log tab containing the list of all missed calls only
+ [CHAR LIMIT=10] -->
+ <string name="call_log_missed_title">Missed</string>
+
+ <!-- Title for the call log tab containing the list of all voicemails only
+ [CHAR LIMIT=10] -->
+ <string name="call_log_voicemail_title">Voicemail</string>
+
+ <!-- Text displayed when the list of missed calls is empty -->
+ <string name="recentMissed_empty">No recent missed calls.</string>
+
+ <!-- Text displayed when the list of voicemails is empty -->
+ <string name="recentVoicemails_empty">No recent voicemails.</string>
+
+ <!-- Menu option to enable all contacts to be displayed -->
+ <string name="show_all_contacts">Show all contacts</string>
+
+ <!-- Menu option to show favorite contacts only -->
+ <string name="show_favorites_only">Show favorites only</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 099bfd51d..cb36090cb 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -65,6 +65,61 @@
<item name="favorites_padding_bottom">?android:attr/actionBarSize</item>
</style>
+ <style name="NewDialtactsTheme"
+ parent="android:Theme.Holo.Light">
+ <item name="android:textColorPrimary">@color/dialtacts_primary_text_color</item>
+ <item name="android:textColorSecondary">@color/dialtacts_secondary_text_color</item>
+ <item name="android:windowActionBarOverlay">true</item>
+ <item name="android:actionBarStyle">@style/DialtactsActionBarStyleNew</item>
+ <item name="android:windowContentOverlay">@null</item>
+ <item name="android:windowBackground">@color/background_dial_holo_light</item>
+ <item name="android:listViewStyle">@style/ListViewStyle</item>
+ <item name="activated_background">@drawable/list_item_activated_background</item>
+ <item name="section_header_background">@drawable/list_title_holo</item>
+ <item name="list_section_header_height">32dip</item>
+ <item name="list_item_divider">?android:attr/listDivider</item>
+ <item name="list_item_padding_top">0dip</item>
+ <item name="list_item_padding_right">0dip</item>
+ <item name="list_item_padding_bottom">0dip</item>
+ <item name="list_item_padding_left">0dip</item>
+ <item name="list_item_gap_between_image_and_text">8dip</item>
+ <item name="list_item_gap_between_label_and_data">5dip</item>
+ <item name="list_item_presence_icon_margin">4dip</item>
+ <item name="list_item_presence_icon_size">16dip</item>
+ <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>
+ <item name="list_item_profile_photo_size">70dip</item>
+ <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>
+ <item name="list_item_header_text_indent">8dip</item>
+ <item name="list_item_header_text_color">@color/people_app_theme_color</item>
+ <item name="list_item_header_text_size">14sp</item>
+ <item name="list_item_header_height">24dip</item>
+ <item name="list_item_header_underline_height">1dip</item>
+ <item name="list_item_header_underline_color">@color/people_app_theme_color</item>
+ <item name="list_item_data_width_weight">5</item>
+ <item name="list_item_label_width_weight">3</item>
+ <item name="contact_browser_list_padding_left">16dip</item>
+ <item name="contact_browser_list_padding_right">0dip</item>
+ <item name="contact_browser_background">@android:color/transparent</item>
+ <item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
+ <!-- CallLog -->
+ <item name="call_log_primary_text_color">#111111</item>
+ <item name="call_log_primary_background_color">#000000</item>
+ <item name="call_log_secondary_text_color">#555555</item>
+ <item name="call_log_secondary_background_color">#333333</item>
+ <item name="call_log_header_color">#33b5e5</item>
+ <!-- VoicemailStatus -->
+ <item name="call_log_voicemail_status_height">48dip</item>
+ <item name="call_log_voicemail_status_background_color">#262626</item>
+ <item name="call_log_voicemail_status_text_color">#888888</item>
+ <item name="call_log_voicemail_status_action_text_color">#33b5e5</item>
+ <!-- Favorites -->
+ <item name="favorites_padding_bottom">?android:attr/actionBarSize</item>
+ </style>
+
+ <style name="DialpadTheme" parent="DialtactsTheme">
+ <item name="android:textColorPrimary">#FFFFFF</item>
+ </style>
+
<style name="CallDetailActivityTheme" parent="android:Theme.Holo">
<item name="android:windowBackground">@android:color/black</item>
<item name="android:gravity">top</item>
@@ -110,6 +165,11 @@
<item name="android:background">#66000000</item>
</style>
+ <style name="DialtactsActionBarStyleNew" parent="android:Widget.Holo.ActionBar">
+ <item name="android:backgroundSplit">@null</item>
+ <item name="android:displayOptions"></item>
+ </style>
+
<style name="DialtactsActionBarStyle" parent="android:Widget.Holo.ActionBar">
<item name="android:backgroundSplit">@null</item>
<item name="android:backgroundStacked">@drawable/ab_stacked_opaque_dark_holo</item>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 05:00:07 +0000