Update Dialer to V10 RC16

This release was created following the instructions at:
go/dialer-aosp-release

Subsequent dialer releases will follow as O bugs are
fixed, until we reach our final RC.

Version: 10
Candidate: RC16
Branch: dialer-android_release_branch/153304843.1
dialer-android/dialer-android_20170416.00/dialer-android_20170416.00_RC16

This release contains the following bug fixes since RC00:
Bug: 37324705 35304403 36067503 35304446 33203808 37280992
37346084 35766990 37481880 37424493 36470282 37347691
37519015 37168472 35805360 37545472 27704934 36515614
35766990 37577470 34739750 35801628 36788693 35264204
36708536 37628370 36904650 37314436 37642171 37530847
37637799 37666625 37548549 37648036 37636412 37323529
37630507 35919141 37198343 37548572 36178218 37640315
37663896 37720467 37275944 37710497 31634477 37744796
37348506 37744796 37568534 37672424 34872683 34873026
37681461 34873295 37748373 37526812 37618638 37663896
37536088 37727455 37165687 36651204 36900708 37323529
36902926 37256480 37328353 37432034 37436952 34093562
37720889 37321935 37780300 37781115 37755902 36588206
34258266 37290464 37698062 37618638 37473004 37432034
37918676 37870494 37722091

Test: make, on device
Change-Id: I99e1a484ccd578c1f8a13e7a6a4b4952f0791297

2 files changed, 175 insertions, 12 deletions

diff --git a/java/com/android/dialer/app/settings/DialerSettingsActivity.java b/java/com/android/dialer/app/settings/DialerSettingsActivity.java
index ff3841aa1..fae5ff3ee 100644
--- a/java/com/android/dialer/app/settings/DialerSettingsActivity.java
+++ b/java/com/android/dialer/app/settings/DialerSettingsActivity.java
@@ -24,6 +24,7 @@ import android.os.Bundle;
 import android.os.UserManager;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
+import android.support.annotation.Nullable;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
@@ -151,21 +152,57 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity {
       return;
     }
 
-    PhoneAccountHandle phoneAccountHandle =
-        getSystemService(TelecomManager.class)
-            .getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
-    if (phoneAccountHandle == null) {
-      LogUtil.e("DialerSettingsActivity.addVoicemailSettings", "phoneAccountHandle is null");
-      return;
-    }
     LogUtil.i("DialerSettingsActivity.addVoicemailSettings", "adding voicemail settings");
     Header voicemailSettings = new Header();
     voicemailSettings.titleRes = R.string.voicemail_settings_label;
-    voicemailSettings.fragment = voicemailSettingsFragment;
-    Bundle bundle = new Bundle();
-    bundle.putParcelable(VoicemailClient.PARAM_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);
-    voicemailSettings.fragmentArguments = bundle;
-    target.add(voicemailSettings);
+    PhoneAccountHandle soleAccount = getSoleSimAccount();
+    if (soleAccount == null) {
+      LogUtil.i(
+          "DialerSettingsActivity.addVoicemailSettings", "showing multi-SIM voicemail settings");
+      voicemailSettings.fragment = PhoneAccountSelectionFragment.class.getName();
+      Bundle bundle = new Bundle();
+      bundle.putString(
+          PhoneAccountSelectionFragment.PARAM_TARGET_FRAGMENT, voicemailSettingsFragment);
+      bundle.putString(
+          PhoneAccountSelectionFragment.PARAM_PHONE_ACCOUNT_HANDLE_KEY,
+          VoicemailClient.PARAM_PHONE_ACCOUNT_HANDLE);
+      bundle.putBundle(PhoneAccountSelectionFragment.PARAM_ARGUMENTS, new Bundle());
+      bundle.putInt(
+          PhoneAccountSelectionFragment.PARAM_TARGET_TITLE_RES, R.string.voicemail_settings_label);
+      voicemailSettings.fragmentArguments = bundle;
+      target.add(voicemailSettings);
+    } else {
+      LogUtil.i(
+          "DialerSettingsActivity.addVoicemailSettings", "showing single-SIM voicemail settings");
+      voicemailSettings.fragment = voicemailSettingsFragment;
+      Bundle bundle = new Bundle();
+      bundle.putParcelable(VoicemailClient.PARAM_PHONE_ACCOUNT_HANDLE, soleAccount);
+      voicemailSettings.fragmentArguments = bundle;
+      target.add(voicemailSettings);
+    }
+  }
+
+  /**
+   * @return the only SIM phone account, or {@code null} if there are none or more than one. Note:
+   *     having a empty SIM slot still count as a PhoneAccountHandle that is "invalid", and
+   *     voicemail settings should still be available for it.
+   */
+  @Nullable
+  private PhoneAccountHandle getSoleSimAccount() {
+    TelecomManager telecomManager = getSystemService(TelecomManager.class);
+    PhoneAccountHandle result = null;
+    for (PhoneAccountHandle phoneAccountHandle : telecomManager.getCallCapablePhoneAccounts()) {
+      PhoneAccount phoneAccount = telecomManager.getPhoneAccount(phoneAccountHandle);
+      if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+        LogUtil.i(
+            "DialerSettingsActivity.getSoleSimAccount", phoneAccountHandle + " is a SIM account");
+        if (result != null) {
+          return null;
+        }
+        result = phoneAccountHandle;
+      }
+    }
+    return result;
   }
 
   /**
diff --git a/java/com/android/dialer/app/settings/PhoneAccountSelectionFragment.java b/java/com/android/dialer/app/settings/PhoneAccountSelectionFragment.java
new file mode 100644
index 000000000..8fd276724
--- /dev/null
+++ b/java/com/android/dialer/app/settings/PhoneAccountSelectionFragment.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.app.settings;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.graphics.drawable.Icon;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceScreen;
+import android.support.annotation.VisibleForTesting;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import java.util.List;
+
+/**
+ * Preference screen that lists SIM phone accounts to select from, and forwards the selected account
+ * to {@link #PARAM_TARGET_FRAGMENT}. Can only be used in a {@link PreferenceActivity}
+ */
+public class PhoneAccountSelectionFragment extends PreferenceFragment {
+
+  /** The {@link PreferenceFragment} to launch after the account is selected. */
+  public static final String PARAM_TARGET_FRAGMENT = "target_fragment";
+
+  /**
+   * The arguments bundle to pass to the {@link #PARAM_TARGET_FRAGMENT}
+   *
+   * @see Fragment#getArguments()
+   */
+  public static final String PARAM_ARGUMENTS = "arguments";
+
+  /**
+   * The key to insert the selected {@link PhoneAccountHandle} to bundle in {@link #PARAM_ARGUMENTS}
+   */
+  public static final String PARAM_PHONE_ACCOUNT_HANDLE_KEY = "phone_account_handle_key";
+
+  /**
+   * The title of the {@link #PARAM_TARGET_FRAGMENT} once it is launched with {@link
+   * PreferenceActivity#startWithFragment(String, Bundle, Fragment, int)}, as a string resource ID.
+   */
+  public static final String PARAM_TARGET_TITLE_RES = "target_title_res";
+
+  private String targetFragment;
+  private Bundle arguments;
+  private String phoneAccountHandleKey;
+  private int titleRes;
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    targetFragment = getArguments().getString(PARAM_TARGET_FRAGMENT);
+    arguments = new Bundle();
+    arguments.putAll(getArguments().getBundle(PARAM_ARGUMENTS));
+    phoneAccountHandleKey = getArguments().getString(PARAM_PHONE_ACCOUNT_HANDLE_KEY);
+    titleRes = getArguments().getInt(PARAM_TARGET_TITLE_RES, 0);
+  }
+
+  final class AccountPreference extends Preference {
+    private final PhoneAccountHandle phoneAccountHandle;
+
+    public AccountPreference(
+        Context context, PhoneAccountHandle phoneAccountHandle, PhoneAccount phoneAccount) {
+      super(context);
+      this.phoneAccountHandle = phoneAccountHandle;
+      setTitle(phoneAccount.getLabel());
+      setSummary(phoneAccount.getShortDescription());
+      Icon icon = phoneAccount.getIcon();
+      if (icon != null) {
+        setIcon(icon.loadDrawable(context));
+      }
+    }
+
+    @VisibleForTesting
+    void click() {
+      onClick();
+    }
+
+    @Override
+    protected void onClick() {
+      super.onClick();
+      PreferenceActivity preferenceActivity = (PreferenceActivity) getActivity();
+      arguments.putParcelable(phoneAccountHandleKey, phoneAccountHandle);
+      preferenceActivity.startWithFragment(targetFragment, arguments, null, 0, titleRes, 0);
+    }
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getContext()));
+    PreferenceScreen screen = getPreferenceScreen();
+
+    TelecomManager telecomManager = getContext().getSystemService(TelecomManager.class);
+
+    List<PhoneAccountHandle> accountHandles = telecomManager.getCallCapablePhoneAccounts();
+
+    Context context = getActivity();
+    for (PhoneAccountHandle handle : accountHandles) {
+      PhoneAccount account = telecomManager.getPhoneAccount(handle);
+      if (account != null) {
+        final boolean isSimAccount =
+            0 != (account.getCapabilities() & PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION);
+        if (isSimAccount) {
+          screen.addPreference(new AccountPreference(context, handle, account));
+        }
+      }
+    }
+  }
+}