| commit | b5f94b601efca06c2518935c189e8a22f09ae97b | [log] [tgz] |
|---|---|---|
| author | avipul <avipul@google.com> | Wed Feb 22 17:43:09 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 22 17:43:09 2017 +0000 |
| tree | 7698da3010177840d30ecf623e756bff805561ce | |
| parent | 81b3981a327c2c74ee2cae6b12327a9497632001 [diff] | |
| parent | bf9dddc9e9228478d1c49287271cb757d158a2f3 [diff] |
Added preference for the display of phonetic name fields. am: bf9dddc9e9 Change-Id: I035353bb0e260086ecd76297fb481b7c3b1757ae
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 831d523..6b775cc 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.contacts" - android:versionCode="10706" - android:versionName="1.7.6"> + android:versionCode="20000" + android:versionName="2.0.0"> <uses-sdk android:minSdkVersion="21"
diff --git a/res/layout/contacts_drawer_activity.xml b/res/layout/contacts_drawer_activity.xml index 5b21a31..84e536b 100644 --- a/res/layout/contacts_drawer_activity.xml +++ b/res/layout/contacts_drawer_activity.xml
@@ -48,4 +48,4 @@ android:layout_width="@dimen/drawer_width" android:layout_height="match_parent" /> -</android.support.v4.widget.DrawerLayout> \ No newline at end of file +</android.support.v4.widget.DrawerLayout>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az/strings.xml similarity index 100% rename from res/values-az-rAZ/strings.xml rename to res/values-az/strings.xml
diff --git a/res/values-be-rBY/strings.xml b/res/values-be/strings.xml similarity index 100% rename from res/values-be-rBY/strings.xml rename to res/values-be/strings.xml
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn/strings.xml similarity index 100% rename from res/values-bn-rBD/strings.xml rename to res/values-bn/strings.xml
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs/strings.xml similarity index 100% rename from res/values-bs-rBA/strings.xml rename to res/values-bs/strings.xml
diff --git a/res/values-et-rEE/strings.xml b/res/values-et/strings.xml similarity index 100% rename from res/values-et-rEE/strings.xml rename to res/values-et/strings.xml
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu/strings.xml similarity index 100% rename from res/values-eu-rES/strings.xml rename to res/values-eu/strings.xml
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl/strings.xml similarity index 100% rename from res/values-gl-rES/strings.xml rename to res/values-gl/strings.xml
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu/strings.xml similarity index 100% rename from res/values-gu-rIN/strings.xml rename to res/values-gu/strings.xml
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy/strings.xml similarity index 100% rename from res/values-hy-rAM/strings.xml rename to res/values-hy/strings.xml
diff --git a/res/values-is-rIS/strings.xml b/res/values-is/strings.xml similarity index 100% rename from res/values-is-rIS/strings.xml rename to res/values-is/strings.xml
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka/strings.xml similarity index 100% rename from res/values-ka-rGE/strings.xml rename to res/values-ka/strings.xml
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk/strings.xml similarity index 100% rename from res/values-kk-rKZ/strings.xml rename to res/values-kk/strings.xml
diff --git a/res/values-km-rKH/strings.xml b/res/values-km/strings.xml similarity index 100% rename from res/values-km-rKH/strings.xml rename to res/values-km/strings.xml
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn/strings.xml similarity index 100% rename from res/values-kn-rIN/strings.xml rename to res/values-kn/strings.xml
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky/strings.xml similarity index 100% rename from res/values-ky-rKG/strings.xml rename to res/values-ky/strings.xml
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo/strings.xml similarity index 100% rename from res/values-lo-rLA/strings.xml rename to res/values-lo/strings.xml
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk/strings.xml similarity index 100% rename from res/values-mk-rMK/strings.xml rename to res/values-mk/strings.xml
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml/strings.xml similarity index 100% rename from res/values-ml-rIN/strings.xml rename to res/values-ml/strings.xml
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn/strings.xml similarity index 100% rename from res/values-mn-rMN/strings.xml rename to res/values-mn/strings.xml
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr/strings.xml similarity index 100% rename from res/values-mr-rIN/strings.xml rename to res/values-mr/strings.xml
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms/strings.xml similarity index 100% rename from res/values-ms-rMY/strings.xml rename to res/values-ms/strings.xml
diff --git a/res/values-my-rMM/strings.xml b/res/values-my/strings.xml similarity index 100% rename from res/values-my-rMM/strings.xml rename to res/values-my/strings.xml
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne/strings.xml similarity index 100% rename from res/values-ne-rNP/strings.xml rename to res/values-ne/strings.xml
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa/strings.xml similarity index 100% rename from res/values-pa-rIN/strings.xml rename to res/values-pa/strings.xml
diff --git a/res/values-si-rLK/strings.xml b/res/values-si/strings.xml similarity index 100% rename from res/values-si-rLK/strings.xml rename to res/values-si/strings.xml
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq/strings.xml similarity index 100% rename from res/values-sq-rAL/strings.xml rename to res/values-sq/strings.xml
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta/strings.xml similarity index 100% rename from res/values-ta-rIN/strings.xml rename to res/values-ta/strings.xml
diff --git a/res/values-te-rIN/strings.xml b/res/values-te/strings.xml similarity index 100% rename from res/values-te-rIN/strings.xml rename to res/values-te/strings.xml
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur/strings.xml similarity index 100% rename from res/values-ur-rPK/strings.xml rename to res/values-ur/strings.xml
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz/strings.xml similarity index 100% rename from res/values-uz-rUZ/strings.xml rename to res/values-uz/strings.xml
diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java index ec49d48..3d90173 100644 --- a/src/com/android/contacts/activities/ContactEditorActivity.java +++ b/src/com/android/contacts/activities/ContactEditorActivity.java
@@ -18,7 +18,6 @@ import android.app.Dialog; import android.app.FragmentTransaction; -import android.content.ComponentName; import android.content.ContentValues; import android.content.Intent; import android.net.Uri; @@ -319,11 +318,6 @@ final Intent intent = getIntent(); final String action = intent.getAction(); - // Update the component name of our intent to be this class to clear out any activity - // aliases. Otherwise ContactSaveService won't notify this activity once a save is finished. - // See b/34154706 for more info. - intent.setComponent(new ComponentName(this, ContactEditorActivity.class)); - // Determine whether or not this activity should be finished after the user is done // editing the contact or if this activity should launch another activity to view the // contact's details.