Merge "Fix the broken tests on BatteryTipDialogFragmentTest" into tm-dev
diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
index b61f458..3bd84f8 100644
--- a/res/xml/security_lockscreen_settings.xml
+++ b/res/xml/security_lockscreen_settings.xml
@@ -79,6 +79,7 @@
<PreferenceCategory
android:key="ambient_display_category_when_to_show"
android:title="@string/ambient_display_category_triggers"
+ settings:controller="com.android.settings.display.AmbientDisplayWhenToShowPreferenceController"
android:order="1000">
<com.android.settingslib.RestrictedSwitchPreference
diff --git a/src/com/android/settings/display/AmbientDisplayWhenToShowPreferenceController.java b/src/com/android/settings/display/AmbientDisplayWhenToShowPreferenceController.java
new file mode 100644
index 0000000..66b2271
--- /dev/null
+++ b/src/com/android/settings/display/AmbientDisplayWhenToShowPreferenceController.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.display;
+
+import android.content.Context;
+import android.hardware.display.AmbientDisplayConfiguration;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+
+/**
+ * Only show the "When to show" Doze preferences if there's an ambient display available.
+ */
+public class AmbientDisplayWhenToShowPreferenceController extends
+ BasePreferenceController implements PreferenceControllerMixin {
+ private final AmbientDisplayConfiguration mConfig;
+
+ public AmbientDisplayWhenToShowPreferenceController(Context context, String key) {
+ super(context, key);
+ mConfig = new AmbientDisplayConfiguration(context);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mConfig.ambientDisplayAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java
index 36a9734..0d87ae7 100644
--- a/src/com/android/settings/fuelgauge/InactiveApps.java
+++ b/src/com/android/settings/fuelgauge/InactiveApps.java
@@ -111,8 +111,8 @@
p.setTitle(app.loadLabel(pm));
p.setIcon(app.loadIcon(pm));
p.setKey(packageName);
- p.setEntries(bucketNames);
- p.setEntryValues(bucketValues);
+ p.setEntries(getAllowableBuckets(packageName, bucketNames));
+ p.setEntryValues(getAllowableBuckets(packageName, bucketValues));
updateSummary(p);
// Don't allow Settings to change its own standby bucket.
if (TextUtils.equals(packageName, settingsPackage)) {
@@ -124,6 +124,25 @@
}
}
+ private CharSequence[] getAllowableBuckets(String packageName, CharSequence[] possibleBuckets) {
+ final int minBucket = mUsageStats.getAppMinStandbyBucket(packageName);
+ if (minBucket > STANDBY_BUCKET_RESTRICTED) {
+ return possibleBuckets;
+ }
+ if (minBucket < STANDBY_BUCKET_ACTIVE) {
+ return new CharSequence[]{};
+ }
+ // Use FULL_SETTABLE_BUCKETS_VALUES since we're searching using the int value. The index
+ // should apply no matter which array we're going to copy from.
+ final int idx =
+ Arrays.binarySearch(FULL_SETTABLE_BUCKETS_VALUES, Integer.toString(minBucket));
+ if (idx < 0) {
+ // Include everything
+ return possibleBuckets;
+ }
+ return Arrays.copyOfRange(possibleBuckets, 0, idx + 1);
+ }
+
static String bucketToName(int bucket) {
switch (bucket) {
case STANDBY_BUCKET_EXEMPTED: return "EXEMPTED";