Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Allow showing Ambient instead of fully waking [2/2]

Browse Source 
* [joeyhuab] Adapt to A16; Remove MainSwitchPreference.updateStatus like 041bc113eb

Separate configs for st2w and lift to wake
Follow our convention in the rest of the switches in that page

Change-Id: Ibd82d808aca2caf3f9c4518eb0c2e5f60669759e
Signed-off-by: Cyber Knight <cyberknight755@gmail.com>
Signed-off-by: Edwiin Kusuma Jaya <kutemeikito0905@gmail.com>
This commit is contained in:
Ido Ben-Hur
2023-04-11 20:53:45 +02:00
committed by Joey
parent 97644bc45b
commit 6f43cd72cd
11 changed files with 472 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/com/android/settings/gestures/PickupGesturePreferenceController.java
View File

@@ -19,31 +19,49 @@ package com.android.settings.gestures;
import static android.provider.Settings.Secure.DOZE_PICK_UP_GESTURE;
import android.annotation.UserIdInt;
import android.content.ContentResolver;
import android.content.Context;
import android.content.SharedPreferences;
import android.database.ContentObserver;
import android.hardware.display.AmbientDisplayConfiguration;
import android.net.Uri;
import android.os.Handler;
import android.os.UserHandle;
import android.provider.Settings;
import android.text.TextUtils;
public class PickupGesturePreferenceController extends GesturePreferenceController {
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;
import com.android.settingslib.PrimarySwitchPreference;
public class PickupGesturePreferenceController extends TogglePreferenceController
implements LifecycleObserver, OnStart, OnStop {
private static final int ON = 1;
private static final int OFF = 0;
private static final String PREF_KEY_VIDEO = "gesture_pick_up_video";
private final String mPickUpPrefKey;
private final String SECURE_KEY = DOZE_PICK_UP_GESTURE;
private static final String AMBIENT_SECURE_KEY = "doze_pick_up_gesture_ambient";
private AmbientDisplayConfiguration mAmbientConfig;
@UserIdInt
private final int mUserId;
private final boolean mDefault;
private PrimarySwitchPreference mPreference;
private SettingObserver mSettingObserver;
public PickupGesturePreferenceController(Context context, String key) {
super(context, key);
mUserId = UserHandle.myUserId();
mPickUpPrefKey = key;
mDefault = context.getResources().getBoolean(
com.android.internal.R.bool.config_dozePickupGestureEnabled);
}
public PickupGesturePreferenceController setConfig(AmbientDisplayConfiguration config) {
@@ -67,6 +85,32 @@ public class PickupGesturePreferenceController extends GesturePreferenceControll
return AVAILABLE;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(getPreferenceKey());
mSettingObserver = new SettingObserver(mPreference);
updateState(mPreference);
}
@Override
public void updateState(Preference preference) {
super.updateState(preference);
final ContentResolver resolver = mContext.getContentResolver();
final boolean enabled =
Settings.Secure.getInt(resolver, SECURE_KEY, mDefault ? ON : OFF) == ON;
String summary;
if (enabled) {
summary = mContext.getString(R.string.gesture_setting_on) + " ("
+ (Settings.Secure.getInt(resolver, AMBIENT_SECURE_KEY, OFF) == ON
? mContext.getString(R.string.gesture_wake_ambient)
: mContext.getString(R.string.gesture_wake)) + ")";
} else {
summary = mContext.getString(R.string.gesture_setting_off);
}
preference.setSummary(summary);
}
@Override
public boolean isSliceable() {
return TextUtils.equals(getPreferenceKey(), "gesture_pick_up");
@@ -77,21 +121,11 @@ public class PickupGesturePreferenceController extends GesturePreferenceControll
return true;
}
@Override
protected String getVideoPrefKey() {
return PREF_KEY_VIDEO;
}
@Override
public boolean isChecked() {
return getAmbientConfig().pickupGestureEnabled(mUserId);
}
@Override
public String getPreferenceKey() {
return mPickUpPrefKey;
}
@Override
public boolean setChecked(boolean isChecked) {
return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY,
@@ -105,4 +139,53 @@ public class PickupGesturePreferenceController extends GesturePreferenceControll
return mAmbientConfig;
}
@Override
public int getSliceHighlightMenuRes() {
return NO_RES;
}
@Override
public void onStart() {
if (mSettingObserver != null) {
mSettingObserver.register(mContext.getContentResolver());
mSettingObserver.onChange(false, null);
}
}
@Override
public void onStop() {
if (mSettingObserver != null) {
mSettingObserver.unregister(mContext.getContentResolver());
}
}
private class SettingObserver extends ContentObserver {
private final Uri mUri = Settings.Secure.getUriFor(SECURE_KEY);
private final Uri mAmbientUri = Settings.Secure.getUriFor(AMBIENT_SECURE_KEY);
private final Preference mPreference;
SettingObserver(Preference preference) {
super(Handler.getMain());
mPreference = preference;
}
public void register(ContentResolver cr) {
cr.registerContentObserver(mUri, false, this);
cr.registerContentObserver(mAmbientUri, false, this);
}
public void unregister(ContentResolver cr) {
cr.unregisterContentObserver(this);
}
@Override
public void onChange(boolean selfChange, Uri uri) {
super.onChange(selfChange, uri);
if (uri == null || mUri.equals(uri) || mAmbientUri.equals(uri)) {
updateState(mPreference);
}
}
}
}