From bbff2926f8dd61b99f62d56390815ca84cece51e Mon Sep 17 00:00:00 2001
From: Peter Schiller <peterschiller@google.com>
Date: Fri, 15 Jul 2016 11:57:54 -0700
Subject: Remove caret in overview mode

Bug: 30162951
Change-Id: I71f585e4ae6dfba9dc1d18cd00e45d081cabd4b3
---
 src/com/android/launcher3/Workspace.java                         | 6 ++++--
 .../android/launcher3/allapps/AllAppsTransitionController.java   | 1 -
 src/com/android/launcher3/pageindicators/CaretDrawable.java      | 9 +++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src/com/android')

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 344c389ef..78ef074c5 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1529,9 +1529,11 @@ public class Workspace extends PagedView
 
     private void setHotseatAlphaAtIndex(float alpha, int index) {
         mHotseatAlpha[index] = alpha;
-        float finalAlpha = mHotseatAlpha[0] * mHotseatAlpha[1] * mHotseatAlpha[2];
+        final float hotseatAlpha = mHotseatAlpha[0] * mHotseatAlpha[1] * mHotseatAlpha[2];
+        final float pageIndicatorAlpha = mHotseatAlpha[0] * mHotseatAlpha[2];
 
-        mLauncher.getHotseat().setAlpha(finalAlpha);
+        mLauncher.getHotseat().setAlpha(hotseatAlpha);
+        mPageIndicator.setAlpha(pageIndicatorAlpha);
     }
 
     public ValueAnimator createHotseatAlphaAnimator(float finalValue) {
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 85af60eb8..6518ab10b 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -5,7 +5,6 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ArgbEvaluator;
 import android.animation.ObjectAnimator;
-import android.graphics.Color;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/src/com/android/launcher3/pageindicators/CaretDrawable.java b/src/com/android/launcher3/pageindicators/CaretDrawable.java
index 3a7fc4264..8971323ba 100644
--- a/src/com/android/launcher3/pageindicators/CaretDrawable.java
+++ b/src/com/android/launcher3/pageindicators/CaretDrawable.java
@@ -53,6 +53,10 @@ public class CaretDrawable extends Drawable {
 
     @Override
     public void draw(Canvas canvas) {
+        if (Float.compare(mPaint.getAlpha(), 0f) == 0) {
+            return;
+        }
+
         final float width = getBounds().width();
         final float height = getBounds().height();
         final float left = getBounds().left;
@@ -78,12 +82,13 @@ public class CaretDrawable extends Drawable {
 
     @Override
     public int getOpacity() {
-        return PixelFormat.OPAQUE;
+        return PixelFormat.TRANSLUCENT;
     }
 
     @Override
     public void setAlpha(int alpha) {
-        // no-op
+        mPaint.setAlpha(alpha);
+        invalidateSelf();
     }
 
     @Override
-- 
cgit v1.2.3