From 4e8081e30aff3d4cd6583f32ca1448f10b01d62a Mon Sep 17 00:00:00 2001
From: Sunny Shao <sunnyshao@google.com>
Date: Mon, 9 Sep 2019 03:05:16 +0000
Subject: [PATCH] Revert "Fix subtext didn't change after toggle changed"

This reverts commit 5d333991019c5fc0f974d040e50c426831ff9a2a.

Reason for revert: Subtext must display from its resource xml file, don't just show on/off.

Change-Id: I57a647be1aa2da881caf444c36991da0cdff73f6
---
 .../AutoBrightnessPreferenceController.java   | 41 ++-----------------
 1 file changed, 3 insertions(+), 38 deletions(-)

diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index 1ea65fd24cc..0018d848685 100644
--- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -18,34 +18,17 @@ import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
 import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
 
 import android.content.Context;
-import android.database.ContentObserver;
-import android.os.Handler;
-import android.os.Looper;
 import android.provider.Settings;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnStart;
-import com.android.settingslib.core.lifecycle.events.OnStop;
 
-public class AutoBrightnessPreferenceController extends TogglePreferenceController implements
-        LifecycleObserver, OnStart, OnStop {
+
+public class AutoBrightnessPreferenceController extends TogglePreferenceController {
+
     private final String SYSTEM_KEY = SCREEN_BRIGHTNESS_MODE;
     private final int DEFAULT_VALUE = SCREEN_BRIGHTNESS_MODE_MANUAL;
 
-    private Preference mPreference;
-    private ContentObserver mContentObserver =
-            new ContentObserver(new Handler(Looper.getMainLooper())) {
-                @Override
-                public void onChange(boolean selfChange) {
-                    refreshSummary(mPreference);
-                }
-            };
-
     public AutoBrightnessPreferenceController(Context context, String key) {
         super(context, key);
     }
@@ -72,28 +55,10 @@ public class AutoBrightnessPreferenceController extends TogglePreferenceControll
                 : UNSUPPORTED_ON_DEVICE;
     }
 
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreference = screen.findPreference(getPreferenceKey());
-    }
-
     @Override
     public CharSequence getSummary() {
         return mContext.getText(isChecked()
                 ? R.string.auto_brightness_summary_on
                 : R.string.auto_brightness_summary_off);
     }
-
-    @Override
-    public void onStart() {
-        mContext.getContentResolver().registerContentObserver(
-                Settings.System.getUriFor(SYSTEM_KEY), false /* notifyForDescendants */,
-                mContentObserver);
-    }
-
-    @Override
-    public void onStop() {
-        mContext.getContentResolver().unregisterContentObserver(mContentObserver);
-    }
 }