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

Revert "Update the summary of AoD when Bedtime mode is on"

Browse Source 
Revert "Update the summary of Idle lock screen when Bedtime mode..."

Revert submission 13071396-cherrypick-cherrypick-bedtime-hpxwlbiuim-0q85x8kaar

Reason for revert: Broken test b/173663404

Reverted Changes:
Id2511cb0a:Update the summary of AoD when Bedtime mode is on
I041599b9c:Update the summary of Idle lock screen when Bedtim...

Bug: 173663404
Change-Id: I9bea7499393d3ab1733b82140942499dddd9a2aa
Merged-In: I3b7053ad752f548f421dcca10cc1203500b1220b
This commit is contained in:
Yi-yo Chiang
2020-11-19 03:33:52 +00:00
parent bca70dd22d
commit cd4a35de8e
6 changed files with 29 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
View File

@@ -16,17 +16,12 @@
package com.android.settings.display;
import android.content.Context;
import android.content.pm.PackageManager;
import android.hardware.display.AmbientDisplayConfiguration;
import android.os.PowerManager;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings;
import android.text.TextUtils;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreferenceController {
@@ -36,9 +31,13 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference
private static final int MY_USER = UserHandle.myUserId();
private static final String PROP_AWARE_AVAILABLE = "ro.vendor.aware_available";
private static final String AOD_SUPPRESSED_TOKEN = "winddown";
private AmbientDisplayConfiguration mConfig;
private OnPreferenceChangedCallback mCallback;
public interface OnPreferenceChangedCallback {
void onPreferenceChanged();
}
public AmbientDisplayAlwaysOnPreferenceController(Context context, String key) {
super(context, key);
@@ -51,12 +50,6 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference
AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
public void updateState(Preference preference) {
super.updateState(preference);
refreshSummary(preference);
}
@Override
public boolean isSliceable() {
return TextUtils.equals(getPreferenceKey(), "ambient_display_always_on");
@@ -77,22 +70,24 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference
int enabled = isChecked ? ON : OFF;
Settings.Secure.putInt(
mContext.getContentResolver(), Settings.Secure.DOZE_ALWAYS_ON, enabled);
if (mCallback != null) {
mCallback.onPreferenceChanged();
}
return true;
}
@Override
public CharSequence getSummary() {
return mContext.getText(
isAodSuppressedByBedtime(mContext) ? R.string.aware_summary_when_bedtime_on
: R.string.doze_always_on_summary);
}
public AmbientDisplayAlwaysOnPreferenceController setConfig(
AmbientDisplayConfiguration config) {
mConfig = config;
return this;
}
public AmbientDisplayAlwaysOnPreferenceController setCallback(
OnPreferenceChangedCallback callback) {
mCallback = callback;
return this;
}
public static boolean isAvailable(AmbientDisplayConfiguration config) {
return config.alwaysOnAvailableForUser(MY_USER);
}
@@ -103,25 +98,4 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference
}
return mConfig;
}
/**
* Returns whether AOD is suppressed by Bedtime mode, a feature of Digital Wellbeing.
*
* We know that Bedtime mode suppresses AOD using {@link AOD_SUPPRESSED_TOKEN}. If the Digital
* Wellbeing app is suppressing AOD with {@link AOD_SUPPRESSED_TOKEN}, then we can infer that
* AOD is being suppressed by Bedtime mode.
*/
public static boolean isAodSuppressedByBedtime(Context context) {
int uid;
final PowerManager powerManager = context.getSystemService(PowerManager.class);
final PackageManager packageManager = context.getPackageManager();
final String packageName = context.getString(
com.android.internal.R.string.config_defaultWellbeingPackage);
try {
uid = packageManager.getApplicationInfo(packageName, /* flags= */ 0).uid;
} catch (PackageManager.NameNotFoundException e) {
return false;
}
return powerManager.isAmbientDisplaySuppressedForTokenByApp(AOD_SUPPRESSED_TOKEN, uid);
}
}