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

Merge "Change quick setting min_num_tiles number and text to resources value." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-07-02 17:56:59 +00:00
committed by Android (Google) Code Review
parent 1abc45038b ea2d2267be
commit bc058faaa3
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,6 +112,9 @@
wifi,bt,dnd,flashlight,rotation,battery,cell,airplane,cast wifi,bt,dnd,flashlight,rotation,battery,cell,airplane,cast
</string> </string>
<!-- The minimum number of tiles to display in QuickSettings -->
<integer name="quick_settings_min_num_tiles">6</integer>
<!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" --> <!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" -->
<string name="quick_settings_tiles_stock" translatable="false"> <string name="quick_settings_tiles_stock" translatable="false">
wifi,cell,battery,dnd,flashlight,rotation,bt,airplane,location,hotspot,inversion,saver,dark,work,cast,night wifi,cell,battery,dnd,flashlight,rotation,bt,airplane,location,hotspot,inversion,saver,dark,work,cast,night

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

@@ -2009,7 +2009,7 @@
<string name="drag_to_remove_tiles">Drag here to remove</string> <string name="drag_to_remove_tiles">Drag here to remove</string>
<!-- Label to indicate to users that additional tiles cannot be removed. [CHAR LIMIT=60] --> <!-- Label to indicate to users that additional tiles cannot be removed. [CHAR LIMIT=60] -->
<string name="drag_to_remove_disabled">You need at least 6 tiles</string> <string name="drag_to_remove_disabled">You need at least <xliff:g id="min_num_tiles" example="6">%1$d</xliff:g> tiles</string>
<!-- Button to edit the tile ordering of quick settings [CHAR LIMIT=60] --> <!-- Button to edit the tile ordering of quick settings [CHAR LIMIT=60] -->
<string name="qs_edit">Edit</string> <string name="qs_edit">Edit</string>

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

@@ -19,6 +19,7 @@ import android.app.AlertDialog.Builder;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.res.Resources;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Handler; import android.os.Handler;
@@ -54,7 +55,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileStateListener { public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileStateListener {
private static final int MIN_NUM_TILES = 6;
private static final long DRAG_LENGTH = 100; private static final long DRAG_LENGTH = 100;
private static final float DRAG_SCALE = 1.2f; private static final float DRAG_SCALE = 1.2f;
public static final long MOVE_DURATION = 150; public static final long MOVE_DURATION = 150;
@@ -79,6 +79,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
private final ItemTouchHelper mItemTouchHelper; private final ItemTouchHelper mItemTouchHelper;
private final ItemDecoration mDecoration; private final ItemDecoration mDecoration;
private final AccessibilityManager mAccessibilityManager; private final AccessibilityManager mAccessibilityManager;
private final int mMinNumTiles;
private int mEditIndex; private int mEditIndex;
private int mTileDividerIndex; private int mTileDividerIndex;
private boolean mNeedsFocus; private boolean mNeedsFocus;
@@ -97,6 +98,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
mAccessibilityManager = context.getSystemService(AccessibilityManager.class); mAccessibilityManager = context.getSystemService(AccessibilityManager.class);
mItemTouchHelper = new ItemTouchHelper(mCallbacks); mItemTouchHelper = new ItemTouchHelper(mCallbacks);
mDecoration = new TileItemDecoration(context); mDecoration = new TileItemDecoration(context);
mMinNumTiles = context.getResources().getInteger(R.integer.quick_settings_min_num_tiles);
} }
public void setHost(QSTileHost host) { public void setHost(QSTileHost host) {
@@ -247,15 +249,17 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
return; return;
} }
if (holder.getItemViewType() == TYPE_EDIT) { if (holder.getItemViewType() == TYPE_EDIT) {
final int titleResId; final String titleText;
Resources res = mContext.getResources();
if (mCurrentDrag == null) { if (mCurrentDrag == null) {
titleResId = R.string.drag_to_add_tiles; titleText = res.getString(R.string.drag_to_add_tiles);
} else if (!canRemoveTiles() && mCurrentDrag.getAdapterPosition() < mEditIndex) { } else if (!canRemoveTiles() && mCurrentDrag.getAdapterPosition() < mEditIndex) {
titleResId = R.string.drag_to_remove_disabled; titleText = res.getString(R.string.drag_to_remove_disabled, mMinNumTiles);
} else { } else {
titleResId = R.string.drag_to_remove_tiles; titleText = res.getString(R.string.drag_to_remove_tiles);
} }
((TextView) holder.itemView.findViewById(android.R.id.title)).setText(titleResId);
((TextView) holder.itemView.findViewById(android.R.id.title)).setText(titleText);
return; return;
} }
if (holder.getItemViewType() == TYPE_ACCESSIBLE_DROP) { if (holder.getItemViewType() == TYPE_ACCESSIBLE_DROP) {
@@ -337,7 +341,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
} }
private boolean canRemoveTiles() { private boolean canRemoveTiles() {
return mCurrentSpecs.size() > MIN_NUM_TILES; return mCurrentSpecs.size() > mMinNumTiles;
} }
private void selectPosition(int position, View v) { private void selectPosition(int position, View v) {