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

Merge TP1A.220905.004 to aosp-master - DO NOT MERGE

Browse Source 
Merged-In: Id0c4e3c68ee40e5d0d57449b531228b31f2246ac
Merged-In: Ib71b6904b5c85b3d9f96563bd38bbf2d0305127d
Change-Id: I186ff56c007d17ad650b64facfbd4862cc06bf9a
This commit is contained in:
Bill Yi
2022-09-08 14:23:20 -07:00
parent 6672e37864 79eeb2d79a
commit 042554a0e4
4 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/network/telephony/SubscriptionActionDialogActivity.java
View File

@@ -60,8 +60,20 @@ public class SubscriptionActionDialogActivity extends FragmentActivity {
* @param message The string content should be displayed in the progress dialog.
*/
protected void showProgressDialog(String message) {
showProgressDialog(message,false);
}
/**
* Displays a loading dialog.
*
* @param message The string content should be displayed in the progress dialog.
* @param updateIfNeeded is whether to update the progress state in the SharedPreferences.
*/
protected void showProgressDialog(String message, boolean updateIfNeeded) {
ProgressDialogFragment.show(getFragmentManager(), message, null);
setProgressState(PROGRESS_IS_SHOWING);
if (updateIfNeeded) {
setProgressState(PROGRESS_IS_SHOWING);
}
}
/** Dismisses the loading dialog. */

4
src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
View File

@@ -220,8 +220,8 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
showProgressDialog(
getString(
R.string.sim_action_switch_sub_dialog_progress,
SubscriptionUtil.getUniqueSubscriptionDisplayName(
mSubInfo, this)));
SubscriptionUtil.getUniqueSubscriptionDisplayName(mSubInfo, this)),
removedSubInfo != null ? true : false);
if (mIsEsimOperation) {
mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId(),
UiccSlotUtil.INVALID_PORT_ID,