Merge "Update content description after updating primary" into nyc-dev
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 6e87e97..3186b89 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -26,10 +26,6 @@
<dimen name="quickcontact_title_initial_margin">32dp</dimen>
<!-- When QC is uncollapsed, the title has this much margin on its bottom -->
<dimen name="quickcontact_title_initial_bottom_margin">0dp</dimen>
- <!-- Initial size of QuickContact's title size -->
- <dimen name="quickcontact_maximum_title_size">56dp</dimen>
- <!-- Initial size of QuickContact's phonetic name size -->
- <dimen name="quickcontact_maximum_phonetic_name_size">50dp</dimen>
<!-- Right margin of the floating action button -->
<dimen name="floating_action_button_margin_right">100dp</dimen>
diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java
index 4096b19..f705819 100644
--- a/src/com/android/contacts/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/editor/TextFieldsEditorView.java
@@ -23,8 +23,10 @@
import android.provider.ContactsContract;
import android.text.Editable;
import android.text.InputType;
+import android.text.Spannable;
import android.text.TextUtils;
import android.text.TextWatcher;
+import android.text.style.TtsSpan;
import android.util.AttributeSet;
import android.util.Log;
import android.util.TypedValue;
@@ -270,6 +272,16 @@
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
+ if (!ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE.equals(
+ getKind().mimeType) || !(s instanceof Spannable)) {
+ return;
+ }
+ final Spannable spannable = (Spannable) s;
+ final TtsSpan[] spans = spannable.getSpans(0, s.length(), TtsSpan.class);
+ for (int i = 0; i < spans.length; i++) {
+ spannable.removeSpan(spans[i]);
+ }
+ PhoneNumberUtilsCompat.addTtsSpan(spannable, 0, s.length());
}
});