Merge "Add dialog for SIM card select option on dialer menus"
diff --git a/res-common/anim/dialpad_slide_in_bottom.xml b/res-common/anim/dialpad_slide_in_bottom.xml
new file mode 100644
index 0000000..07748b5
--- /dev/null
+++ b/res-common/anim/dialpad_slide_in_bottom.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:interpolator="@android:interpolator/fast_out_slow_in"
+ android:duration="@integer/dialpad_slide_in_duration"
+ android:fromYDelta="67%p"
+ android:toYDelta="0" />
diff --git a/res-common/anim/dialpad_slide_in_right.xml b/res-common/anim/dialpad_slide_in_right.xml
new file mode 100644
index 0000000..d87e82a
--- /dev/null
+++ b/res-common/anim/dialpad_slide_in_right.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:fromXDelta="100%p"
+ android:toXDelta="0"
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:duration="@integer/dialpad_slide_in_duration"/>
diff --git a/res-common/anim/dialpad_slide_out_bottom.xml b/res-common/anim/dialpad_slide_out_bottom.xml
new file mode 100644
index 0000000..c80c8ed
--- /dev/null
+++ b/res-common/anim/dialpad_slide_out_bottom.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:interpolator="@android:interpolator/fast_out_linear_in"
+ android:duration="@integer/dialpad_slide_out_duration"
+ android:fromYDelta="0"
+ android:toYDelta="80%p" />
diff --git a/res-common/anim/dialpad_slide_out_right.xml b/res-common/anim/dialpad_slide_out_right.xml
new file mode 100644
index 0000000..a29c1a0
--- /dev/null
+++ b/res-common/anim/dialpad_slide_out_right.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:fromXDelta="0"
+ android:toXDelta="100%"
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:duration="@integer/dialpad_slide_out_duration"/>
diff --git a/res-common/drawable/action_bar_tab.xml b/res-common/drawable/action_bar_tab.xml
index ecf463c..20b509e 100644
--- a/res-common/drawable/action_bar_tab.xml
+++ b/res-common/drawable/action_bar_tab.xml
@@ -14,10 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="@color/tab_pressed_color">
<item>
- <ripple android:tint="@color/tab_pressed_color">
+ <ripple android:color="@color/tab_pressed_color">
<item android:drawable="@color/tab_default_color" />
</ripple>
</item>
diff --git a/res-common/drawable/btn_dialpad_key.xml b/res-common/drawable/btn_dialpad_key.xml
index a04d35a..a4cb088 100644
--- a/res-common/drawable/btn_dialpad_key.xml
+++ b/res-common/drawable/btn_dialpad_key.xml
@@ -15,5 +15,4 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="?android:attr/colorControlHighlight"
- android:pinned="true"/>
\ No newline at end of file
+ android:color="?android:attr/colorControlHighlight" />
\ No newline at end of file
diff --git a/res-common/interpolator/ease_in_interpolator.xml b/res-common/interpolator/ease_in_interpolator.xml
deleted file mode 100644
index 0f5afbe..0000000
--- a/res-common/interpolator/ease_in_interpolator.xml
+++ /dev/null
@@ -1,23 +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
- -->
-
-<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
- android:controlX1="0"
- android:controlY1="0"
- android:controlX2="0.2"
- android:controlY2="1.0"/>
\ No newline at end of file
diff --git a/res-common/interpolator/ease_out_interpolator.xml b/res-common/interpolator/ease_out_interpolator.xml
deleted file mode 100644
index 5b9ee3e..0000000
--- a/res-common/interpolator/ease_out_interpolator.xml
+++ /dev/null
@@ -1,23 +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
- -->
-
-<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
- android:controlX1="0.4"
- android:controlY1="0"
- android:controlX2="1.0"
- android:controlY2="1.0"/>
\ No newline at end of file
diff --git a/res-common/layout-land/dialpad_key.xml b/res-common/layout-land/dialpad_key.xml
new file mode 100644
index 0000000..6ff5c77
--- /dev/null
+++ b/res-common/layout-land/dialpad_key.xml
@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<!-- A layout representing a single key in the dialpad -->
+<com.android.contacts.common.dialpad.DialpadKeyButton
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/DialpadKeyButtonStyle" >
+
+ <LinearLayout style="@style/DialpadKeyInternalLayoutStyle"
+ android:orientation="horizontal"
+ android:baselineAligned="false"
+ android:layout_gravity="right|center_vertical" >
+
+ <!-- Note in the referenced styles that we assign hard widths to these components
+ because we want them to line up vertically when we arrange them in an MxN grid -->
+
+ <com.android.contacts.common.dialpad.DialpadTextView
+ android:id="@+id/dialpad_key_number"
+ style="@style/DialpadKeyNumberStyle"
+ android:layout_gravity="right"
+ android:layout_marginBottom="0dp"
+ android:layout_marginRight="@dimen/dialpad_key_margin_right" />
+
+ <TextView
+ android:id="@+id/dialpad_key_letters"
+ style="@style/DialpadKeyLettersStyle"
+ android:layout_width="@dimen/dialpad_key_text_width"
+ android:layout_gravity="right|bottom" />
+ </LinearLayout>
+</com.android.contacts.common.dialpad.DialpadKeyButton>
diff --git a/res-common/layout-land/dialpad_key_one.xml b/res-common/layout-land/dialpad_key_one.xml
new file mode 100644
index 0000000..341f7a9
--- /dev/null
+++ b/res-common/layout-land/dialpad_key_one.xml
@@ -0,0 +1,48 @@
+<?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.
+-->
+<com.android.contacts.common.dialpad.DialpadKeyButton
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/one"
+ style="@style/DialpadKeyButtonStyle">
+ <LinearLayout
+ style="@style/DialpadKeyInternalLayoutStyle"
+ android:orientation="horizontal"
+ android:baselineAligned="false"
+ android:layout_gravity="right|center_vertical" >
+ <com.android.contacts.common.dialpad.DialpadTextView
+ android:id="@+id/dialpad_key_number"
+ style="@style/DialpadKeyNumberStyle"
+ android:layout_gravity="right"
+ android:layout_marginBottom="0dp"
+ android:layout_marginRight="@dimen/dialpad_key_margin_right" />
+ <RelativeLayout
+ android:layout_width="@dimen/dialpad_key_text_width"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right|bottom" >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top"
+ android:id="@+id/dialpad_key_voicemail"
+ android:src="@drawable/ic_dialpad_vm"
+ android:scaleType="fitCenter"
+ android:layout_centerInParent="true"
+ android:tint="@color/dialpad_secondary_text_color" />
+ <!-- Place empty text view so vertical height is same as other dialpad keys. -->
+ <TextView style="@style/DialpadKeyLettersStyle" />
+ </RelativeLayout>
+ </LinearLayout>
+</com.android.contacts.common.dialpad.DialpadKeyButton>
diff --git a/res-common/layout/contact_tile_frequent.xml b/res-common/layout/contact_tile_frequent.xml
index 404b2fe..880ce81 100644
--- a/res-common/layout/contact_tile_frequent.xml
+++ b/res-common/layout/contact_tile_frequent.xml
@@ -17,65 +17,37 @@
xmlns:android="http://schemas.android.com/apk/res/android"
class="com.android.contacts.common.list.ContactTileFrequentView"
android:focusable="true"
- android:background="?android:attr/selectableItemBackground"
- android:nextFocusRight="@+id/contact_tile_quick">
+ android:background="?android:attr/selectableItemBackground">
- <RelativeLayout
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent" >
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:paddingStart="?list_item_padding_left"
+ android:paddingEnd="?list_item_padding_right"
+ android:paddingTop="?list_item_padding_top"
+ android:paddingBottom="?list_item_padding_bottom">
- <com.android.contacts.common.widget.LayoutSuppressingQuickContactBadge
- android:id="@+id/contact_tile_quick"
- android:layout_width="64dip"
- android:layout_height="64dip"
- android:layout_alignParentEnd="true"
+ <com.android.contacts.common.widget.LayoutSuppressingImageView
+ android:id="@+id/contact_tile_image"
+ android:layout_width="?list_item_photo_size"
+ android:layout_height="?list_item_photo_size"
android:scaleType="centerCrop"
- android:focusable="true" />
+ android:layout_marginEnd="?list_item_gap_between_image_and_text"/>
- <LinearLayout
+ <TextView
+ android:id="@+id/contact_tile_name"
android:layout_width="match_parent"
- android:layout_height="64dip"
- android:orientation="vertical"
- android:layout_alignParentBottom="true"
- android:gravity="center_vertical"
- android:paddingLeft="8dip"
- android:paddingRight="80dip"
- android:paddingStart="8dip"
- android:paddingEnd="80dip">
+ android:layout_height="wrap_content"
+ android:textColor="@android:color/black"
+ android:textSize="@dimen/contact_browser_list_item_text_size"
+ android:singleLine="true"
+ android:fadingEdge="horizontal"
+ android:fadingEdgeLength="3dip"
+ android:ellipsize="marquee"
+ android:textAlignment="viewStart" />
- <TextView
- android:id="@+id/contact_tile_name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textColor="@color/primary_text_color"
- android:textSize="18sp"
- android:singleLine="true"
- android:fadingEdge="horizontal"
- android:fadingEdgeLength="3dip"
- android:ellipsize="marquee"
- android:textAlignment="viewStart" />
-
- <TextView
- android:id="@+id/contact_tile_status"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorSecondary"
- android:singleLine="true"
- android:drawablePadding="4dip"
- android:fadingEdge="horizontal"
- android:fadingEdgeLength="3dip"
- android:ellipsize="marquee" />
-
- </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>
+ </LinearLayout>
</view>
diff --git a/res-common/layout/contact_tile_phone_starred.xml b/res-common/layout/contact_tile_phone_starred.xml
deleted file mode 100644
index 67e3d43..0000000
--- a/res-common/layout/contact_tile_phone_starred.xml
+++ /dev/null
@@ -1,78 +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"
- android:background="@null"
- android:paddingBottom="1dip"
- android:paddingRight="1dip"
- android:paddingEnd="1dip"
- class="com.android.contacts.common.list.ContactTilePhoneStarredView" >
-
- <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-common/layout/contact_tile_starred.xml b/res-common/layout/contact_tile_starred.xml
index e363747..3d9abb5 100644
--- a/res-common/layout/contact_tile_starred.xml
+++ b/res-common/layout/contact_tile_starred.xml
@@ -15,70 +15,40 @@
-->
<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.contacts.common.list.ContactTileStarredView" >
+ xmlns:ex="http://schemas.android.com/apk/res-auto"
+ class="com.android.contacts.common.list.ContactTileStarredView"
+ android:focusable="true"
+ android:background="?android:attr/selectableItemBackground">
- <RelativeLayout
- android:id="@+id/contact_tile_layout"
+ <LinearLayout
+ android:id="@+id/contact_tile_push_state"
android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
- <com.android.contacts.common.widget.LayoutSuppressingImageView
- android:id="@+id/contact_tile_image"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingTop="21dp">
+ <view
+ android:id="@+id/contact_tile_container"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:scaleType="centerCrop" />
-
- <LinearLayout
+ android:layout_height="wrap_content"
+ ex:direction="widthToHeight"
+ ex:ratio="1.0"
+ class="com.android.contacts.common.widget.ProportionalLayout" >
+ <ImageView
+ android:id="@+id/contact_tile_image"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ </view>
+ <TextView
+ android:id="@+id/contact_tile_name"
android:layout_width="match_parent"
- android:layout_height="@dimen/contact_tile_shadowbox_height"
- android:orientation="vertical"
- android:background="@color/contact_tile_shadow_box_color"
- android:layout_alignParentBottom="true"
- android:gravity="center_vertical"
- android:paddingLeft="8dip"
- android:paddingRight="8dip"
- android:paddingStart="8dip"
- android:paddingEnd="8dip">
-
- <TextView
- android:id="@+id/contact_tile_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@android:color/white"
- android:textSize="16sp"
- android:singleLine="true"
- android:fadingEdge="horizontal"
- android:fadingEdgeLength="3dip"
- android:ellipsize="marquee"
- android:textAlignment="viewStart" />
-
- <TextView
- android:id="@+id/contact_tile_status"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/people_contact_tile_status_color"
- android:singleLine="true"
- android:drawablePadding="4dip"
- android:paddingBottom="4dip"
- android:fadingEdge="horizontal"
- android:fadingEdgeLength="3dip"
- android:layout_marginTop="-3dip"
- android:ellipsize="marquee" />
-
- </LinearLayout>
-
- <View
- android:id="@+id/contact_tile_push_state"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:focusable="true"
- android:background="?android:attr/selectableItemBackground" />
-
- </RelativeLayout>
-
+ android:layout_height="wrap_content"
+ android:paddingTop="7dp"
+ android:textColor="#202020"
+ android:textSize="16sp"
+ android:singleLine="true"
+ android:fadingEdge="horizontal"
+ android:fadingEdgeLength="3dip"
+ android:ellipsize="marquee"
+ android:textAlignment="center"/>
+ </LinearLayout>
</view>
diff --git a/res-common/layout/dialpad.xml b/res-common/layout/dialpad.xml
index 6c794a4..90cbe18 100644
--- a/res-common/layout/dialpad.xml
+++ b/res-common/layout/dialpad.xml
@@ -28,31 +28,7 @@
android:layout_weight="1"
android:orientation="horizontal">
<Space style="@style/DialpadSpaceStyle" />
- <com.android.contacts.common.dialpad.DialpadKeyButton
- android:id="@+id/one"
- style="@style/DialpadKeyButtonStyle">
- <LinearLayout
- style="@style/DialpadKeyInternalLayoutStyle">
- <com.android.contacts.common.dialpad.DialpadTextView
- android:id="@+id/dialpad_key_number"
- style="@style/DialpadKeyNumberStyle" />
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" >
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top"
- android:id="@+id/dialpad_key_voicemail"
- android:src="@drawable/ic_dialpad_vm"
- android:scaleType="fitCenter"
- android:layout_centerInParent="true"
- android:tint="@color/dialpad_secondary_text_color" />
- <!-- Place empty text view so vertical height is same as other dialpad keys. -->
- <TextView style="@style/DialpadKeyLettersStyle" />
- </RelativeLayout>
- </LinearLayout>
- </com.android.contacts.common.dialpad.DialpadKeyButton>
+ <include layout="@layout/dialpad_key_one" />
<include layout="@layout/dialpad_key"
android:id="@+id/two"
style="@style/DialpadKeyButtonStyle" />
@@ -110,7 +86,7 @@
<LinearLayout
style="@style/DialpadKeyInternalLayoutStyle">
<com.android.contacts.common.dialpad.DialpadTextView
- android:id="@id/dialpad_key_number"
+ android:id="@+id/dialpad_key_number"
style="@style/DialpadKeyStarStyle" />
</LinearLayout>
</com.android.contacts.common.dialpad.DialpadKeyButton>
diff --git a/res-common/layout/dialpad_key_one.xml b/res-common/layout/dialpad_key_one.xml
new file mode 100644
index 0000000..2365e6e
--- /dev/null
+++ b/res-common/layout/dialpad_key_one.xml
@@ -0,0 +1,41 @@
+<?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.
+-->
+<com.android.contacts.common.dialpad.DialpadKeyButton
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/one"
+ style="@style/DialpadKeyButtonStyle">
+ <LinearLayout
+ style="@style/DialpadKeyInternalLayoutStyle">
+ <com.android.contacts.common.dialpad.DialpadTextView
+ android:id="@+id/dialpad_key_number"
+ style="@style/DialpadKeyNumberStyle" />
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top"
+ android:id="@+id/dialpad_key_voicemail"
+ android:src="@drawable/ic_dialpad_vm"
+ android:scaleType="fitCenter"
+ android:layout_centerInParent="true"
+ android:tint="@color/dialpad_secondary_text_color" />
+ <!-- Place empty text view so vertical height is same as other dialpad keys. -->
+ <TextView style="@style/DialpadKeyLettersStyle" />
+ </RelativeLayout>
+ </LinearLayout>
+</com.android.contacts.common.dialpad.DialpadKeyButton>
diff --git a/res-common/values-km-rKH/strings.xml b/res-common/values-km-rKH/strings.xml
index b14cf8c..8e2ce28 100644
--- a/res-common/values-km-rKH/strings.xml
+++ b/res-common/values-km-rKH/strings.xml
@@ -139,8 +139,8 @@
<string name="chat_gtalk" msgid="6043734883347741789">"ជជែកដោយប្រើ Google Talk"</string>
<string name="chat_icq" msgid="7538190395602030726">"ជជែកដោយប្រើ ICQ"</string>
<string name="chat_jabber" msgid="4525546665986350869">"ជជែកដោយប្រើ Jabber"</string>
- <string name="chat" msgid="6297650784873558837">"ជជែក"</string>
- <string name="description_minus_button" msgid="2142439445814730827">"លុប"</string>
+ <string name="chat" msgid="6297650784873558837">"ជជែក"</string>
+ <string name="description_minus_button" msgid="2142439445814730827">"លុប"</string>
<string name="expand_collapse_name_fields_description" msgid="5073419090665464541">"ពង្រីក ឬបង្រួមវាលឈ្មោះ"</string>
<string name="list_filter_all_accounts" msgid="4265359896628915784">"ទំនាក់ទំនងទាំងអស់"</string>
<string name="list_filter_all_starred" msgid="9060325494254507806">"បានដាក់ផ្កាយ"</string>
@@ -154,7 +154,7 @@
<string name="display_warn_remove_ungrouped" msgid="7297678747857509619">"ការលុប \"<xliff:g id="GROUP">%s</xliff:g>\" ចេញពីសមកាលកម្មវាក៏នឹងលុបទំនាក់ទំនងដែលមិននៅក្នុងក្រុមចេញពីសមកាលកម្មផងដែរ។"</string>
<string name="savingDisplayGroups" msgid="6863012138107446030">"កំពុងរក្សាទុកជម្រើសបង្ហាញ..."</string>
<string name="menu_done" msgid="32470053723443112">"រួចរាល់"</string>
- <string name="menu_doNotSave" msgid="6012426160993364871">"បោះបង់"</string>
+ <string name="menu_doNotSave" msgid="6012426160993364871">"បោះបង់"</string>
<string name="listAllContactsInAccount" msgid="755499980092808715">"ទំនាក់ទំនងនៅក្នុង <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="listCustomView" msgid="1915154113477432033">"ទំនាក់ទំនងក្នុងទិដ្ឋភាពផ្ទាល់ខ្លួន"</string>
<string name="listSingleContact" msgid="8525131203887307088">"ទំនាក់ទំនងទោល"</string>
diff --git a/res-common/values-land/dimens.xml b/res-common/values-land/dimens.xml
new file mode 100644
index 0000000..96547f0
--- /dev/null
+++ b/res-common/values-land/dimens.xml
@@ -0,0 +1,20 @@
+<?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.
+ -->
+<resources>
+ <dimen name="dialpad_key_margin_right">10dp</dimen>
+ <dimen name="dialpad_key_text_width">25dp</dimen>
+</resources>
diff --git a/res-common/values-lt/strings.xml b/res-common/values-lt/strings.xml
index a0c94a1..9f8c000 100644
--- a/res-common/values-lt/strings.xml
+++ b/res-common/values-lt/strings.xml
@@ -229,7 +229,7 @@
<string name="activity_title_contacts_filter" msgid="7689519428197855166">"Pateiktini kontaktai"</string>
<string name="custom_list_filter" msgid="582616656313514803">"Apibrėžti tinkintą rodinį"</string>
<string name="hint_findContacts" msgid="28151707326753522">"Ieškoti kontaktų"</string>
- <string name="contactsFavoritesLabel" msgid="1222038757062409949">"Adresynas"</string>
+ <string name="contactsFavoritesLabel" msgid="1222038757062409949">"Mėgstamiausi"</string>
<string name="listTotalAllContactsZero" msgid="6041341919823872732">"Kontaktų nėra."</string>
<string name="listTotalAllContactsZeroCustom" msgid="5661794891640163617">"Nėra matomų kontaktų."</string>
<string name="listTotalAllContactsZeroStarred" msgid="4176827228429279164">"Į adresyną nieko neįtraukta."</string>
diff --git a/res-common/values-th/strings.xml b/res-common/values-th/strings.xml
index a19dd8a..efc7890 100644
--- a/res-common/values-th/strings.xml
+++ b/res-common/values-th/strings.xml
@@ -256,6 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"ผ่านทาง <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"<xliff:g id="DATE">%1$s</xliff:g> ผ่านทาง <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
- <string name="action_menu_back_from_search" msgid="1138551123844019647">"หยุดค้นหา"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"หยุดการค้นหา"</string>
<string name="description_clear_search" msgid="3893511425518852086">"ล้างการค้นหา"</string>
</resources>
diff --git a/res-common/values/animation_constants.xml b/res-common/values/animation_constants.xml
index 9e59194..36a078a 100644
--- a/res-common/values/animation_constants.xml
+++ b/res-common/values/animation_constants.xml
@@ -15,5 +15,8 @@
~ limitations under the License
-->
<resources>
+ <integer name="dialpad_slide_in_duration">532</integer>
+ <integer name="dialpad_slide_out_duration">257</integer>
+
<integer name="floating_action_button_animation_duration">250</integer>
</resources>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 360a992..8317b18 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -25,8 +25,10 @@
This value is for making the hidden configuration explicit in xml. -->
<dimen name="list_section_divider_min_height">32dip</dimen>
- <!-- Vertical and horizontal padding in between contact tiles -->
- <dimen name="contact_tile_divider_padding">1dip</dimen>
+ <!-- Horizontal padding in between contact tiles -->
+ <dimen name="contact_tile_divider_padding">23dip</dimen>
+ <!-- Horizontal padding before the first tile and after the last tile -->
+ <dimen name="contact_tile_start_end_padding">16dip</dimen>
<!-- Left and right padding for a contact detail item -->
<dimen name="detail_item_side_margin">16dip</dimen>