am cfbb4349: Merge "Ripple tint is now color" into lmp-preview-dev
* commit 'cfbb4349520938aecc6bcfedab44f3ccd41e3b50':
Ripple tint is now color
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..fa0bda0
--- /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="@interpolator/ease_in_interpolator"
+ 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..e5d7ed4
--- /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="@interpolator/ease_out_interpolator"
+ 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/ic_back_arrow.xml b/res-common/drawable/ic_back_arrow.xml
new file mode 100644
index 0000000..68a875d
--- /dev/null
+++ b/res-common/drawable/ic_back_arrow.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
+ -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_arrow_back_24dp"
+ android:autoMirrored="true"
+ android:tint="@color/actionbar_icon_color" />
\ 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/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/layout/search_bar_expanded.xml b/res-common/layout/search_bar_expanded.xml
new file mode 100644
index 0000000..c78ce12
--- /dev/null
+++ b/res-common/layout/search_bar_expanded.xml
@@ -0,0 +1,61 @@
+<?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.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/search_box_expanded"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:visibility="gone" >
+
+ <ImageButton
+ android:id="@+id/search_back_button"
+ android:layout_width="@dimen/search_box_icon_size"
+ android:layout_height="@dimen/search_box_icon_size"
+ android:layout_margin="@dimen/search_box_icon_margin"
+ android:src="@drawable/ic_back_arrow"
+ android:background="?android:attr/selectableItemBackground"
+ android:contentDescription="@string/action_menu_back_from_search"
+ android:tint="@color/actionbar_background_color" />
+
+ <EditText
+ android:id="@+id/search_view"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/search_box_icon_size"
+ android:layout_weight="1"
+ android:layout_marginLeft="@dimen/search_box_text_left_margin"
+ android:textSize="@dimen/search_text_size"
+ android:fontFamily="@string/search_font_family"
+ android:textColor="@color/searchbox_text_color"
+ android:textColorHint="@color/searchbox_hint_text_color"
+ android:background="@null"
+ android:inputType="textFilter"
+ android:singleLine="true"
+ android:imeOptions="flagNoExtractUi" />
+
+ <ImageView
+ android:id="@+id/search_close_button"
+ android:layout_height="@dimen/search_box_icon_size"
+ android:layout_width="@dimen/search_box_icon_size"
+ android:layout_margin="@dimen/search_box_icon_margin"
+ android:src="@drawable/ic_close_dk"
+ android:clickable="true"
+ android:background="?android:attr/selectableItemBackground"
+ android:contentDescription="@string/description_clear_search"
+ android:tint="@color/searchbox_icon_tint"/>
+
+</LinearLayout>
diff --git a/res-common/values-af/strings.xml b/res-common/values-af/strings.xml
index 5871f16..797896e 100644
--- a/res-common/values-af/strings.xml
+++ b/res-common/values-af/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"via <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> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"hou op soek"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Vee soektog uit"</string>
</resources>
diff --git a/res-common/values-am/strings.xml b/res-common/values-am/strings.xml
index aaa9bc2..e0d25b6 100644
--- a/res-common/values-am/strings.xml
+++ b/res-common/values-am/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"ፍለጋን አጽዳ"</string>
</resources>
diff --git a/res-common/values-ar/strings.xml b/res-common/values-ar/strings.xml
index a009822..7af04a4 100644
--- a/res-common/values-ar/strings.xml
+++ b/res-common/values-ar/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"٩"</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="description_clear_search" msgid="3893511425518852086">"محو البحث"</string>
</resources>
diff --git a/res-common/values-bg/strings.xml b/res-common/values-bg/strings.xml
index 011600a..af964da 100644
--- a/res-common/values-bg/strings.xml
+++ b/res-common/values-bg/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"Изчистване на търсенето"</string>
</resources>
diff --git a/res-common/values-ca/strings.xml b/res-common/values-ca/strings.xml
index 700e6d6..ad3c9a0 100644
--- a/res-common/values-ca/strings.xml
+++ b/res-common/values-ca/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"mitjançant <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> mitjançant <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"Atura la cerca."</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Esborra la cerca."</string>
</resources>
diff --git a/res-common/values-cs/strings.xml b/res-common/values-cs/strings.xml
index df9c4c1..b5c277b 100644
--- a/res-common/values-cs/strings.xml
+++ b/res-common/values-cs/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"prostřednictvím zdroje <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> prostřednictvím zdroje <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"zastavit vyhledávání"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Vymazat vyhledávání"</string>
</resources>
diff --git a/res-common/values-da/strings.xml b/res-common/values-da/strings.xml
index 8d1d359..50e92cc 100644
--- a/res-common/values-da/strings.xml
+++ b/res-common/values-da/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"via <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> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"stop søgning"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Ryd søgning"</string>
</resources>
diff --git a/res-common/values-de/strings.xml b/res-common/values-de/strings.xml
index 6da3f47..1805137 100644
--- a/res-common/values-de/strings.xml
+++ b/res-common/values-de/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"über <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> über <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"Suche beenden"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Suche zurücksetzen"</string>
</resources>
diff --git a/res-common/values-el/strings.xml b/res-common/values-el/strings.xml
index 91602df..4bb1dee 100644
--- a/res-common/values-el/strings.xml
+++ b/res-common/values-el/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"Εκκαθάριση αναζητήσεων"</string>
</resources>
diff --git a/res-common/values-en-rGB/strings.xml b/res-common/values-en-rGB/strings.xml
index 7f13c65..75510b9 100644
--- a/res-common/values-en-rGB/strings.xml
+++ b/res-common/values-en-rGB/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"via <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> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"stop searching"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Clear search"</string>
</resources>
diff --git a/res-common/values-en-rIN/strings.xml b/res-common/values-en-rIN/strings.xml
index 7f13c65..75510b9 100644
--- a/res-common/values-en-rIN/strings.xml
+++ b/res-common/values-en-rIN/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"via <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> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"stop searching"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Clear search"</string>
</resources>
diff --git a/res-common/values-es-rUS/strings.xml b/res-common/values-es-rUS/strings.xml
index e03adaa..b4938cf 100644
--- a/res-common/values-es-rUS/strings.xml
+++ b/res-common/values-es-rUS/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"a través de <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> a través de <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"detener la búsqueda"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Eliminar búsqueda"</string>
</resources>
diff --git a/res-common/values-es/strings.xml b/res-common/values-es/strings.xml
index 3815c64..db2e517 100644
--- a/res-common/values-es/strings.xml
+++ b/res-common/values-es/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"a través de <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> a través de <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"dejar de buscar"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Borrar la búsqueda"</string>
</resources>
diff --git a/res-common/values-et-rEE/strings.xml b/res-common/values-et-rEE/strings.xml
index 319111e..5ceb3bf 100644
--- a/res-common/values-et-rEE/strings.xml
+++ b/res-common/values-et-rEE/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"allika <xliff:g id="SOURCE">%1$s</xliff:g> kaudu"</string>
<string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"<xliff:g id="DATE">%1$s</xliff:g> allika <xliff:g id="SOURCE">%2$s</xliff:g> kaudu"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"otsimise peatamine"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Otsingu kustutamine"</string>
</resources>
diff --git a/res-common/values-fa/strings.xml b/res-common/values-fa/strings.xml
index 77c759b..5762d2f 100644
--- a/res-common/values-fa/strings.xml
+++ b/res-common/values-fa/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"۹"</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="description_clear_search" msgid="3893511425518852086">"پاک کردن جستجو"</string>
</resources>
diff --git a/res-common/values-fi/strings.xml b/res-common/values-fi/strings.xml
index b51ca36..110c660 100644
--- a/res-common/values-fi/strings.xml
+++ b/res-common/values-fi/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"lähteestä <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> lähteestä <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"lopeta hakeminen"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Tyhjennä haku"</string>
</resources>
diff --git a/res-common/values-fr-rCA/strings.xml b/res-common/values-fr-rCA/strings.xml
index e7b08b0..7d3c744 100644
--- a/res-common/values-fr-rCA/strings.xml
+++ b/res-common/values-fr-rCA/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"par <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> par <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"arrêter la recherche"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Effacer les termes de recherche"</string>
</resources>
diff --git a/res-common/values-fr/strings.xml b/res-common/values-fr/strings.xml
index 41ea914..462400e 100644
--- a/res-common/values-fr/strings.xml
+++ b/res-common/values-fr/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"via <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> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"arrêter la recherche"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Effacer la recherche"</string>
</resources>
diff --git a/res-common/values-hi/strings.xml b/res-common/values-hi/strings.xml
index 974b293..a597fed 100644
--- a/res-common/values-hi/strings.xml
+++ b/res-common/values-hi/strings.xml
@@ -256,4 +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="SOURCE">%2$s</xliff:g> द्वारा <xliff:g id="DATE">%1$s</xliff:g> को"</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-hr/strings.xml b/res-common/values-hr/strings.xml
index bf1cbbe..a08647b 100644
--- a/res-common/values-hr/strings.xml
+++ b/res-common/values-hr/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"putem izvora <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> putem izvora <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"zaustavi pretraživanje"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Brisanje pretraživanja"</string>
</resources>
diff --git a/res-common/values-hu/strings.xml b/res-common/values-hu/strings.xml
index 7b9c5c0..eb5cb9c 100644
--- a/res-common/values-hu/strings.xml
+++ b/res-common/values-hu/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"itt: <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> itt: <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"keresés leállítása"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Keresés törlése"</string>
</resources>
diff --git a/res-common/values-hy-rAM/strings.xml b/res-common/values-hy-rAM/strings.xml
index 7debbbb..3fed48a 100644
--- a/res-common/values-hy-rAM/strings.xml
+++ b/res-common/values-hy-rAM/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"Մաքրել որոնման դաշտը"</string>
</resources>
diff --git a/res-common/values-in/strings.xml b/res-common/values-in/strings.xml
index 2dcfaa2..646b1af 100644
--- a/res-common/values-in/strings.xml
+++ b/res-common/values-in/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"melalui <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> melalui <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"menghentikan penelusuran"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Hapus penelusuran"</string>
</resources>
diff --git a/res-common/values-it/strings.xml b/res-common/values-it/strings.xml
index 8af9e15..323be09 100644
--- a/res-common/values-it/strings.xml
+++ b/res-common/values-it/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"tramite <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> tramite <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"interrompi ricerca"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Cancella ricerca"</string>
</resources>
diff --git a/res-common/values-iw/strings.xml b/res-common/values-iw/strings.xml
index 6d77ec7..9264620 100644
--- a/res-common/values-iw/strings.xml
+++ b/res-common/values-iw/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"נקה את החיפוש"</string>
</resources>
diff --git a/res-common/values-ja/strings.xml b/res-common/values-ja/strings.xml
index 447edfb..656ba29 100644
--- a/res-common/values-ja/strings.xml
+++ b/res-common/values-ja/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"検索をクリア"</string>
</resources>
diff --git a/res-common/values-ka-rGE/strings.xml b/res-common/values-ka-rGE/strings.xml
index e03936b..3080549 100644
--- a/res-common/values-ka-rGE/strings.xml
+++ b/res-common/values-ka-rGE/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"ძიების გასუფთავება"</string>
</resources>
diff --git a/res-common/values-km-rKH/strings.xml b/res-common/values-km-rKH/strings.xml
index 0011f60..8e2ce28 100644
--- a/res-common/values-km-rKH/strings.xml
+++ b/res-common/values-km-rKH/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"សម្អាតការស្វែងរក"</string>
</resources>
diff --git a/res-common/values-ko/strings.xml b/res-common/values-ko/strings.xml
index 0fab86c..8786220 100644
--- a/res-common/values-ko/strings.xml
+++ b/res-common/values-ko/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"검색창 지우기"</string>
</resources>
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-land/integers.xml b/res-common/values-land/integers.xml
index e0d1e05..8ddef80 100644
--- a/res-common/values-land/integers.xml
+++ b/res-common/values-land/integers.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
<resources>
- <integer name="contact_tile_column_count_in_favorites">4</integer>
+ <integer name="contact_tile_column_count_in_favorites">3</integer>
<!-- The number of characters in the snippet before we need to tokenize and ellipse. -->
<integer name="snippet_length_before_tokenize">60</integer>
diff --git a/res-common/values-lo-rLA/strings.xml b/res-common/values-lo-rLA/strings.xml
index 784318f..bdcc800 100644
--- a/res-common/values-lo-rLA/strings.xml
+++ b/res-common/values-lo-rLA/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"ລຶບການຊອກຫາ"</string>
</resources>
diff --git a/res-common/values-lt/strings.xml b/res-common/values-lt/strings.xml
index 926d75f..9f8c000 100644
--- a/res-common/values-lt/strings.xml
+++ b/res-common/values-lt/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"naudojant „<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> naudojant „<xliff:g id="SOURCE">%2$s</xliff:g>“"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"sustabdyti paiešką"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Išvalyti paiešką"</string>
</resources>
diff --git a/res-common/values-lv/strings.xml b/res-common/values-lv/strings.xml
index 49e0377..d2968a0 100644
--- a/res-common/values-lv/strings.xml
+++ b/res-common/values-lv/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"izmantojot <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>, izmantojot <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"pārtraukt meklēšanu"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Notīrīt meklēšanas lauku"</string>
</resources>
diff --git a/res-common/values-mn-rMN/strings.xml b/res-common/values-mn-rMN/strings.xml
index 4fbf4a3..67e9f72 100644
--- a/res-common/values-mn-rMN/strings.xml
+++ b/res-common/values-mn-rMN/strings.xml
@@ -258,4 +258,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="SOURCE">%2$s</xliff:g>-н <xliff:g id="DATE">%1$s</xliff:g>"</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-ms-rMY/strings.xml b/res-common/values-ms-rMY/strings.xml
index 6378318..ff81da8 100644
--- a/res-common/values-ms-rMY/strings.xml
+++ b/res-common/values-ms-rMY/strings.xml
@@ -258,4 +258,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"melalui <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> melalui <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"berhenti mencari"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Kosongkan carian"</string>
</resources>
diff --git a/res-common/values-nb/strings.xml b/res-common/values-nb/strings.xml
index 936a7a9..dd13bad 100644
--- a/res-common/values-nb/strings.xml
+++ b/res-common/values-nb/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"via <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> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"avslutt søket"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Slett søket"</string>
</resources>
diff --git a/res-common/values-nl/strings.xml b/res-common/values-nl/strings.xml
index 8f90a54..b8a3143 100644
--- a/res-common/values-nl/strings.xml
+++ b/res-common/values-nl/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"via <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> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"stoppen met zoeken"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Zoekopdracht wissen"</string>
</resources>
diff --git a/res-common/values-pl/strings.xml b/res-common/values-pl/strings.xml
index b67ae3c..244abc6 100644
--- a/res-common/values-pl/strings.xml
+++ b/res-common/values-pl/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"przez: <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> przez: <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"zatrzymaj wyszukiwanie"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Wyczyść wyszukiwanie"</string>
</resources>
diff --git a/res-common/values-pt-rPT/strings.xml b/res-common/values-pt-rPT/strings.xml
index e6934a4..b2d9ace 100644
--- a/res-common/values-pt-rPT/strings.xml
+++ b/res-common/values-pt-rPT/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"através do <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> através do <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"parar de pesquisar"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Limpar pesquisa"</string>
</resources>
diff --git a/res-common/values-pt/strings.xml b/res-common/values-pt/strings.xml
index ef03125..e6d2247 100644
--- a/res-common/values-pt/strings.xml
+++ b/res-common/values-pt/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"via <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> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"parar de pesquisar"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Limpar pesquisa"</string>
</resources>
diff --git a/res-common/values-rm/strings.xml b/res-common/values-rm/strings.xml
index 14afb0c..26cd680 100644
--- a/res-common/values-rm/strings.xml
+++ b/res-common/values-rm/strings.xml
@@ -489,4 +489,8 @@
<skip />
<!-- no translation found for contact_status_update_attribution_with_date (7492465535645607473) -->
<skip />
+ <!-- no translation found for action_menu_back_from_search (1138551123844019647) -->
+ <skip />
+ <!-- no translation found for description_clear_search (3893511425518852086) -->
+ <skip />
</resources>
diff --git a/res-common/values-ro/strings.xml b/res-common/values-ro/strings.xml
index b6bd34f..3bdf3e9 100644
--- a/res-common/values-ro/strings.xml
+++ b/res-common/values-ro/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"prin <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> prin <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"nu mai căutați"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Ștergeți căutarea"</string>
</resources>
diff --git a/res-common/values-ru/strings.xml b/res-common/values-ru/strings.xml
index b6a3342..7a83feb 100644
--- a/res-common/values-ru/strings.xml
+++ b/res-common/values-ru/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"Очистить условия поиска"</string>
</resources>
diff --git a/res-common/values-sk/strings.xml b/res-common/values-sk/strings.xml
index c06dc8f..5e35968 100644
--- a/res-common/values-sk/strings.xml
+++ b/res-common/values-sk/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"zdroj: <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>, zdroj: <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"zastaviť vyhľadávanie"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Vymazať vyhľadávanie"</string>
</resources>
diff --git a/res-common/values-sl/strings.xml b/res-common/values-sl/strings.xml
index 47cbe72..7304243 100644
--- a/res-common/values-sl/strings.xml
+++ b/res-common/values-sl/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"vir: <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"vir: <xliff:g id="SOURCE">%2$s</xliff:g> – <xliff:g id="DATE">%1$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"ustavitev iskanja"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Počisti iskalno polje"</string>
</resources>
diff --git a/res-common/values-sr/strings.xml b/res-common/values-sr/strings.xml
index ad366ad..3e92b7f 100644
--- a/res-common/values-sr/strings.xml
+++ b/res-common/values-sr/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"Брисање претраге"</string>
</resources>
diff --git a/res-common/values-sv/strings.xml b/res-common/values-sv/strings.xml
index db8d4bf..0a6b30e 100644
--- a/res-common/values-sv/strings.xml
+++ b/res-common/values-sv/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"via <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> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"avbryt sökning"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Rensa sökning"</string>
</resources>
diff --git a/res-common/values-sw/strings.xml b/res-common/values-sw/strings.xml
index d89ed12..c1b0e8b 100644
--- a/res-common/values-sw/strings.xml
+++ b/res-common/values-sw/strings.xml
@@ -258,4 +258,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"kupitia <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> kupitia <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"acha kutafuta"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Futa utafutaji"</string>
</resources>
diff --git a/res-common/values-th/strings.xml b/res-common/values-th/strings.xml
index 422c42f..efc7890 100644
--- a/res-common/values-th/strings.xml
+++ b/res-common/values-th/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"ล้างการค้นหา"</string>
</resources>
diff --git a/res-common/values-tl/strings.xml b/res-common/values-tl/strings.xml
index d7160fe..e21a8d0 100644
--- a/res-common/values-tl/strings.xml
+++ b/res-common/values-tl/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"sa pamamagitan ng <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> sa pamamagitan ng <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"ihinto ang paghahanap"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"I-clear ang paghahanap"</string>
</resources>
diff --git a/res-common/values-tr/strings.xml b/res-common/values-tr/strings.xml
index 1da06fc..3299f2c 100644
--- a/res-common/values-tr/strings.xml
+++ b/res-common/values-tr/strings.xml
@@ -256,4 +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> üzerinden"</string>
<string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"<xliff:g id="SOURCE">%2$s</xliff:g> üzerinden şu zamanda: <xliff:g id="DATE">%1$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"aramayı durdur"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Aramayı temizle"</string>
</resources>
diff --git a/res-common/values-uk/strings.xml b/res-common/values-uk/strings.xml
index b7bc98e..e255b05 100644
--- a/res-common/values-uk/strings.xml
+++ b/res-common/values-uk/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"Очистити поле пошуку"</string>
</resources>
diff --git a/res-common/values-vi/strings.xml b/res-common/values-vi/strings.xml
index 691a0ae..3ce6047 100644
--- a/res-common/values-vi/strings.xml
+++ b/res-common/values-vi/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"qua <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> qua <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"ngừng tìm kiếm"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Xóa tìm kiếm"</string>
</resources>
diff --git a/res-common/values-zh-rCN/strings.xml b/res-common/values-zh-rCN/strings.xml
index 2fa1a85..250b07c 100644
--- a/res-common/values-zh-rCN/strings.xml
+++ b/res-common/values-zh-rCN/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"清除搜索内容"</string>
</resources>
diff --git a/res-common/values-zh-rHK/strings.xml b/res-common/values-zh-rHK/strings.xml
index f1947f6..dc3385f 100644
--- a/res-common/values-zh-rHK/strings.xml
+++ b/res-common/values-zh-rHK/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"清除搜尋"</string>
</resources>
diff --git a/res-common/values-zh-rTW/strings.xml b/res-common/values-zh-rTW/strings.xml
index 7253017..775c496 100644
--- a/res-common/values-zh-rTW/strings.xml
+++ b/res-common/values-zh-rTW/strings.xml
@@ -256,4 +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="description_clear_search" msgid="3893511425518852086">"清除搜尋"</string>
</resources>
diff --git a/res-common/values-zu/strings.xml b/res-common/values-zu/strings.xml
index 040a41a..5e667db 100644
--- a/res-common/values-zu/strings.xml
+++ b/res-common/values-zu/strings.xml
@@ -256,4 +256,6 @@
<string name="dialpad_9_number" msgid="7639250786374503913">"9"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"nge-<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> nge-<xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+ <string name="action_menu_back_from_search" msgid="1138551123844019647">"misa ukusesha"</string>
+ <string name="description_clear_search" msgid="3893511425518852086">"Sula usesho"</string>
</resources>
diff --git a/res-common/values/animation_constants.xml b/res-common/values/animation_constants.xml
new file mode 100644
index 0000000..36a078a
--- /dev/null
+++ b/res-common/values/animation_constants.xml
@@ -0,0 +1,22 @@
+<?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>
+ <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/colors.xml b/res-common/values/colors.xml
index 1d727d5..6b31491 100644
--- a/res-common/values/colors.xml
+++ b/res-common/values/colors.xml
@@ -78,6 +78,10 @@
<!-- Background color of action bars. Ensure this stays in sync with packages/Telephony
actionbar_background_color. -->
<color name="actionbar_background_color">#0fc6dc</color>
+ <!-- Color for icons in the actionbar -->
+ <color name="actionbar_icon_color">#ffffff</color>
+ <!-- Darker version of the actionbar color. Used for the status bar and navigation bar colors. -->
+ <color name="actionbar_background_color_dark">#008aa1</color>
<!-- Color of action bar text. Ensure this stays in sync with packages/Telephony
phone_settings_actionbar_text_color-->
@@ -92,4 +96,12 @@
<color name="dialpad_digits_text_color">#666666</color>
<color name="dialpad_separator_line_color">#dadada</color>
<color name="dialpad_icon_tint">#b3b3b3</color>
+
+ <!-- Text color of the search box text as entered by user -->
+ <color name="searchbox_text_color">#000000</color>
+ <!-- Background color of the search box -->
+ <color name="searchbox_background_color">#ffffff</color>
+ <!-- Text color of the search box hint text -->
+ <color name="searchbox_hint_text_color">#a4a4a4</color>
+ <color name="searchbox_icon_tint">#a4a4a4</color>
</resources>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 96edaf5..360a992 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -102,6 +102,12 @@
<!-- Padding to be applied to the bottom of lists to make space for the floating action
button -->
<dimen name="floating_action_button_list_bottom_padding">88dp</dimen>
+ <!-- Right margin of the floating action button -->
+ <dimen name="floating_action_button_margin_right">16dp</dimen>
+ <!-- Bottom margin of the floating action button -->
+ <dimen name="floating_action_button_margin_bottom">16dp</dimen>
+ <!-- Offset of bottom margin of the floating action button used when dialpad is up -->
+ <dimen name="floating_action_button_dialpad_margin_bottom_offset">4dp</dimen>
<!-- Height of the selection indicator of a tab. -->
<dimen name="tab_selected_underline_height">3dp</dimen>
@@ -131,4 +137,13 @@
<dimen name="dialpad_key_button_translate_y">100dp</dimen>
+
+ <!-- Padding around the icon in the search box. -->
+ <dimen name="search_box_icon_margin">4dp</dimen>
+ <!-- Size of the icon (voice search, close search) in the search box. -->
+ <dimen name="search_box_icon_size">28dp</dimen>
+ <!-- Left margin of the text field in the search box. -->
+ <dimen name="search_box_text_left_margin">27dp</dimen>
+ <!-- Search box text size -->
+ <dimen name="search_text_size">14sp</dimen>
</resources>
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index 0346d4e..095157f 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -736,6 +736,7 @@
-->
<string name="description_delete_button">backspace</string>
+ <!-- String describing the button used to add a plus (+) symbol to the dialpad -->
<string name="description_image_button_plus">plus</string>
<!-- String describing the Voicemail ImageButton
@@ -807,4 +808,15 @@
<!-- Font family used when drawing letters for letter tile avatars.
Do not translate. -->
<string name="letter_tile_letter_font_family">sans-serif-thin</string>
+
+ <!-- Content description for the fake action menu up button as used
+ inside search. [CHAR LIMIT=NONE] -->
+ <string name="action_menu_back_from_search">stop searching</string>
+
+ <!-- String describing the icon used to clear the search field -->
+ <string name="description_clear_search">Clear search</string>
+
+ <!-- The font-family to use for the text inside the searchbox.
+ Do not translate. -->
+ <string name="search_font_family">sans-serif</string>
</resources>
diff --git a/res-common/values/styles.xml b/res-common/values/styles.xml
index 0f9fc90..701bc2d 100644
--- a/res-common/values/styles.xml
+++ b/res-common/values/styles.xml
@@ -67,7 +67,7 @@
<item name="android:textColor">#888888</item>
</style>
- <style name="ListViewStyle" parent="@android:style/Widget.Holo.Light.ListView">
+ <style name="ListViewStyle" parent="@android:style/Widget.Material.Light.ListView">
<item name="android:overScrollMode">always</item>
</style>