QSTiles : Switch to sdk constants (6be220df) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \

		LOCAL_STATIC_JAVA_LIBRARIES := Keyguard \
		org.cyanogenmod.platform.sdk \
		org.cyanogenmod.platform.internal \
		android-support-v7-palette \
		android-support-v4

packages/SystemUI/res/values/config.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -117,11 +117,6 @@
		<!-- The number of columns that the top level tiles span in the QuickSettings -->
		<integer name="quick_settings_user_time_settings_tile_span">1</integer>

		<!-- The default tiles to display in QuickSettings -->
		<string name="quick_settings_tiles_default" translatable="false">
		wifi,bt,cell,airplane,rotation,flashlight,location,edit,cast,hotspot,inversion,dnd
		</string>

		<!-- The tiles to display in QuickSettings -->
		<string name="quick_settings_tiles" translatable="false">default</string>

packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java

+11 −9

Original line number	Diff line number	Diff line
		@@ -56,6 +56,9 @@ import com.android.systemui.statusbar.policy.BrightnessMirrorController;
		import com.android.systemui.tuner.QsTuner;

		import com.viewpagerindicator.CirclePageIndicator;

		import org.cyanogenmod.internal.util.QSUtils;

		import cyanogenmod.providers.CMSettings;

		import cyanogenmod.app.StatusBarPanelCustomTile;
		@@ -1546,26 +1549,25 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
		numBroadcast++;
		}
		}
		String[] defaults =
		getContext().getString(R.string.quick_settings_tiles_default).split(",");
		int availableSize = defaults.length + 1 - (tiles.size() - numBroadcast);
		List<String> defaults = QSUtils.getAvailableTiles(getContext());
		int availableSize = defaults.size() + 1 - (tiles.size() - numBroadcast);
		if (availableSize < 1) {
		availableSize = 1;
		}
		final String[] available = new String[availableSize];
		final String[] availableTiles = new String[availableSize];
		int index = 0;
		for (int i = 0; i < defaults.length; i++) {
		if (tiles.contains(defaults[i])) {
		for (int i = 0; i < defaults.size(); i++) {
		if (tiles.contains(defaults.get(i))) {
		continue;
		}
		int resource = mHost.getLabelResource(defaults[i]);
		int resource = mHost.getLabelResource(defaults.get(i));
		if (resource != 0) {
		availableTiles[index] = defaults[i];
		availableTiles[index] = defaults.get(i);
		available[index++] = getContext().getString(resource);
		} else {
		availableTiles[index] = defaults[i];
		available[index++] = defaults[i];
		availableTiles[index] = defaults.get(i);
		available[index++] = defaults.get(i);
		}
		}
		available[index++] = getContext().getString(R.string.broadcast_tile);

packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -336,7 +336,8 @@ public class QSTileHost implements QSTile.Host, Tunable {

		protected List<String> loadTileSpecs(String tileList) {
		final Resources res = mContext.getResources();
		final String defaultTileList = res.getString(R.string.quick_settings_tiles_default);
		final String defaultTileList = res.getString(org.cyanogenmod.platform.internal.
		R.string.config_defaultQuickSettingsTiles);
		if (tileList == null) {
		tileList = res.getString(R.string.quick_settings_tiles);
		if (DEBUG) Log.d(TAG, "Loaded tile specs from config: " + tileList);