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

Merge "Push full slice index to device index" into pi-dev am: 3d29ca2893

Browse Source 
am: 2332aad2a6

Change-Id: I3563eb7ed2ab93b35b1a950d89ca2466abaa59e3
This commit is contained in:
Jason Monk
2018-04-26 14:26:38 -07:00
committed by android-build-merger
parent 8c9e0354b4 2332aad2a6
commit 0d3322a57b
12 changed files with 383 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
public AirplaneModePreferenceController(Context context, String key) {
super(context, key);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
mAirplaneModeEnabler = new AirplaneModeEnabler(mContext, mMetricsFeatureProvider, this);
}
public void setFragment(Fragment hostFragment) {
@@ -81,7 +82,6 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
super.displayPreference(screen);
if (isAvailable()) {
mAirplaneModePreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
mAirplaneModeEnabler = new AirplaneModeEnabler(mContext, mMetricsFeatureProvider, this);
}
}