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

Merge "2D Recents: use a different background color for drop targets" into nyc-mr2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-18 23:51:32 +00:00
committed by Android (Google) Code Review
parent 146f68a445 47dd7c51e9
commit 81e8bdd420
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java
View File

@@ -247,6 +247,9 @@ public class TaskStack {
*/ */
public static class DockState implements DropTarget { public static class DockState implements DropTarget {
public static final int DOCK_AREA_BG_COLOR = 0xFFffffff;
public static final int DOCK_AREA_GRID_BG_COLOR = 0xFF000000;
// The rotation to apply to the hint text // The rotation to apply to the hint text
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({HORIZONTAL, VERTICAL}) @IntDef({HORIZONTAL, VERTICAL})
@@ -319,7 +322,8 @@ public class TaskStack {
private ViewState(int areaAlpha, int hintAlpha, @TextOrientation int hintOrientation, private ViewState(int areaAlpha, int hintAlpha, @TextOrientation int hintOrientation,
int hintTextResId) { int hintTextResId) {
dockAreaAlpha = areaAlpha; dockAreaAlpha = areaAlpha;
dockAreaOverlay = new ColorDrawable(0xFFffffff); dockAreaOverlay = new ColorDrawable(Recents.getConfiguration().isGridEnabled
? DOCK_AREA_GRID_BG_COLOR : DOCK_AREA_BG_COLOR);
dockAreaOverlay.setAlpha(0); dockAreaOverlay.setAlpha(0);
hintTextAlpha = hintAlpha; hintTextAlpha = hintAlpha;
hintTextOrientation = hintOrientation; hintTextOrientation = hintOrientation;