Merge "Settings: remove Pie control for devices without navbar" into cm-10.1 (27692ae1) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/cyanogenmod/SystemSettings.java

+22 −16

Original line number	Diff line number	Diff line
		@@ -62,24 +62,11 @@ public class SystemSettings extends SettingsPreferenceFragment {
		addPreferencesFromResource(R.xml.system_settings);
		PreferenceScreen prefScreen = getPreferenceScreen();

		// Determine which user is logged in
		mIsPrimary = UserHandle.myUserId() == UserHandle.USER_OWNER;
		if (mIsPrimary) {
		// Primary user only preferences
		// Battery lights
		mBatteryPulse = (PreferenceScreen) findPreference(KEY_BATTERY_LIGHT);
		if (mBatteryPulse != null) {
		if (getResources().getBoolean(
		com.android.internal.R.bool.config_intrusiveBatteryLed) == false) {
		prefScreen.removePreference(mBatteryPulse);
		mBatteryPulse = null;
		}
		}

		// Only show the hardware keys config on a device that does not have a navbar
		// and the navigation bar config on phones that has a navigation bar
		boolean removeKeys = false;
		boolean removeNavbar = false;

		IWindowManager windowManager = IWindowManager.Stub.asInterface(
		ServiceManager.getService(Context.WINDOW_SERVICE));
		try {
		@@ -92,6 +79,20 @@ public class SystemSettings extends SettingsPreferenceFragment {
		// Do nothing
		}

		// Determine which user is logged in
		mIsPrimary = UserHandle.myUserId() == UserHandle.USER_OWNER;
		if (mIsPrimary) {
		// Primary user only preferences
		// Battery lights
		mBatteryPulse = (PreferenceScreen) findPreference(KEY_BATTERY_LIGHT);
		if (mBatteryPulse != null) {
		if (getResources().getBoolean(
		com.android.internal.R.bool.config_intrusiveBatteryLed) == false) {
		prefScreen.removePreference(mBatteryPulse);
		mBatteryPulse = null;
		}
		}

		// Act on the above
		if (removeKeys) {
		prefScreen.removePreference(findPreference(KEY_HARDWARE_KEYS));
		@@ -126,6 +127,11 @@ public class SystemSettings extends SettingsPreferenceFragment {

		// Pie controls
		mPieControl = (PreferenceScreen) findPreference(KEY_PIE_CONTROL);
		if (mPieControl != null && removeNavbar) {
		// Remove on devices without a navbar to start with
		prefScreen.removePreference(mPieControl);
		mPieControl = null;
		}

		// Don't display the lock clock preference if its not installed
		removePreferenceIfPackageNotInstalled(findPreference(KEY_LOCK_CLOCK));