commit 170ed2f4a7a6400bb72ea7bb8a42838fd5e0f6e0
author Tingting Wang <tingtingw@google.com> Fri Jul 01 16:53:34 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 01 16:53:35 2016 +0000
tree e42b8ba9a825b602b34d849b61a07b91e2ecd0de
parent ecb6b37a2ea206aa89c960fa80bc63d0de6efe13
parent a5b06ce36db878f2c056fce9bf68d3ca0dcda41b

Merge "Move "Blocked numbers" to better location."

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index a0ceed0..7b5f3e6 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -518,6 +518,9 @@
             return;
         }
 
+        // Scroll to top after filter is changed.
+        mAllFragment.getListView().setSelectionAfterHeaderView();
+
         setFilterAndUpdateTitle(mContactListFilterController.getFilter());
         showFabWithAnimation(shouldShowFabForAccount());
 

src/com/android/contacts/editor/EditorUiUtils.java

diff --git a/src/com/android/contacts/editor/EditorUiUtils.java b/src/com/android/contacts/editor/EditorUiUtils.java
index 844ac45..0a5c765 100644
--- a/src/com/android/contacts/editor/EditorUiUtils.java
+++ b/src/com/android/contacts/editor/EditorUiUtils.java
@@ -137,28 +137,25 @@
     public static Pair<String,String> getAccountInfo(Context context, String accountName,
             AccountType accountType) {
         CharSequence accountTypeDisplayLabel = accountType.getDisplayLabel(context);
-        if (TextUtils.isEmpty(accountTypeDisplayLabel)) {
+        if (TextUtils.isEmpty(accountTypeDisplayLabel)
+                || TextUtils.equals(
+                        context.getString(R.string.account_phone), accountTypeDisplayLabel)) {
             accountTypeDisplayLabel = context.getString(R.string.account_phone);
+        } else if (GoogleAccountType.ACCOUNT_TYPE.equals(accountType.accountType)
+                && accountType.dataSet == null){
+            accountTypeDisplayLabel = context.getString(R.string.google_account_type_format,
+                    accountTypeDisplayLabel);
+        } else {
+            accountTypeDisplayLabel = context.getString(R.string.account_type_format,
+                    accountTypeDisplayLabel);
         }
 
         if (TextUtils.isEmpty(accountName)) {
-            return new Pair<>(
-                    /* accountName =*/ null,
-                    context.getString(R.string.account_type_format, accountTypeDisplayLabel));
+            return new Pair<>(/* accountName */ null, accountTypeDisplayLabel.toString());
         }
 
-        final String accountNameDisplayLabel =
-                context.getString(R.string.from_account_format, accountName);
-
-        if (GoogleAccountType.ACCOUNT_TYPE.equals(accountType.accountType)
-                && accountType.dataSet == null) {
-            return new Pair<>(
-                    accountNameDisplayLabel,
-                    context.getString(R.string.google_account_type_format, accountTypeDisplayLabel));
-        }
-        return new Pair<>(
-                accountNameDisplayLabel,
-                context.getString(R.string.account_type_format, accountTypeDisplayLabel));
+        return new Pair<>(context.getString(R.string.from_account_format, accountName),
+                accountTypeDisplayLabel.toString());
     }
 
     /**

tests/src/com/android/contacts/editor/EditorUiUtilsTest.java

diff --git a/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java b/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java
index 1fb5cb7..19f28d3 100644
--- a/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java
+++ b/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java
@@ -119,10 +119,7 @@
         assertNotNull(pair);
         assertEquals(getContext().getString(R.string.from_account_format, ACCOUNT_NAME),
                 pair.first); // somebody@lunkedin.com
-        assertEquals(
-                getContext().getString(R.string.account_type_format,
-                        getContext().getString(R.string.account_phone)),
-                pair.second); // "Phone-only, unsynced contact"
+        assertEquals(getContext().getString(R.string.account_phone), pair.second); // Device
     }
 
     public void testGetAccountInfo_NoAccountName_DisplayLabel() {
@@ -133,6 +130,14 @@
         assertNull(pair.first);
         assertEquals(getContext().getString(R.string.account_type_format, DISPLAY_LABEL),
                 pair.second); // LunkedIn contact
+
+        final Pair pairDevice = EditorUiUtils.getAccountInfo(
+                getContext(),
+                /* accountName =*/ null,
+                new MockAccountType(getContext().getString(R.string.account_phone)));
+        assertNotNull(pairDevice);
+        assertNull(pairDevice.first);
+        assertEquals(getContext().getString(R.string.account_phone), pairDevice.second); // Device
     }
 
     public void testGetAccountInfo_NoAccountName_NoDisplayLabel() {
@@ -141,10 +146,7 @@
 
         assertNotNull(pair);
         assertNull(pair.first);
-        assertEquals(
-                getContext().getString(R.string.account_type_format,
-                        getContext().getString(R.string.account_phone)),
-                pair.second); // "Phone-only, unsynced contact"
+        assertEquals(getContext().getString(R.string.account_phone), pair.second); // Device
     }
 
     public void testGetRingtongStrFromUri_lessThanOrEqualsToM() {