Merge "Bump contacts version to 1.31 (2/2)" into ub-contactsdialer-a-dev
diff --git a/res/drawable-hdpi/quantum_ic_assistant_grey600_24.png b/res/drawable-hdpi/quantum_ic_assistant_grey600_24.png
deleted file mode 100644
index 0647862..0000000
--- a/res/drawable-hdpi/quantum_ic_assistant_grey600_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/quantum_ic_assistant_grey600_48.png b/res/drawable-hdpi/quantum_ic_assistant_grey600_48.png
new file mode 100644
index 0000000..a3aa76f
--- /dev/null
+++ b/res/drawable-hdpi/quantum_ic_assistant_grey600_48.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/quantum_ic_assistant_grey600_24.png b/res/drawable-ldrtl-hdpi/quantum_ic_assistant_grey600_24.png
deleted file mode 100644
index 0647862..0000000
--- a/res/drawable-ldrtl-hdpi/quantum_ic_assistant_grey600_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/quantum_ic_assistant_grey600_48.png b/res/drawable-ldrtl-hdpi/quantum_ic_assistant_grey600_48.png
new file mode 100644
index 0000000..a3aa76f
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/quantum_ic_assistant_grey600_48.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/quantum_ic_assistant_grey600_24.png b/res/drawable-ldrtl-mdpi/quantum_ic_assistant_grey600_24.png
deleted file mode 100644
index 0647862..0000000
--- a/res/drawable-ldrtl-mdpi/quantum_ic_assistant_grey600_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/quantum_ic_assistant_grey600_48.png b/res/drawable-ldrtl-mdpi/quantum_ic_assistant_grey600_48.png
new file mode 100644
index 0000000..a3aa76f
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/quantum_ic_assistant_grey600_48.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/quantum_ic_assistant_grey600_24.png b/res/drawable-ldrtl-xhdpi/quantum_ic_assistant_grey600_24.png
deleted file mode 100644
index 0647862..0000000
--- a/res/drawable-ldrtl-xhdpi/quantum_ic_assistant_grey600_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/quantum_ic_assistant_grey600_48.png b/res/drawable-ldrtl-xhdpi/quantum_ic_assistant_grey600_48.png
new file mode 100644
index 0000000..a3aa76f
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/quantum_ic_assistant_grey600_48.png
Binary files differ
diff --git a/res/drawable-mdpi/quantum_ic_assistant_grey600_24.png b/res/drawable-mdpi/quantum_ic_assistant_grey600_24.png
deleted file mode 100644
index 0647862..0000000
--- a/res/drawable-mdpi/quantum_ic_assistant_grey600_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/quantum_ic_assistant_grey600_48.png b/res/drawable-mdpi/quantum_ic_assistant_grey600_48.png
new file mode 100644
index 0000000..a3aa76f
--- /dev/null
+++ b/res/drawable-mdpi/quantum_ic_assistant_grey600_48.png
Binary files differ
diff --git a/res/drawable-xhdpi/quantum_ic_assistant_grey600_24.png b/res/drawable-xhdpi/quantum_ic_assistant_grey600_24.png
deleted file mode 100644
index 0647862..0000000
--- a/res/drawable-xhdpi/quantum_ic_assistant_grey600_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/quantum_ic_assistant_grey600_48.png b/res/drawable-xhdpi/quantum_ic_assistant_grey600_48.png
new file mode 100644
index 0000000..a3aa76f
--- /dev/null
+++ b/res/drawable-xhdpi/quantum_ic_assistant_grey600_48.png
Binary files differ
diff --git a/res/drawable-xxhdpi/quantum_ic_assistant_grey600_24.png b/res/drawable-xxhdpi/quantum_ic_assistant_grey600_24.png
deleted file mode 100644
index 0647862..0000000
--- a/res/drawable-xxhdpi/quantum_ic_assistant_grey600_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/quantum_ic_assistant_grey600_48.png b/res/drawable-xxhdpi/quantum_ic_assistant_grey600_48.png
new file mode 100644
index 0000000..a3aa76f
--- /dev/null
+++ b/res/drawable-xxhdpi/quantum_ic_assistant_grey600_48.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/quantum_ic_assistant_grey600_24.png b/res/drawable-xxxhdpi/quantum_ic_assistant_grey600_24.png
deleted file mode 100644
index 0647862..0000000
--- a/res/drawable-xxxhdpi/quantum_ic_assistant_grey600_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/quantum_ic_assistant_grey600_48.png b/res/drawable-xxxhdpi/quantum_ic_assistant_grey600_48.png
new file mode 100644
index 0000000..a3aa76f
--- /dev/null
+++ b/res/drawable-xxxhdpi/quantum_ic_assistant_grey600_48.png
Binary files differ
diff --git a/res/layout/phonetic_name_edit_expansion_view.xml b/res/layout/phonetic_name_edit_expansion_view.xml
new file mode 100644
index 0000000..1613391
--- /dev/null
+++ b/res/layout/phonetic_name_edit_expansion_view.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/editor_min_line_item_height"
+ android:layout_gravity="top"
+ android:contentDescription="@string/expand_collapse_phonetic_name_fields_description"
+ android:importantForAccessibility="yes"
+ android:focusable="true"
+ android:clickable="true">
+ <ImageView
+ android:id="@+id/expansion_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:duplicateParentState="true"
+ android:background="?android:attr/selectableItemBackground"
+ android:paddingLeft="@dimen/editor_round_button_padding_left"
+ android:paddingRight="@dimen/editor_round_button_padding_right"
+ android:paddingStart="@dimen/editor_round_button_padding_left"
+ android:paddingEnd="@dimen/editor_round_button_padding_right"
+ android:paddingTop="@dimen/editor_round_button_padding_top"
+ android:paddingBottom="@dimen/editor_round_button_padding_bottom" />
+</FrameLayout>
diff --git a/res/layout/phonetic_name_editor_view.xml b/res/layout/phonetic_name_editor_view.xml
index efaf644..f51d3df 100644
--- a/res/layout/phonetic_name_editor_view.xml
+++ b/res/layout/phonetic_name_editor_view.xml
@@ -35,7 +35,7 @@
<include
android:id="@+id/expansion_view_container"
- layout="@layout/name_edit_expansion_view"
+ layout="@layout/phonetic_name_edit_expansion_view"
android:visibility="visible" />
<!-- This isn't used in PhoneticNameEditorView. It is only included so that
diff --git a/res/layout/quickcontact_collapsed_suggestion_card.xml b/res/layout/quickcontact_collapsed_suggestion_card.xml
index 494447f..bf8c97d 100644
--- a/res/layout/quickcontact_collapsed_suggestion_card.xml
+++ b/res/layout/quickcontact_collapsed_suggestion_card.xml
@@ -29,7 +29,7 @@
android:id="@+id/collapsed_suggestion_header">
<ImageView
- android:src="@drawable/quantum_ic_assistant_grey600_24"
+ android:src="@drawable/quantum_ic_assistant_grey600_48"
android:layout_width="@dimen/quickcontact_collapse_icon_size"
android:layout_height="@dimen/quickcontact_collapse_icon_size"
android:layout_margin="@dimen/quickcontact_collapse_image_padding"
@@ -38,7 +38,7 @@
<TextView
android:id="@+id/collapsed_suggestion_card_title"
android:textSize="@dimen/expanding_entry_card_title_text_size"
- android:layout_marginLeft="16dp"
+ android:layout_marginLeft="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
diff --git a/res/layout/quickcontact_expand_suggestion_card.xml b/res/layout/quickcontact_expand_suggestion_card.xml
index c5da833..645d796 100644
--- a/res/layout/quickcontact_expand_suggestion_card.xml
+++ b/res/layout/quickcontact_expand_suggestion_card.xml
@@ -50,6 +50,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/quickcontact_entry_header_text_color"
+ android:lineSpacingMultiplier="1.2"
android:paddingBottom="@dimen/quickcontact_suggestion_card_image_spacing"
android:paddingStart="@dimen/quickcontact_suggestion_card_image_spacing"
android:paddingEnd="@dimen/quickcontact_suggestion_card_image_spacing"/>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index cffe8c4..607c86b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -245,7 +245,7 @@
<dimen name="quickcontact_collapse_view_height">48dp</dimen>
<dimen name="quickcontact_collapse_icon_size">24dp</dimen>
<dimen name="quickcontact_collapse_text_padding">12dp</dimen>
- <dimen name="quickcontact_collapse_image_padding">16dp</dimen>
+ <dimen name="quickcontact_collapse_image_padding">20dp</dimen>
<dimen name="quickcontact_expanding_help_text_size">14sp</dimen>
<dimen name="quickcontact_expanding_button_right_padding">16dp</dimen>
<dimen name="quickcontact_expanding_item_height">72dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a3ef318..bdd9f40 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -813,6 +813,9 @@
<!-- Label for the account selector to indicate which account a contact will be saved to. [CHAR LIMIT=30] -->
<string name="compact_editor_account_selector_title">Saving to</string>
+ <!-- Content description for the account selector to indicate which account a contact will be saved to. [CHAR LIMIT=NONE] -->
+ <string name="compact_editor_account_selector_description">Currently saving to <xliff:g id="account_name">%s</xliff:g>. Double-tap to pick a different account.</string>
+
<!-- Label for the linked contacts selector which indicates the number of raw contacts which have been linked together into the aggregate being viewed. [CHAR LIMIT=40] -->
<plurals name="compact_editor_linked_contacts_selector_title">
<item quantity="one">Linked contact</item>
diff --git a/src/com/android/contacts/editor/CompactRawContactsEditorView.java b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
index 09315d5..52b2ba6 100644
--- a/src/com/android/contacts/editor/CompactRawContactsEditorView.java
+++ b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
@@ -848,9 +848,8 @@
R.string.compact_editor_account_selector_title);
mAccountSelectorType.setText(selectorTitle);
- mAccountSelectorContainer.setContentDescription(
- EditorUiUtils.getAccountInfoContentDescription(
- accountInfo.first, selectorTitle));
+ mAccountSelectorContainer.setContentDescription(getResources().getString(
+ R.string.compact_editor_account_selector_description, accountInfo.first));
mAccountSelectorContainer.setOnClickListener(new View.OnClickListener() {
@Override
