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

Merge "[Settings] Remove PhoneStateIntentReceiver"

Browse Source
This commit is contained in:
Bonian Chen
2019-11-15 02:57:01 +00:00
committed by Android (Google) Code Review
parent 1a744e9867 5980b80adc
commit 7f88b51851
2 changed files with 147 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/network/AirplaneModePreferenceController.java
View File

@@ -23,7 +23,6 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.provider.SettingsSlicesContract;
import android.sysprop.TelephonyProperties;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
@@ -34,8 +33,6 @@ import com.android.internal.telephony.TelephonyIntents;
import com.android.settings.AirplaneModeEnabler;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
@@ -58,14 +55,15 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
private static final String EXIT_ECM_RESULT = "exit_ecm_result";
private Fragment mFragment;
private final MetricsFeatureProvider mMetricsFeatureProvider;
private AirplaneModeEnabler mAirplaneModeEnabler;
private SwitchPreference mAirplaneModePreference;
public AirplaneModePreferenceController(Context context, String key) {
super(context, key);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
mAirplaneModeEnabler = new AirplaneModeEnabler(mContext, mMetricsFeatureProvider, this);
if (isAvailable(mContext)) {
mAirplaneModeEnabler = new AirplaneModeEnabler(mContext, this);
}
}
public void setFragment(Fragment hostFragment) {
@@ -75,7 +73,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (KEY_AIRPLANE_MODE.equals(preference.getKey())
&& TelephonyProperties.in_ecm_mode().orElse(false)) {
&& mAirplaneModeEnabler.isInEcmMode()) {
// In ECM mode launch ECM app dialog
if (mFragment != null) {
mFragment.startActivityForResult(
@@ -96,9 +94,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
if (isAvailable()) {
mAirplaneModePreference = screen.findPreference(getPreferenceKey());
}
mAirplaneModePreference = screen.findPreference(getPreferenceKey());
}
public static boolean isAvailable(Context context) {
@@ -133,7 +129,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_CODE_EXIT_ECM) {
Boolean isChoiceYes = data.getBooleanExtra(EXIT_ECM_RESULT, false);
final boolean isChoiceYes = data.getBooleanExtra(EXIT_ECM_RESULT, false);
// Set Airplane mode based on the return value and checkbox state
mAirplaneModeEnabler.setAirplaneModeInECM(isChoiceYes,
mAirplaneModePreference.isChecked());