Modified the AirplaneModePreferenceController for slice
- Updated the AirplaneModePreferenceController for slice feature - Updated the AirplaneModeEnabler for slice feature Fixes: 78645242 Test: manual Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.network make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard atest UniquePreferenceTest SettingsGatewayTest Change-Id: I4afbc666f916570d648ad2b33ebb25924024e9f1
This commit is contained in:
@@ -27,9 +27,9 @@ import android.support.v7.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) {
|
||||
mAirplaneModePreference.setChecked(isAirplaneModeOn);
|
||||
if (mAirplaneModePreference != null) {
|
||||
mAirplaneModePreference.setChecked(isAirplaneModeOn);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user