diff options
4 files changed, 14 insertions, 15 deletions
diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk index 49fe595..9ae27e9 100644 --- a/packages/SystemUI/Android.mk +++ b/packages/SystemUI/Android.mk @@ -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 diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 5bac1d5..a6919f2 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -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> diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java index 5e62858..1367953 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java @@ -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); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java index 6aead70..de7e96e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java @@ -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); |