Settings: Add Expanded desktop tile in QuickSettings (1/2) (e6fbcf1c) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+13 −0

Original line number	Diff line number	Diff line
		@@ -1545,6 +1545,19 @@
		<activity android:name=".cyanogenmod.PowerWidget" />

		<activity android:name=".cyanogenmod.SystemSettings" />
		<activity android:name="Settings$SystemSettingsActivity"
		android:label="@string/system_settings_title"
		android:taskAffinity=""
		android:excludeFromRecents="true">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.cyanogenmod.SystemSettings" />
		<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
		android:resource="@id/system_settings" />
		</activity>

		<activity android:name=".cyanogenmod.PerformanceSettings" />

res/values/strings.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -5086,6 +5086,7 @@
		<string name="title_tile_usb_tether">USB Tether</string>
		<string name="title_tile_quiet_hours">Quiet hours</string>
		<string name="title_tile_volume">Volume</string>
		<string name="title_tile_expanded_desktop">Expanded desktop</string>

		<string name="title_dynamic_tiles">Dynamic tiles</string>
		<string name="dynamic_tiles_note_title">Note</string>

src/com/android/settings/Settings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -892,4 +892,5 @@ public class Settings extends PreferenceActivity
		public static class ProfilesSettingsActivity extends Settings { /* empty */ }
		public static class QuietHoursSettingsActivity extends Settings { /* empty */ }
		public static class DreamSettingsActivity extends Settings { /* empty */ }
		public static class SystemSettingsActivity extends Settings { /* empty */ }
		}

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

+10 −4

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import static com.android.internal.util.cm.QSConstants.TILE_PROFILE;
		import static com.android.internal.util.cm.QSConstants.TILE_WIFIAP;
		import static com.android.internal.util.cm.QSConstants.TILE_LTE;
		import static com.android.internal.util.cm.QSConstants.TILE_TORCH;
		import static com.android.internal.util.cm.QSConstants.TILE_EXPANDEDDESKTOP;
		import static com.android.internal.util.cm.QSUtils.deviceSupportsBluetooth;
		import static com.android.internal.util.cm.QSUtils.deviceSupportsDockBattery;
		import static com.android.internal.util.cm.QSUtils.deviceSupportsImeSwitcher;
		@@ -32,6 +33,7 @@ import static com.android.internal.util.cm.QSUtils.deviceSupportsNfc;
		import static com.android.internal.util.cm.QSUtils.deviceSupportsUsbTether;
		import static com.android.internal.util.cm.QSUtils.deviceSupportsWifiDisplay;
		import static com.android.internal.util.cm.QSUtils.systemProfilesEnabled;
		import static com.android.internal.util.cm.QSUtils.expandedDesktopEnabled;

		import android.content.ContentResolver;
		import android.content.pm.PackageManager;
		@@ -228,26 +230,30 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe
		QuickSettingsUtil.TILES.remove(TILE_BLUETOOTH);
		}

		// Dont show the profiles tile if profiles are disabled
		// Don't show the profiles tile if profiles are disabled
		if (!systemProfilesEnabled(resolver)) {
		QuickSettingsUtil.TILES.remove(TILE_PROFILE);
		}

		// Dont show the NFC tile if not supported
		// Don't show the NFC tile if not supported
		if (!deviceSupportsNfc(getActivity())) {
		QuickSettingsUtil.TILES.remove(TILE_NFC);
		}

		// Dont show the LTE tile if not supported
		// Don't show the LTE tile if not supported
		if (!deviceSupportsLte(getActivity())) {
		QuickSettingsUtil.TILES.remove(TILE_LTE);
		}

		// Dont show the torch tile if not supported
		// Don't show the Torch tile if not supported
		if (!getResources().getBoolean(R.bool.has_led_flash)) {
		QuickSettingsUtil.TILES.remove(TILE_TORCH);
		}

		// Don't show the Expanded desktop tile if expanded desktop is disabled
		if (!expandedDesktopEnabled(resolver)) {
		QuickSettingsUtil.TILES.remove(TILE_EXPANDEDDESKTOP);
		}
		}

		public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import static com.android.internal.util.cm.QSConstants.TILE_BATTERY;
		import static com.android.internal.util.cm.QSConstants.TILE_BLUETOOTH;
		import static com.android.internal.util.cm.QSConstants.TILE_BRIGHTNESS;
		import static com.android.internal.util.cm.QSConstants.TILE_DELIMITER;
		import static com.android.internal.util.cm.QSConstants.TILE_EXPANDEDDESKTOP;
		import static com.android.internal.util.cm.QSConstants.TILE_GPS;
		import static com.android.internal.util.cm.QSConstants.TILE_LOCKSCREEN;
		import static com.android.internal.util.cm.QSConstants.TILE_LTE;
		@@ -71,9 +72,9 @@ public class QuickSettingsUtil {
		TILES.put(TILE_BRIGHTNESS, new QuickSettingsUtil.TileInfo(
		TILE_BRIGHTNESS, R.string.title_tile_brightness,
		"com.android.systemui:drawable/ic_qs_brightness_auto_off"));
		TILES.put(TILE_SLEEP, new QuickSettingsUtil.TileInfo(
		TILE_SLEEP, R.string.title_tile_sleep,
		"com.android.systemui:drawable/ic_qs_sleep"));
		TILES.put(TILE_EXPANDEDDESKTOP, new QuickSettingsUtil.TileInfo(
		TILE_EXPANDEDDESKTOP, R.string.title_tile_expanded_desktop,
		"com.android.systemui:drawable/ic_qs_expanded_desktop_off"));
		TILES.put(TILE_GPS, new QuickSettingsUtil.TileInfo(
		TILE_GPS, R.string.title_tile_gps,
		"com.android.systemui:drawable/ic_qs_gps_neutral"));