PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow SimDialogActivity to be started for result" into qt-dev

Browse Source
This commit is contained in:
Brad Ebinger
2019-05-10 19:42:55 +00:00
committed by Android (Google) Code Review
parent 12dcbe7c71 d206835fe3
commit d204d6c33f
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/sim/SimDialogActivity.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.sim; package com.android.settings.sim;
import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.telecom.PhoneAccount; import android.telecom.PhoneAccount;
@@ -44,11 +45,15 @@ public class SimDialogActivity extends FragmentActivity {
public static String PREFERRED_SIM = "preferred_sim"; public static String PREFERRED_SIM = "preferred_sim";
public static String DIALOG_TYPE_KEY = "dialog_type"; public static String DIALOG_TYPE_KEY = "dialog_type";
// sub ID returned from startActivityForResult
public static String RESULT_SUB_ID = "result_sub_id";
public static final int INVALID_PICK = -1; public static final int INVALID_PICK = -1;
public static final int DATA_PICK = 0; public static final int DATA_PICK = 0;
public static final int CALLS_PICK = 1; public static final int CALLS_PICK = 1;
public static final int SMS_PICK = 2; public static final int SMS_PICK = 2;
public static final int PREFERRED_PICK = 3; public static final int PREFERRED_PICK = 3;
// Show the "select SMS subscription" dialog, but don't save as default, just return a result
public static final int SMS_PICK_FOR_MESSAGE = 4;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@@ -94,6 +99,9 @@ public class SimDialogActivity extends FragmentActivity {
throw new IllegalArgumentException("Missing required extra " + PREFERRED_SIM); throw new IllegalArgumentException("Missing required extra " + PREFERRED_SIM);
} }
return PreferredSimDialogFragment.newInstance(); return PreferredSimDialogFragment.newInstance();
case SMS_PICK_FOR_MESSAGE:
return SimListDialogFragment.newInstance(dialogType, R.string.select_sim_for_sms,
false /* includeAskEveryTime */);
default: default:
throw new IllegalArgumentException("Invalid dialog type " + dialogType + " sent."); throw new IllegalArgumentException("Invalid dialog type " + dialogType + " sent.");
} }
@@ -117,6 +125,13 @@ public class SimDialogActivity extends FragmentActivity {
case PREFERRED_PICK: case PREFERRED_PICK:
setPreferredSim(subId); setPreferredSim(subId);
break; break;
case SMS_PICK_FOR_MESSAGE:
// Don't set a default here.
// The caller has created this dialog waiting for a result.
Intent intent = new Intent();
intent.putExtra(RESULT_SUB_ID, subId);
setResult(Activity.RESULT_OK, intent);
break;
default: default:
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Invalid dialog type " + dialogType + " sent."); "Invalid dialog type " + dialogType + " sent.");