commit 79cfaf0f069b4b99254168c3b8794fa110c6e874
author linyuh <linyuh@google.com> Fri Jun 15 14:33:25 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Mon Jun 18 13:21:47 2018 -0700
tree 6f3a429ac8c4d5d26a51eadfe73e1c47c53cc57b
parent 988a7e99fcbd3aad8503889a550c795b80c31da7

Show "Calling accounts" for all users in DialerSettingsActivity

Bug: 110083450
Test: Manual
PiperOrigin-RevId: 200774928
Change-Id: I4bb036ab5b2e7dc252ad32d49d2370cd17f8e3f8

java/com/android/dialer/app/settings/DialerSettingsActivity.java

diff --git a/java/com/android/dialer/app/settings/DialerSettingsActivity.java b/java/com/android/dialer/app/settings/DialerSettingsActivity.java
index 9cd01b6..d9bcd6b 100644
--- a/java/com/android/dialer/app/settings/DialerSettingsActivity.java
+++ b/java/com/android/dialer/app/settings/DialerSettingsActivity.java
@@ -116,9 +116,7 @@
         (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
 
     // "Call Settings" (full settings) is shown if the current user is primary user and there
-    // is only one SIM. Before N, "Calling accounts" setting is shown if the current user is
-    // primary user and there are multiple SIMs. In N+, "Calling accounts" is shown whenever
-    // "Call Settings" is not shown.
+    // is only one SIM. Otherwise, "Calling accounts" is shown.
     boolean isPrimaryUser = isPrimaryUser();
     if (isPrimaryUser && TelephonyManagerCompat.getPhoneCount(telephonyManager) <= 1) {
       Header callSettingsHeader = new Header();
@@ -128,7 +126,7 @@
       callSettingsHeader.titleRes = R.string.call_settings_label;
       callSettingsHeader.intent = callSettingsIntent;
       target.add(callSettingsHeader);
-    } else if (isPrimaryUser) {
+    } else {
       Header phoneAccountSettingsHeader = new Header();
       Intent phoneAccountSettingsIntent = new Intent(TelecomManager.ACTION_CHANGE_PHONE_ACCOUNTS);
       phoneAccountSettingsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);