Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update QS defaults list"

Browse Source
This commit is contained in:
Jason Monk
2016-02-05 20:03:07 +00:00
committed by Android (Google) Code Review
parent 6da39af35d e24194f079
commit 73ebd130eb
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/config.xml
View File

@@ -103,7 +103,7 @@
<!-- The default tiles to display in QuickSettings -->
<string name="quick_settings_tiles_default" translatable="false">
wifi,bt,flashlight,dnd,cell,battery,rotation,airplane,location,cast,work
wifi,cell,battery,dnd,flashlight,rotation,bt,airplane,location
</string>
<!-- The tiles to display in QuickSettings -->

18
packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
View File

@@ -42,6 +42,7 @@ public class TileQueryHelper {
private static final String TAG = "TileQueryHelper";
private final ArrayList<TileInfo> mTiles = new ArrayList<>();
private final ArrayList<String> mSpecs = new ArrayList<>();
private final Context mContext;
private TileStateListener mListener;
@@ -76,7 +77,7 @@ public class TileQueryHelper {
mainHandler.post(new Runnable() {
@Override
public void run() {
addTile(spec, state, mTiles);
addTile(spec, state);
mListener.onTilesChanged(mTiles);
}
});
@@ -95,20 +96,23 @@ public class TileQueryHelper {
mListener = listener;
}
private static void addTile(String spec, QSTile.State state, List<TileInfo> tiles) {
private void addTile(String spec, QSTile.State state) {
if (mSpecs.contains(spec)) {
return;
}
TileInfo info = new TileInfo();
info.state = state;
info.spec = spec;
tiles.add(info);
mTiles.add(info);
mSpecs.add(spec);
}
private static void addTile(String spec, Drawable drawable, CharSequence label, Context context,
List<TileInfo> tiles) {
private void addTile(String spec, Drawable drawable, CharSequence label, Context context) {
QSTile.State state = new QSTile.State();
state.label = label;
state.contentDescription = label;
state.icon = new DrawableIcon(drawable);
addTile(spec, state, tiles);
addTile(spec, state);
}
public static class TileInfo {
@@ -133,7 +137,7 @@ public class TileQueryHelper {
icon.setTint(mContext.getColor(android.R.color.white));
}
CharSequence label = info.serviceInfo.loadLabel(pm);
addTile(spec, icon, label != null ? label.toString() : "null", mContext, tiles);
addTile(spec, icon, label != null ? label.toString() : "null", mContext);
}
return tiles;
}