From 25ef484675d8f58434d13873626c7bc92e5e338d Mon Sep 17 00:00:00 2001
From: ELIYAZ MOMIN <mohammedeliyaz@google.com>
Date: Thu, 23 May 2024 13:04:08 +0000
Subject: [PATCH] Revert "Add a11y focus on battery chart a11y node."

This reverts commit 1d134d6665c49bd661ea0a1460a548ebd1badaa1.

Reason for revert: <Potential culprit for b/342336993  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>

Change-Id: Ifa208bbc77fc4f49b6465fd68d9a18e31d1d3254
---
 .../fuelgauge/batteryusage/BatteryChartView.java         | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
index 4acaeeaf5bb..37d2fceece2 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java
@@ -767,10 +767,6 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
     }
 
     private class BatteryChartAccessibilityNodeProvider extends AccessibilityNodeProvider {
-        private static final int UNDEFINED = Integer.MIN_VALUE;
-
-        private int mAccessibilityFocusNodeViewId = UNDEFINED;
-
         @Override
         public AccessibilityNodeInfo createAccessibilityNodeInfo(int virtualViewId) {
             if (virtualViewId == AccessibilityNodeProvider.HOST_VIEW_ID) {
@@ -798,7 +794,6 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
                             R.string.battery_usage_time_info_and_battery_level,
                             slotTimeInfo,
                             batteryLevelInfo));
-            childInfo.setAccessibilityFocused(virtualViewId == mAccessibilityFocusNodeViewId);
 
             final Rect bounds = new Rect();
             getBoundsOnScreen(bounds, true);
@@ -820,14 +815,10 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
                     return true;
 
                 case AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS:
-                    mAccessibilityFocusNodeViewId = virtualViewId;
                     return sendAccessibilityEvent(
                             virtualViewId, AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED);
 
                 case AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS:
-                    if (mAccessibilityFocusNodeViewId == virtualViewId) {
-                        mAccessibilityFocusNodeViewId = UNDEFINED;
-                    }
                     return sendAccessibilityEvent(
                             virtualViewId,
                             AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED);