Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01056301 authored by ELIYAZ MOMIN's avatar ELIYAZ MOMIN Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add a11y focus on battery chart a11y node."" into main

parents 11b10202 25ef4846

src/com/android/settings/fuelgauge/batteryusage/BatteryChartView.java

+0 −9
Original line number Diff line number Diff line
@@ -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);