Add Battery skeleton page and corresponding TS flag
Test: atest Bug: 372774754 Flag: com.android.settings.flags.catalyst_power_usage_summary_screen Change-Id: I2ce7581d0f7fdce3516fef415efdf562c63e38d4
This commit is contained in:
@@ -1,6 +1,13 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system"
|
||||||
|
|
||||||
|
flag {
|
||||||
|
name: "catalyst_power_usage_summary_screen"
|
||||||
|
namespace: "android_settings"
|
||||||
|
description: "Flag for Battery screen"
|
||||||
|
bug: "323791114"
|
||||||
|
}
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "catalyst_battery_saver_screen"
|
name: "catalyst_battery_saver_screen"
|
||||||
namespace: "android_settings"
|
namespace: "android_settings"
|
||||||
|
@@ -27,6 +27,8 @@ import android.os.Bundle;
|
|||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import android.provider.Settings.Global;
|
import android.provider.Settings.Global;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
import androidx.annotation.VisibleForTesting;
|
import androidx.annotation.VisibleForTesting;
|
||||||
import androidx.loader.app.LoaderManager;
|
import androidx.loader.app.LoaderManager;
|
||||||
import androidx.loader.content.Loader;
|
import androidx.loader.content.Loader;
|
||||||
@@ -270,4 +272,9 @@ public class PowerUsageSummary extends PowerUsageBase
|
|||||||
|
|
||||||
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||||
new BaseSearchIndexProvider(R.xml.power_usage_summary);
|
new BaseSearchIndexProvider(R.xml.power_usage_summary);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
|
||||||
|
return PowerUsageSummaryScreen.KEY;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,62 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2024 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.fuelgauge.batteryusage
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import com.android.settings.R
|
||||||
|
import com.android.settings.flags.Flags
|
||||||
|
import com.android.settingslib.metadata.PreferenceAvailabilityProvider
|
||||||
|
import com.android.settingslib.metadata.PreferenceIconProvider
|
||||||
|
import com.android.settingslib.metadata.ProvidePreferenceScreen
|
||||||
|
import com.android.settingslib.metadata.preferenceHierarchy
|
||||||
|
import com.android.settingslib.preference.PreferenceScreenCreator
|
||||||
|
|
||||||
|
@ProvidePreferenceScreen
|
||||||
|
class PowerUsageSummaryScreen : PreferenceScreenCreator,
|
||||||
|
PreferenceAvailabilityProvider,
|
||||||
|
PreferenceIconProvider {
|
||||||
|
override val key: String
|
||||||
|
get() = KEY
|
||||||
|
|
||||||
|
override val title: Int
|
||||||
|
get() = R.string.power_usage_summary_title
|
||||||
|
|
||||||
|
override val keywords: Int
|
||||||
|
get() = R.string.keywords_battery
|
||||||
|
|
||||||
|
override fun isFlagEnabled(context: Context) = Flags.catalystPowerUsageSummaryScreen()
|
||||||
|
|
||||||
|
override fun hasCompleteHierarchy() = false
|
||||||
|
|
||||||
|
override fun fragmentClass() = PowerUsageSummary::class.java
|
||||||
|
|
||||||
|
override fun isAvailable(context: Context) =
|
||||||
|
context.resources.getBoolean(R.bool.config_show_top_level_battery)
|
||||||
|
|
||||||
|
override fun getIcon(context: Context): Int =
|
||||||
|
if (Flags.homepageRevamp()) {
|
||||||
|
R.drawable.ic_settings_battery_filled
|
||||||
|
} else {
|
||||||
|
R.drawable.ic_settings_battery_white
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val KEY = "power_usage_summary_screen"
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,78 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2024 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.fuelgauge.batteryusage
|
||||||
|
|
||||||
|
import android.content.ContextWrapper
|
||||||
|
import android.content.res.Resources
|
||||||
|
import android.platform.test.annotations.DisableFlags
|
||||||
|
import android.platform.test.annotations.EnableFlags
|
||||||
|
import com.android.settings.R
|
||||||
|
import com.android.settings.flags.Flags
|
||||||
|
import com.android.settingslib.preference.CatalystScreenTestCase
|
||||||
|
import com.google.common.truth.Truth.assertThat
|
||||||
|
import org.junit.Test
|
||||||
|
import org.mockito.ArgumentMatchers.anyInt
|
||||||
|
import org.mockito.kotlin.doReturn
|
||||||
|
import org.mockito.kotlin.mock
|
||||||
|
import org.mockito.kotlin.stub
|
||||||
|
|
||||||
|
class PowerUsageSummaryScreenTest : CatalystScreenTestCase() {
|
||||||
|
|
||||||
|
override val preferenceScreenCreator = PowerUsageSummaryScreen()
|
||||||
|
|
||||||
|
override val flagName: String
|
||||||
|
get() = Flags.FLAG_CATALYST_POWER_USAGE_SUMMARY_SCREEN
|
||||||
|
|
||||||
|
private val mockResources = mock<Resources>()
|
||||||
|
|
||||||
|
private val contextWrapper =
|
||||||
|
object : ContextWrapper(context) {
|
||||||
|
override fun getResources(): Resources = mockResources
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun key() {
|
||||||
|
assertThat(preferenceScreenCreator.key).isEqualTo(PowerUsageSummaryScreen.KEY)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun isAvailable_configTrue_shouldReturnTrue() {
|
||||||
|
mockResources.stub { on { getBoolean(anyInt()) } doReturn true }
|
||||||
|
|
||||||
|
assertThat(preferenceScreenCreator.isAvailable(contextWrapper)).isTrue()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun isAvailable_configFalse_shouldReturnFalse() {
|
||||||
|
mockResources.stub { on { getBoolean(anyInt()) } doReturn false }
|
||||||
|
|
||||||
|
assertThat(preferenceScreenCreator.isAvailable(contextWrapper)).isFalse()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@EnableFlags(Flags.FLAG_HOMEPAGE_REVAMP)
|
||||||
|
fun getIcon_whenHomePageRevampFlagOn() {
|
||||||
|
assertThat(preferenceScreenCreator.getIcon(contextWrapper)).isEqualTo(R.drawable.ic_settings_battery_filled)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@DisableFlags(Flags.FLAG_HOMEPAGE_REVAMP)
|
||||||
|
fun getIcon_whenHomePageRevampFlagOff() {
|
||||||
|
assertThat(preferenceScreenCreator.getIcon(contextWrapper)).isEqualTo(R.drawable.ic_settings_battery_white)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun migration() {}
|
||||||
|
}
|
Reference in New Issue
Block a user