From 384eaad571ec047d14d33761b152625e8a9ee9b0 Mon Sep 17 00:00:00 2001 From: Jay Shrauner Date: Fri, 3 Apr 2015 16:03:41 -0700 Subject: Switch to new SelectPhoneAccountDialogFragment API Bug:20064573 Change-Id: If528b7a06a9e5d1452cfbd99c6e11d7ce390038c --- src/com/android/dialer/SpecialCharSequenceMgr.java | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java index 46c6de6c9..1e686125f 100644 --- a/src/com/android/dialer/SpecialCharSequenceMgr.java +++ b/src/com/android/dialer/SpecialCharSequenceMgr.java @@ -18,6 +18,7 @@ package com.android.dialer; import android.app.Activity; import android.app.AlertDialog; +import android.app.DialogFragment; import android.app.KeyguardManager; import android.app.ProgressDialog; import android.content.ActivityNotFoundException; @@ -64,6 +65,8 @@ import java.util.List; public class SpecialCharSequenceMgr { private static final String TAG = "SpecialCharSequenceMgr"; + private static final String TAG_SELECT_ACCT_FRAGMENT = "tag_select_acct_fragment"; + private static final String SECRET_CODE_ACTION = "android.provider.Telephony.SECRET_CODE"; private static final String MMI_IMEI_DISPLAY = "*#06#"; private static final String MMI_REGULATORY_INFO_DISPLAY = "*#07#"; @@ -229,9 +232,12 @@ public class SpecialCharSequenceMgr { public void onDialogDismissed() {} }; - SelectPhoneAccountDialogFragment.showAccountDialog( - ((Activity) context).getFragmentManager(), subscriptionAccountHandles, - listener); + // NOTE: If you want to support rotation of this dialog need + // to refactor the listener and set it in DialpadFragment.onCreate() + DialogFragment dialogFragment = SelectPhoneAccountDialogFragment.newInstance( + subscriptionAccountHandles, listener); + dialogFragment.show(((Activity) context).getFragmentManager(), + TAG_SELECT_ACCT_FRAGMENT); } else { return false; } @@ -290,9 +296,12 @@ public class SpecialCharSequenceMgr { public void onDialogDismissed() {} }; - SelectPhoneAccountDialogFragment.showAccountDialog( - ((Activity) context).getFragmentManager(), subscriptionAccountHandles, - listener); + // NOTE: If you want to support rotation of this dialog need + // to refactor the listener and set it in DialpadFragment.onCreate() + DialogFragment dialogFragment = SelectPhoneAccountDialogFragment.newInstance( + subscriptionAccountHandles, listener); + dialogFragment.show(((Activity) context).getFragmentManager(), + TAG_SELECT_ACCT_FRAGMENT); } return true; } -- cgit v1.2.3