PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix subtext didn't change after toggle changed"

Browse Source 
This reverts commit 5d33399101.

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

Change-Id: I57a647be1aa2da881caf444c36991da0cdff73f6
This commit is contained in:
Sunny Shao
2019-09-09 03:05:16 +00:00
parent 5d33399101
commit 4e8081e30a
1 changed files with 3 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/com/android/settings/display/AutoBrightnessPreferenceController.java
View File

@@ -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 static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
import android.content.Context; import android.content.Context;
import android.database.ContentObserver;
import android.os.Handler;
import android.os.Looper;
import android.provider.Settings; import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController; 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 String SYSTEM_KEY = SCREEN_BRIGHTNESS_MODE;
private final int DEFAULT_VALUE = SCREEN_BRIGHTNESS_MODE_MANUAL; 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) { public AutoBrightnessPreferenceController(Context context, String key) {
super(context, key); super(context, key);
} }
@@ -72,28 +55,10 @@ public class AutoBrightnessPreferenceController extends TogglePreferenceControll
: UNSUPPORTED_ON_DEVICE; : UNSUPPORTED_ON_DEVICE;
} }
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(getPreferenceKey());
}
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
return mContext.getText(isChecked() return mContext.getText(isChecked()
? R.string.auto_brightness_summary_on ? R.string.auto_brightness_summary_on
: R.string.auto_brightness_summary_off); : 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);
}
} }