commit 7217e6986c333aebb885b0a07a0a9344ef7a814c
author Marcus Hagerott <mhagerott@google.com> Thu Nov 10 10:18:28 2016 -0800
committer Marcus Hagerott <mhagerott@google.com> Fri Nov 11 18:57:19 2016 -0800
tree 7acd62c148349725d1d738d94da587041dfff7fc
parent 219d224fe572ed73eabf590c9bdec3f9a8dbcc3b

Update SIM import UI to match designs

Test
manually verify appearance of SIM import screen

Bug 32748785

Change-Id: I660d848880e6416fdb9c25f8a3c52a6597e64e0a

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

diff --git a/src/com/android/contacts/editor/AccountHeaderPresenter.java b/src/com/android/contacts/editor/AccountHeaderPresenter.java
index 5323c60..d4f613b 100644
--- a/src/com/android/contacts/editor/AccountHeaderPresenter.java
+++ b/src/com/android/contacts/editor/AccountHeaderPresenter.java
@@ -76,6 +76,8 @@
     public AccountHeaderPresenter(View container) {
         mContext = container.getContext();
         mAccountHeaderContainer = container;
+        // mAccountHeaderType is optional and may not be in the container view in which case
+        // the variable will be null
         mAccountHeaderType = (TextView) container.findViewById(R.id.account_type);
         mAccountHeaderName = (TextView) container.findViewById(R.id.account_name);
         mAccountHeaderIcon = (ImageView) container.findViewById(R.id.account_type_icon);
@@ -144,7 +146,9 @@
 
         // Set the account type
         final String selectorTitle = mContext.getResources().getString(mSelectorTitle);
-        mAccountHeaderType.setText(selectorTitle);
+        if (mAccountHeaderType != null) {
+            mAccountHeaderType.setText(selectorTitle);
+        }
 
         // Set the icon
         final AccountDisplayInfo displayInfo = mAccountDisplayInfoFactory