Merge "Add ability to show/hide airplane toggle."

This commit is contained in:
TreeHugger Robot
2018-01-16 20:16:16 +00:00
committed by Android (Google) Code Review
4 changed files with 32 additions and 12 deletions

View File

@@ -30,6 +30,7 @@ import com.android.settings.AirplaneModeEnabler;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -91,7 +92,8 @@ public class AirplaneModePreferenceController extends AbstractPreferenceControll
}
public static boolean isAvailable(Context context) {
return !context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK);
return context.getResources().getBoolean(R.bool.config_show_toggle_airplane)
&& !context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK);
}
@Override