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

Merge "Adds logging to confirm esim deletion feature" into rvc-dev am: fbde0b3b39

Browse Source 
Change-Id: I963339e5cb2615d54e23929fdf97ce837f18495f
This commit is contained in:
Lee Chou
2020-03-19 07:46:18 +00:00
committed by Automerger Merge Worker
parent 4731f3c571 fbde0b3b39
commit 01ea52c474
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/security/ConfirmSimDeletionPreferenceController.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.security; package com.android.settings.security;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
@@ -26,19 +27,23 @@ import androidx.preference.TwoStatePreference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.network.telephony.MobileNetworkUtils; import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.wifi.dpp.WifiDppUtils; import com.android.settings.wifi.dpp.WifiDppUtils;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/** Enable/disable user confirmation before deleting an eSim */ /** Enable/disable user confirmation before deleting an eSim */
public class ConfirmSimDeletionPreferenceController extends BasePreferenceController implements public class ConfirmSimDeletionPreferenceController extends BasePreferenceController implements
Preference.OnPreferenceChangeListener{ Preference.OnPreferenceChangeListener{
public static final String KEY_CONFIRM_SIM_DELETION = "confirm_sim_deletion"; public static final String KEY_CONFIRM_SIM_DELETION = "confirm_sim_deletion";
private boolean mConfirmationDefaultOn; private boolean mConfirmationDefaultOn;
private MetricsFeatureProvider mMetricsFeatureProvider;
public ConfirmSimDeletionPreferenceController(Context context, String key) { public ConfirmSimDeletionPreferenceController(Context context, String key) {
super(context, key); super(context, key);
mConfirmationDefaultOn = mConfirmationDefaultOn =
context.getResources() context.getResources()
.getBoolean(R.bool.config_sim_deletion_confirmation_default_on); .getBoolean(R.bool.config_sim_deletion_confirmation_default_on);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
} }
@Override @Override
@@ -72,11 +77,15 @@ public class ConfirmSimDeletionPreferenceController extends BasePreferenceContro
return false; return false;
} }
if (!isChecked()) { if (!isChecked()) {
mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_CONFIRM_SIM_DELETION_ON);
setChecked(true); setChecked(true);
return true; return true;
} else { } else {
// prevent disabling the feature until authorized // prevent disabling the feature until authorized
WifiDppUtils.showLockScreen(mContext, () -> { WifiDppUtils.showLockScreen(mContext, () -> {
mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_CONFIRM_SIM_DELETION_OFF);
// set data // set data
setChecked(false); setChecked(false);
// set UI // set UI