Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f492647 authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev am: 62cd5f7f

am: 169d6a9c

Change-Id: Ie5aada5dc0993e097ad5215895bda86cebab2f87
parents cd262018 169d6a9c
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.TelephonyProperties;
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.settings.R;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -96,15 +96,16 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
        return isAvailable(mContext) ? AVAILABLE : DISABLED_UNSUPPORTED;
    }

    @Override
    public void onResume() {
        if (mAirplaneModeEnabler != null) {
        if (isAvailable()) {
            mAirplaneModeEnabler.resume();
        }
    }

    @Override
    public void onPause() {
        if (mAirplaneModeEnabler != null) {
        if (isAvailable()) {
            mAirplaneModeEnabler.pause();
        }
    }
@@ -134,6 +135,8 @@ public class AirplaneModePreferenceController extends TogglePreferenceController

    @Override
    public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
        if (mAirplaneModePreference != null) {
            mAirplaneModePreference.setChecked(isAirplaneModeOn);
        }
    }
}