Merge "Improve battery saver setting a11y semantics" into pi-dev am: 577f2af92b

am: d7d1f98fa7

Change-Id: Ic79fa7da89397c517acd3087e23d652056296e89

diff --cc src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java
index b1fabb8,42b2920..b082eeb
--- 1/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java
--- 2/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java
@@@ -22,10 -22,11 +22,11 @@@ import android.net.Uri
  import android.os.Handler;
  import android.os.Looper;
  import android.provider.Settings;
 -import android.support.annotation.VisibleForTesting;
 -import android.support.v7.preference.Preference;
 -import android.support.v7.preference.PreferenceScreen;
 +import androidx.annotation.VisibleForTesting;
 +import androidx.preference.Preference;
 +import androidx.preference.PreferenceScreen;
  import android.util.Log;
+ import android.view.accessibility.AccessibilityNodeInfo;
  
  import com.android.settings.R;
  import com.android.settings.Utils;

diff --cc src/com/android/settings/widget/SeekBarPreference.java
Simple merge