Remove SelectAccountDialogFragment for PhoneAccount on Dialer app (2/2)

One-time select will no longer be available within the dialer app so the
fragment and menu item have been removed.

Bug: 15473965
Change-Id: Id72b82ff1f70dc5830ce8d5b30b3559c8186dffe

3 files changed, 8 insertions, 166 deletions

diff --git a/src/com/android/contacts/common/CallUtil.java b/src/com/android/contacts/common/CallUtil.java
index 524254be..3f99d7f6 100644
--- a/src/com/android/contacts/common/CallUtil.java
+++ b/src/com/android/contacts/common/CallUtil.java
@@ -94,6 +94,14 @@ public class CallUtil {
     /**
      * A variant of {@link #getCallIntent(String, String)} for starting a video call.
      */
+    public static Intent getVideoCallIntent(String number, String callOrigin) {
+        return getCallIntent(getCallUri(number), callOrigin, null,
+                VideoCallProfile.VIDEO_STATE_BIDIRECTIONAL);
+    }
+
+    /**
+     * A variant of {@link #getCallIntent(String, String, PhoneAccount)} for starting a video call.
+     */
     public static Intent getVideoCallIntent(
             String number, String callOrigin, PhoneAccount account) {
         return getCallIntent(getCallUri(number), callOrigin, account,
diff --git a/src/com/android/contacts/common/PhoneAccountManager.java b/src/com/android/contacts/common/PhoneAccountManager.java
deleted file mode 100644
index c3d399f1..00000000
--- a/src/com/android/contacts/common/PhoneAccountManager.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2014 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.contacts.common;
-
-import android.telecomm.PhoneAccount;
-import android.telephony.TelephonyManager;
-
-import java.util.List;
-
-/**
- * To pass current account information between activities/fragments.
- */
-public class PhoneAccountManager {
-    private PhoneAccount mCurrentAccount = null;
-    private TelephonyManager mTelephonyManager;
-
-    public PhoneAccountManager(TelephonyManager telephonyManager, PhoneAccount account) {
-        mTelephonyManager = telephonyManager;
-        mCurrentAccount = account;
-    }
-
-    public PhoneAccountManager(TelephonyManager telephonyManager) {
-        mTelephonyManager = telephonyManager;
-    }
-
-    public PhoneAccount getCurrentAccount() {
-        return mCurrentAccount;
-    }
-
-    public void setCurrentAccount(PhoneAccount account) {
-        mCurrentAccount = account;
-    }
-
-    public List<PhoneAccount> getAccounts() {
-        return mTelephonyManager.getAccounts();
-    }
-}
diff --git a/src/com/android/contacts/common/dialog/SelectAccountDialogFragment.java b/src/com/android/contacts/common/dialog/SelectAccountDialogFragment.java
deleted file mode 100644
index 5fdeba20..00000000
--- a/src/com/android/contacts/common/dialog/SelectAccountDialogFragment.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2014 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.contacts.common.dialog;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.FragmentManager;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.telecomm.PhoneAccount;
-
-import com.android.contacts.common.PhoneAccountManager;
-import com.android.contacts.common.R;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Dialog that allows the user to switch between default SIM cards
- */
-public class SelectAccountDialogFragment extends DialogFragment {
-    private PhoneAccountManager mAccountManager;
-    private int mSelection;
-    private List<PhoneAccount> mAccounts;
-    private static final int NO_SELECTION = -1;
-
-    /* Preferred way to show this dialog */
-    public static void show(FragmentManager fragmentManager,
-            PhoneAccountManager accountManager) {
-        SelectAccountDialogFragment fragment = new SelectAccountDialogFragment();
-        fragment.mAccountManager = accountManager;
-        fragment.show(fragmentManager, "selectAccount");
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        mAccounts = mAccountManager.getAccounts();
-        mSelection = NO_SELECTION;
-
-        final DialogInterface.OnClickListener selectionListener =
-                new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                mSelection = which;
-            }
-        };
-        final DialogInterface.OnClickListener okListener =
-                new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int id) {
-                if (mSelection != NO_SELECTION) {
-                    // No need to update the current account if it has not been changed
-                    mAccountManager.setCurrentAccount(mAccounts.get(mSelection));
-                }
-            }
-        };
-
-        CharSequence[] names = getAccountNames();
-        return new AlertDialog.Builder(getActivity())
-                .setTitle(R.string.menu_select_sim)
-                .setSingleChoiceItems(names, getSelectedAccountIndex(names), selectionListener)
-                .setPositiveButton(android.R.string.ok, okListener)
-                .setNegativeButton(android.R.string.cancel, null)
-                .create();
-    }
-
-    /**
-     * Helper function to extract the index of the currently selected account.
-     * Used in the dialog as the initially selected radio button.
-     *
-     * @param activeSubs String list of the labels referring to each of possible
-     *         active accounts to choose from
-     * @return the index of the selected account in the array of accounts
-     */
-    private int getSelectedAccountIndex(CharSequence[] activeSubs) {
-        PhoneAccount initialAccount = mAccountManager.getCurrentAccount();
-        if (initialAccount == null) {
-            return -1;
-        }
-        else {
-            return Arrays.asList(activeSubs).indexOf(initialAccount.getLabel(getActivity()));
-        }
-    }
-
-    /**
-     * Extracts the label names from each of the accounts and returns as a list of strings
-     *
-     * @return a list of strings to display in the dialog
-     */
-    private CharSequence[] getAccountNames() {
-        Context context = getActivity();
-        List<String> strings = new ArrayList<String>();
-        for (int i = 0; i < mAccounts.size(); i++) {
-            strings.add(mAccounts.get(i).getLabel(context));
-        }
-        return strings.toArray(new CharSequence[strings.size()]);
-    }
-}
\ No newline at end of file