From 442fc108c365f8759c157996e1e6603c17a4bf35 Mon Sep 17 00:00:00 2001
From: Vadim Tryshev <vadimt@google.com>
Date: Tue, 29 May 2018 17:29:03 -0700
Subject: Removing accessibility action for Clear-all

Now that Clear-all button is visible for accessibility, there is no need
in it.

Bug: 80156299
Test: Manual
Change-Id: I5997692be015947692a8bb720a449d1d36302526
---
 .../android/quickstep/views/ShelfScrimView.java    | 43 ----------------------
 1 file changed, 43 deletions(-)

(limited to 'quickstep/src/com/android/quickstep/views/ShelfScrimView.java')

diff --git a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
index aca8351a0..1ea112da0 100644
--- a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
+++ b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
@@ -28,9 +28,6 @@ import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.Path.Direction;
 import android.graphics.Path.Op;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
 import android.util.AttributeSet;
 
 import com.android.launcher3.DeviceProfile;
@@ -51,7 +48,6 @@ public class ShelfScrimView extends ScrimView {
     private static final int THRESHOLD_ALPHA_DARK = 102;
     private static final int THRESHOLD_ALPHA_LIGHT = 46;
     private static final int THRESHOLD_ALPHA_SUPER_LIGHT = 128;
-    private static final int CLEAR_ALL_TASKS = R.string.recents_clear_all;
 
     // In transposed layout, we simply draw a flat color.
     private boolean mDrawingFlatColor;
@@ -208,43 +204,4 @@ public class ShelfScrimView extends ScrimView {
                 mRadius, mRadius, mPaint);
         return minTop - mDragHandleSize - top;
     }
-
-    @NonNull
-    @Override
-    protected AccessibilityHelper createAccessibilityHelper() {
-        return new ShelfScrimAccessibilityHelper();
-    }
-
-    protected class ShelfScrimAccessibilityHelper extends AccessibilityHelper {
-        @Override
-        protected void onPopulateNodeForVirtualView(int virtualViewId,
-                AccessibilityNodeInfoCompat node) {
-            super.onPopulateNodeForVirtualView(virtualViewId, node);
-
-            if (mLauncher.isInState(OVERVIEW)) {
-                final RecentsView overviewPanel = mLauncher.getOverviewPanel();
-                if (overviewPanel.getChildCount() != 0) {
-                    node.addAction(
-                            new AccessibilityNodeInfoCompat.AccessibilityActionCompat(
-                                    CLEAR_ALL_TASKS,
-                                    getContext().getText(CLEAR_ALL_TASKS)));
-                }
-            }
-        }
-
-        @Override
-        protected boolean onPerformActionForVirtualView(
-                int virtualViewId, int action, Bundle arguments) {
-            if (super.onPerformActionForVirtualView(virtualViewId, action, arguments)) return true;
-
-            if (action == CLEAR_ALL_TASKS) {
-                if (mLauncher.isInState(OVERVIEW)) {
-                    mLauncher.<RecentsView>getOverviewPanel().dismissAllTasks();
-                }
-                return true;
-            }
-
-            return false;
-        }
-    }
 }
-- 
cgit v1.2.3


From 337fcb7983e318e245b9b08a5d748a7500ae6675 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 30 May 2018 12:00:43 -0700
Subject: Theme updates for dark text:

> Using white scrim on adjescent tiles in overview
> Using a ligher scrim in dark-theme+dark-text

Bug: 80253867
Change-Id: I3f257d3addaca8bc5970a61722f5ae0e7af89382
---
 .../src/com/android/quickstep/views/ShelfScrimView.java      | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'quickstep/src/com/android/quickstep/views/ShelfScrimView.java')

diff --git a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
index 1ea112da0..c780b6234 100644
--- a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
+++ b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
@@ -45,10 +45,6 @@ import com.android.launcher3.views.ScrimView;
  */
 public class ShelfScrimView extends ScrimView {
 
-    private static final int THRESHOLD_ALPHA_DARK = 102;
-    private static final int THRESHOLD_ALPHA_LIGHT = 46;
-    private static final int THRESHOLD_ALPHA_SUPER_LIGHT = 128;
-
     // In transposed layout, we simply draw a flat color.
     private boolean mDrawingFlatColor;
 
@@ -77,13 +73,7 @@ public class ShelfScrimView extends ScrimView {
         mMaxScrimAlpha = OVERVIEW.getWorkspaceScrimAlpha(mLauncher);
 
         mEndAlpha = Color.alpha(mEndScrim);
-        if (Themes.getAttrBoolean(mLauncher, R.attr.isMainColorDark)) {
-            mThresholdAlpha = THRESHOLD_ALPHA_DARK;
-        } else if (Themes.getAttrBoolean(mLauncher, R.attr.isWorkspaceDarkText)) {
-            mThresholdAlpha = THRESHOLD_ALPHA_SUPER_LIGHT;
-        } else {
-            mThresholdAlpha = THRESHOLD_ALPHA_LIGHT;
-        }
+        mThresholdAlpha = Themes.getAttrInteger(context, R.attr.allAppsInterimScrimAlpha);
         mRadius = mLauncher.getResources().getDimension(R.dimen.shelf_surface_radius);
         mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
 
-- 
cgit v1.2.3