From ae5bddc5e551eb6d9dff473d70b4850a514e0023 Mon Sep 17 00:00:00 2001
From: ykhung <ykhung@google.com>
Date: Tue, 2 Nov 2021 16:43:07 +0800
Subject: [PATCH] Avoid intermediate touch hover effect when a11y is enabled

Bug: 201501553
Test: make SettingsRoboTests
Change-Id: I08e64a73547f71281fa94dc56ba8fe08312ebed0
---
 src/com/android/settings/fuelgauge/BatteryChartView.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BatteryChartView.java b/src/com/android/settings/fuelgauge/BatteryChartView.java
index 98cfdc8f825..ff61fcead5a 100644
--- a/src/com/android/settings/fuelgauge/BatteryChartView.java
+++ b/src/com/android/settings/fuelgauge/BatteryChartView.java
@@ -526,8 +526,9 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
                     ? mTrapezoidColor
                     : mSelectedIndex == index || mSelectedIndex == SELECTED_INDEX_ALL
                         ? mTrapezoidSolidColor : mTrapezoidColor;
-            final boolean isHover = mHoveredIndex == index && isValidToDraw(mHoveredIndex);
-            mTrapezoidPaint.setColor(isHover ? mTrapezoidHoverColor : trapezoidColor);
+            final boolean isHoverState =
+                mIsSlotsClickabled && mHoveredIndex == index && isValidToDraw(mHoveredIndex);
+            mTrapezoidPaint.setColor(isHoverState ? mTrapezoidHoverColor : trapezoidColor);
 
             final float leftTop = round(trapezoidBottom - mLevels[index] * unitHeight);
             final float rightTop = round(trapezoidBottom - mLevels[index + 1] * unitHeight);