Improve battery tips cards.
- Updated Card UI - Set thumb-up/down feedback preference to be GONE - Add basic button action [Screenshots] https://screenshot.googleplex.com/925MEzRyUCxZCi8 Test: manual Change-Id: I356648d0fcec5dd1ea724297187ecafb5be55fd8 Merged-In: I356648d0fcec5dd1ea724297187ecafb5be55fd8 Bug: 291689623
This commit is contained in:
21
res/drawable/battery_tips_all_rounded_bg_ripple.xml
Normal file
21
res/drawable/battery_tips_all_rounded_bg_ripple.xml
Normal file
@@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright (C) 2023 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.
|
||||
-->
|
||||
|
||||
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:color="?android:attr/colorControlHighlight">
|
||||
<item android:drawable="@drawable/battery_tips_all_rounded_bg"/>
|
||||
</ripple>
|
@@ -12,15 +12,10 @@
|
||||
android:id="@+id/tips_card"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/battery_tips_all_rounded_bg"
|
||||
android:background="@drawable/battery_tips_all_rounded_bg_ripple"
|
||||
android:orientation="vertical"
|
||||
android:padding="24dp">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/icon"
|
||||
android:layout_width="wrap_content"
|
||||
@@ -28,21 +23,6 @@
|
||||
android:layout_gravity="center_vertical|start"
|
||||
android:src="@drawable/ic_battery_tips_lightbulb" />
|
||||
|
||||
<Space
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/dismiss_button"
|
||||
style="@style/Banner.Dismiss.SettingsLib"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical|end"
|
||||
android:layout_marginEnd="0dp"
|
||||
android:src="@drawable/ic_battery_tips_close_icon" />
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="match_parent"
|
||||
@@ -53,24 +33,33 @@
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:textColor="?android:attr/textColorPrimary" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/summary"
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginTop="8dp"
|
||||
android:gravity="start"
|
||||
android:maxLines="10"
|
||||
android:textAlignment="viewStart"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorSecondary" />
|
||||
android:gravity="end">
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/action_button"
|
||||
style="@style/Widget.Material3.Button.OutlinedButton"
|
||||
android:id="@+id/dismiss_button"
|
||||
style="@style/Widget.Material3.Button.TextButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="end"
|
||||
android:paddingHorizontal="16dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="@string/battery_tips_card_dismiss_button"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/colorAccent"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/main_button"
|
||||
style="@style/Widget.Material3.Button.OutlinedButton"
|
||||
android:paddingHorizontal="16dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="end"
|
||||
android:layout_marginTop="8dp"
|
||||
android:text="@string/battery_tips_card_action_button"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
@@ -78,6 +67,7 @@
|
||||
app:strokeColor="?android:attr/colorAccent"
|
||||
app:strokeWidth="1dp" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<Space
|
||||
android:layout_width="0dp"
|
||||
|
@@ -1409,4 +1409,25 @@
|
||||
<integer-array name="network_mode_3g_deprecated_carrier_id" translatable="false">
|
||||
</integer-array>
|
||||
|
||||
<!-- The following 4 arrays are for power anomaly tips card. Please keep them the same size. -->
|
||||
<string-array name="power_anomaly_keys" translatable="false">
|
||||
<item>adaptive_brightness</item>
|
||||
<item>screen_timeout</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="power_anomaly_titles">
|
||||
<item>Turn on adaptive brightness to extend battery life</item>
|
||||
<item>Reduce screen timeout to extend battery life</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="power_anomaly_main_btn_strings">
|
||||
<item>@string/battery_tips_card_action_button</item>
|
||||
<item>@string/battery_tips_card_action_button</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="power_anomaly_dismiss_btn_strings">
|
||||
<item>@string/battery_tips_card_dismiss_button</item>
|
||||
<item>@string/battery_tips_card_dismiss_button</item>
|
||||
</string-array>
|
||||
|
||||
</resources>
|
||||
|
@@ -9651,23 +9651,14 @@
|
||||
<string name="app_battery_usage_summary">Set battery usage for apps</string>
|
||||
|
||||
<!-- Label of action button in battery tips card [CHAR LIMIT=NONE] -->
|
||||
<string name="battery_tips_card_action_button" translatable="false">Optimize</string>
|
||||
<string name="battery_tips_card_action_button" translatable="false">View Settings</string>
|
||||
|
||||
<!-- Label of dismiss button in battery tips card [CHAR LIMIT=NONE] -->
|
||||
<string name="battery_tips_card_dismiss_button" translatable="false">Got it</string>
|
||||
|
||||
<!-- Feedback card message in battery tips card [CHAR LIMIT=NONE] -->
|
||||
<string name="battery_tips_card_feedback_info" translatable="false">Is this message helpful?</string>
|
||||
|
||||
<!-- Title of battery tips: adaptive brightness [CHAR LIMIT=NONE] -->
|
||||
<string name="battery_tips_adaptive_brightness_title" translatable="false">Turn on adaptive brightness to extend battery life</string>
|
||||
|
||||
<!-- Summary of battery tips: adaptive brightness [CHAR LIMIT=NONE] -->
|
||||
<string name="battery_tips_adaptive_brightness_summary" translatable="false">It will help reduce your daily battery drain by 10%</string>
|
||||
|
||||
<!-- Title of battery tips: reduce screen timeout [CHAR LIMIT=NONE] -->
|
||||
<string name="battery_tips_screen_timeout_title" translatable="false">Reduce screen timeout to extend battery life</string>
|
||||
|
||||
<!-- Summary of battery tips: reduce screen timeout [CHAR LIMIT=NONE] -->
|
||||
<string name="battery_tips_screen_timeout_summary" translatable="false">It will help reduce your daily battery drain by 10%</string>
|
||||
|
||||
<!-- Filter title for battery unrestricted[CHAR_LIMIT=50]-->
|
||||
<string name="filter_battery_unrestricted_title">Unrestricted</string>
|
||||
|
||||
|
@@ -82,7 +82,7 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
|
||||
|
||||
@Override
|
||||
public boolean isBatteryTipsFeedbackEnabled() {
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -105,10 +105,9 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
|
||||
public interface OnBatteryTipsUpdatedListener {
|
||||
/**
|
||||
* The callback function for the battery tips card is updated.
|
||||
* @param title the title of the battery tip card
|
||||
* @param summary the summary of the battery tip card
|
||||
* @param powerAnomalyEvent the power anomaly event with highest score
|
||||
*/
|
||||
void onBatteryTipsUpdated(String title, String summary);
|
||||
void onBatteryTipsUpdated(PowerAnomalyEvent powerAnomalyEvent);
|
||||
}
|
||||
|
||||
|
||||
@@ -365,7 +364,8 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
|
||||
slotUsageData, getSlotInformation(), isBatteryUsageMapNullOrEmpty());
|
||||
|
||||
if (mOnBatteryTipsUpdatedListener != null) {
|
||||
mOnBatteryTipsUpdatedListener.onBatteryTipsUpdated(null, null);
|
||||
// TODO: replace with a selected powerAnomalyEvent with highest score
|
||||
mOnBatteryTipsUpdatedListener.onBatteryTipsUpdated(null);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
|
@@ -17,15 +17,19 @@
|
||||
package com.android.settings.fuelgauge.batteryusage;
|
||||
|
||||
import android.content.Context;
|
||||
import android.text.TextUtils;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
import android.widget.ImageButton;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceViewHolder;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.SubSettingLauncher;
|
||||
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
|
||||
@@ -40,12 +44,14 @@ public class BatteryTipsCardPreference extends Preference implements View.OnClic
|
||||
|
||||
private final PowerUsageFeatureProvider mPowerUsageFeatureProvider;
|
||||
|
||||
private MaterialButton mActionButton;
|
||||
private ImageButton mDismissButton;
|
||||
private ImageButton mThumbUpButton;
|
||||
private ImageButton mThumbDownButton;
|
||||
private CharSequence mTitle;
|
||||
private CharSequence mSummary;
|
||||
@VisibleForTesting
|
||||
CharSequence mMainButtonLabel;
|
||||
@VisibleForTesting
|
||||
CharSequence mDismissButtonLabel;
|
||||
@VisibleForTesting
|
||||
String mDestinationComponentName;
|
||||
@VisibleForTesting
|
||||
int mSourceMetricsCategory;
|
||||
|
||||
public BatteryTipsCardPreference(Context context, AttributeSet attrs) {
|
||||
super(context, attrs);
|
||||
@@ -55,34 +61,65 @@ public class BatteryTipsCardPreference extends Preference implements View.OnClic
|
||||
.getPowerUsageFeatureProvider(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTitle(CharSequence title) {
|
||||
mTitle = title;
|
||||
/**
|
||||
* Update the label of main button in tips card.
|
||||
*/
|
||||
public void setMainButtonLabel(CharSequence label) {
|
||||
if (!TextUtils.equals(mMainButtonLabel, label)) {
|
||||
mMainButtonLabel = label;
|
||||
notifyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSummary(CharSequence summary) {
|
||||
mSummary = summary;
|
||||
/**
|
||||
* Update the label of dismiss button in tips card.
|
||||
*/
|
||||
public void setDismissButtonLabel(CharSequence label) {
|
||||
if (!TextUtils.equals(mDismissButtonLabel, label)) {
|
||||
mDismissButtonLabel = label;
|
||||
notifyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the info of target fragment launched by main button.
|
||||
*/
|
||||
public void setMainButtonLauncherInfo(final String destinationClassName,
|
||||
final Integer sourceMetricsCategory) {
|
||||
mDestinationComponentName = destinationClassName;
|
||||
mSourceMetricsCategory = sourceMetricsCategory;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
// TODO: replace with the settings anomaly obtained from detectSettingsAnomaly();
|
||||
final int viewId = view.getId();
|
||||
if (viewId == R.id.main_button || viewId == R.id.tips_card) {
|
||||
if (TextUtils.isEmpty(mDestinationComponentName)) {
|
||||
return;
|
||||
}
|
||||
new SubSettingLauncher(getContext())
|
||||
.setDestination(mDestinationComponentName)
|
||||
.setSourceMetricsCategory(mSourceMetricsCategory)
|
||||
.launch();
|
||||
} else if (viewId == R.id.dismiss_button) {
|
||||
setVisible(false);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(PreferenceViewHolder view) {
|
||||
super.onBindViewHolder(view);
|
||||
|
||||
((TextView) view.findViewById(R.id.title)).setText(mTitle);
|
||||
((TextView) view.findViewById(R.id.summary)).setText(mSummary);
|
||||
((TextView) view.findViewById(R.id.title)).setText(getTitle());
|
||||
|
||||
mActionButton = (MaterialButton) view.findViewById(R.id.action_button);
|
||||
mActionButton.setOnClickListener(this);
|
||||
mDismissButton = (ImageButton) view.findViewById(R.id.dismiss_button);
|
||||
mDismissButton.setOnClickListener(this);
|
||||
LinearLayout tipsCard = (LinearLayout) view.findViewById(R.id.tips_card);
|
||||
tipsCard.setOnClickListener(this);
|
||||
MaterialButton mainButton = (MaterialButton) view.findViewById(R.id.main_button);
|
||||
mainButton.setOnClickListener(this);
|
||||
mainButton.setText(mMainButtonLabel);
|
||||
MaterialButton dismissButton = (MaterialButton) view.findViewById(R.id.dismiss_button);
|
||||
dismissButton.setOnClickListener(this);
|
||||
dismissButton.setText(mDismissButtonLabel);
|
||||
|
||||
if (!mPowerUsageFeatureProvider.isBatteryTipsFeedbackEnabled()) {
|
||||
return;
|
||||
@@ -91,9 +128,9 @@ public class BatteryTipsCardPreference extends Preference implements View.OnClic
|
||||
.setBackgroundResource(R.drawable.battery_tips_half_rounded_top_bg);
|
||||
view.findViewById(R.id.feedback_card).setVisibility(View.VISIBLE);
|
||||
|
||||
mThumbUpButton = (ImageButton) view.findViewById(R.id.thumb_up);
|
||||
mThumbUpButton.setOnClickListener(this);
|
||||
mThumbDownButton = (ImageButton) view.findViewById(R.id.thumb_down);
|
||||
mThumbDownButton.setOnClickListener(this);
|
||||
ImageButton thumbUpButton = (ImageButton) view.findViewById(R.id.thumb_up);
|
||||
thumbUpButton.setOnClickListener(this);
|
||||
ImageButton thumbDownButton = (ImageButton) view.findViewById(R.id.thumb_down);
|
||||
thumbDownButton.setOnClickListener(this);
|
||||
}
|
||||
}
|
||||
|
@@ -17,13 +17,18 @@
|
||||
package com.android.settings.fuelgauge.batteryusage;
|
||||
|
||||
import android.content.Context;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.internal.annotations.VisibleForTesting;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
|
||||
import java.util.function.Function;
|
||||
|
||||
/** Controls the update for battery tips card */
|
||||
public class BatteryTipsController extends BasePreferenceController {
|
||||
|
||||
@@ -31,15 +36,23 @@ public class BatteryTipsController extends BasePreferenceController {
|
||||
private static final String ROOT_PREFERENCE_KEY = "battery_tips_category";
|
||||
private static final String CARD_PREFERENCE_KEY = "battery_tips_card";
|
||||
|
||||
private final PowerUsageFeatureProvider mPowerUsageFeatureProvider;
|
||||
private final String[] mPowerAnomalyKeys;
|
||||
|
||||
private Context mPrefContext;
|
||||
private BatteryTipsCardPreference mCardPreference;
|
||||
@VisibleForTesting
|
||||
BatteryTipsCardPreference mCardPreference;
|
||||
@VisibleForTesting
|
||||
PowerUsageFeatureProvider mPowerUsageFeatureProvider;
|
||||
|
||||
public BatteryTipsController(Context context) {
|
||||
super(context, ROOT_PREFERENCE_KEY);
|
||||
mPowerUsageFeatureProvider = FeatureFactory.getFactory(context)
|
||||
.getPowerUsageFeatureProvider(context);
|
||||
mPowerAnomalyKeys = context.getResources().getStringArray(R.array.power_anomaly_keys);
|
||||
}
|
||||
|
||||
private boolean isTipsCardVisible() {
|
||||
// TODO: compared with the timestamp of last user dismiss action in sharedPreference.
|
||||
return mPowerUsageFeatureProvider.isBatteryTipsEnabled();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -50,28 +63,89 @@ public class BatteryTipsController extends BasePreferenceController {
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
mPrefContext = screen.getContext();
|
||||
mCardPreference = screen.findPreference(CARD_PREFERENCE_KEY);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the card visibility and contents.
|
||||
* @param title a string not extend 2 lines.
|
||||
* @param summary a string not extend 10 lines.
|
||||
*/
|
||||
// TODO: replace parameters with SettingsAnomaly Data Proto
|
||||
public void handleBatteryTipsCardUpdated(String title, String summary) {
|
||||
if (!mPowerUsageFeatureProvider.isBatteryTipsEnabled()) {
|
||||
mCardPreference.setVisible(false);
|
||||
return;
|
||||
@VisibleForTesting
|
||||
int getPowerAnomalyEventIndex(String powerAnomalyKey) {
|
||||
for (int index = 0; index < mPowerAnomalyKeys.length; index++) {
|
||||
if (mPowerAnomalyKeys[index].equals(powerAnomalyKey)) {
|
||||
return index;
|
||||
}
|
||||
if (title == null || summary == null) {
|
||||
mCardPreference.setVisible(false);
|
||||
return;
|
||||
}
|
||||
mCardPreference.setTitle(title);
|
||||
mCardPreference.setSummary(summary);
|
||||
mCardPreference.setVisible(true);
|
||||
return -1;
|
||||
}
|
||||
|
||||
private <T> T getInfo(PowerAnomalyEvent powerAnomalyEvent,
|
||||
Function<WarningBannerInfo, T> warningBannerInfoSupplier,
|
||||
Function<WarningItemInfo, T> warningItemInfoSupplier) {
|
||||
if (powerAnomalyEvent.hasWarningBannerInfo() && warningBannerInfoSupplier != null) {
|
||||
return warningBannerInfoSupplier.apply(powerAnomalyEvent.getWarningBannerInfo());
|
||||
} else if (powerAnomalyEvent.hasWarningItemInfo() && warningItemInfoSupplier != null) {
|
||||
return warningItemInfoSupplier.apply(powerAnomalyEvent.getWarningItemInfo());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private String getString(PowerAnomalyEvent powerAnomalyEvent,
|
||||
Function<WarningBannerInfo, String> warningBannerInfoSupplier,
|
||||
Function<WarningItemInfo, String> warningItemInfoSupplier,
|
||||
int resourceId, int resourceIndex) {
|
||||
String string =
|
||||
getInfo(powerAnomalyEvent, warningBannerInfoSupplier, warningItemInfoSupplier);
|
||||
|
||||
if (!TextUtils.isEmpty(string) || resourceId < 0) {
|
||||
return string;
|
||||
}
|
||||
|
||||
if (resourceIndex >= 0) {
|
||||
string = mContext.getResources().getStringArray(resourceId)[resourceIndex];
|
||||
}
|
||||
|
||||
return string;
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
void handleBatteryTipsCardUpdated(PowerAnomalyEvent powerAnomalyEvent) {
|
||||
if (!isTipsCardVisible()) {
|
||||
mCardPreference.setVisible(false);
|
||||
return;
|
||||
}
|
||||
if (powerAnomalyEvent == null) {
|
||||
mCardPreference.setVisible(false);
|
||||
return;
|
||||
}
|
||||
|
||||
// Get card preference strings and navigate fragment info
|
||||
final int index = getPowerAnomalyEventIndex(powerAnomalyEvent.getKey());
|
||||
|
||||
String titleString = getString(powerAnomalyEvent, WarningBannerInfo::getTitleString,
|
||||
WarningItemInfo::getTitleString, R.array.power_anomaly_titles, index);
|
||||
if (titleString.isEmpty()) {
|
||||
mCardPreference.setVisible(false);
|
||||
return;
|
||||
}
|
||||
|
||||
String mainBtnString = getString(powerAnomalyEvent,
|
||||
WarningBannerInfo::getMainButtonString, WarningItemInfo::getMainButtonString,
|
||||
R.array.power_anomaly_main_btn_strings, index);
|
||||
String dismissBtnString = getString(powerAnomalyEvent,
|
||||
WarningBannerInfo::getCancelButtonString, WarningItemInfo::getCancelButtonString,
|
||||
R.array.power_anomaly_dismiss_btn_strings, index);
|
||||
|
||||
String destinationClassName = getString(powerAnomalyEvent,
|
||||
WarningBannerInfo::getMainButtonDestination,
|
||||
WarningItemInfo::getMainButtonDestination,
|
||||
-1, -1);
|
||||
Integer sourceMetricsCategory = getInfo(powerAnomalyEvent,
|
||||
WarningBannerInfo::getMainButtonSourceMetricsCategory,
|
||||
WarningItemInfo::getMainButtonSourceMetricsCategory);
|
||||
|
||||
// Updated card preference and main button fragment launcher
|
||||
mCardPreference.setTitle(titleString);
|
||||
mCardPreference.setMainButtonLabel(mainBtnString);
|
||||
mCardPreference.setDismissButtonLabel(dismissBtnString);
|
||||
mCardPreference.setMainButtonLauncherInfo(destinationClassName, sourceMetricsCategory);
|
||||
mCardPreference.setVisible(true);
|
||||
}
|
||||
}
|
||||
|
@@ -73,8 +73,8 @@ public class PowerUsageFeatureProviderImplTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testIsBatteryTipsFeedbackEnabled_returnTrue() {
|
||||
assertThat(mPowerFeatureProvider.isBatteryTipsFeedbackEnabled()).isTrue();
|
||||
public void testIsBatteryTipsFeedbackEnabled_returnFalse() {
|
||||
assertThat(mPowerFeatureProvider.isBatteryTipsFeedbackEnabled()).isFalse();
|
||||
}
|
||||
@Test
|
||||
public void testGetBatteryUsageListConsumePowerThreshold_return0() {
|
||||
|
@@ -35,11 +35,14 @@ public final class BatteryTipsCardPreferenceTest {
|
||||
|
||||
private Context mContext;
|
||||
private BatteryTipsCardPreference mBatteryTipsCardPreference;
|
||||
private BatteryTipsController mBatteryTipsController;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
mBatteryTipsCardPreference = new BatteryTipsCardPreference(mContext, /*attrs=*/ null);
|
||||
mBatteryTipsController = new BatteryTipsController(mContext);
|
||||
mBatteryTipsController.mCardPreference = mBatteryTipsCardPreference;
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -0,0 +1,149 @@
|
||||
/*
|
||||
* Copyright (C) 2023 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 static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
import android.os.LocaleList;
|
||||
|
||||
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
|
||||
import com.android.settings.testutils.BatteryTestUtils;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.TimeZone;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public final class BatteryTipsControllerTest {
|
||||
|
||||
private Context mContext;
|
||||
private BatteryTipsController mBatteryTipsController;
|
||||
|
||||
@Mock
|
||||
private BatteryTipsCardPreference mBatteryTipsCardPreference;
|
||||
|
||||
@Mock
|
||||
private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
Locale.setDefault(new Locale("en_US"));
|
||||
org.robolectric.shadows.ShadowSettings.set24HourTimeFormat(false);
|
||||
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
final Resources resources = spy(mContext.getResources());
|
||||
resources.getConfiguration().setLocales(new LocaleList(new Locale("en_US")));
|
||||
doReturn(resources).when(mContext).getResources();
|
||||
mBatteryTipsController = new BatteryTipsController(mContext);
|
||||
mBatteryTipsController.mCardPreference = mBatteryTipsCardPreference;
|
||||
mBatteryTipsController.mPowerUsageFeatureProvider = mPowerUsageFeatureProvider;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parsePowerAnomalyKey_preDefinedKeys_returnTrue() {
|
||||
final String[] keys = {"adaptive_brightness", "screen_timeout"};
|
||||
for (int index = 0; index < keys.length; index++) {
|
||||
assertThat(mBatteryTipsController.getPowerAnomalyEventIndex(keys[index]))
|
||||
.isEqualTo(index);
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void parsePowerAnomalyKey_unknownKey_returnTrue() {
|
||||
final String key = "unknown_key_for_test";
|
||||
assertThat(mBatteryTipsController.getPowerAnomalyEventIndex(key)).isEqualTo(-1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void handleBatteryTipsCardUpdated_null_hidePreference() {
|
||||
mBatteryTipsController.handleBatteryTipsCardUpdated(/* powerAnomalyEvents= */ null);
|
||||
|
||||
verify(mBatteryTipsCardPreference).setVisible(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void handleBatteryTipsCardUpdated_adaptiveBrightnessAnomaly_showAnomaly() {
|
||||
PowerAnomalyEvent event = BatteryTestUtils.createAdaptiveBrightnessAnomalyEvent();
|
||||
when(mPowerUsageFeatureProvider.isBatteryTipsEnabled()).thenReturn(true);
|
||||
|
||||
mBatteryTipsController.handleBatteryTipsCardUpdated(event);
|
||||
|
||||
// Check pre-defined string
|
||||
verify(mBatteryTipsCardPreference).setTitle(
|
||||
"Turn on adaptive brightness to extend battery life");
|
||||
verify(mBatteryTipsCardPreference).setMainButtonLabel("View Settings");
|
||||
verify(mBatteryTipsCardPreference).setDismissButtonLabel("Got it");
|
||||
// Check proto info
|
||||
verify(mBatteryTipsCardPreference).setMainButtonLauncherInfo(
|
||||
"com.android.settings.display.AutoBrightnessSettings",
|
||||
1381);
|
||||
verify(mBatteryTipsCardPreference).setVisible(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void handleBatteryTipsCardUpdated_screenTimeoutAnomaly_showAnomaly() {
|
||||
PowerAnomalyEvent event = BatteryTestUtils.createScreenTimeoutAnomalyEvent();
|
||||
when(mPowerUsageFeatureProvider.isBatteryTipsEnabled()).thenReturn(true);
|
||||
|
||||
mBatteryTipsController.handleBatteryTipsCardUpdated(event);
|
||||
|
||||
verify(mBatteryTipsCardPreference).setTitle("Reduce screen timeout to extend battery life");
|
||||
verify(mBatteryTipsCardPreference).setMainButtonLabel("View Settings");
|
||||
verify(mBatteryTipsCardPreference).setDismissButtonLabel("Got it");
|
||||
verify(mBatteryTipsCardPreference).setMainButtonLauncherInfo(
|
||||
"com.android.settings.display.ScreenTimeoutSettings",
|
||||
1852);
|
||||
verify(mBatteryTipsCardPreference).setVisible(true);
|
||||
}
|
||||
@Test
|
||||
public void handleBatteryTipsCardUpdated_screenTimeoutAnomalyHasTitle_showAnomaly() {
|
||||
PowerAnomalyEvent event = BatteryTestUtils.createScreenTimeoutAnomalyEvent();
|
||||
String testTitle = "TestTitle";
|
||||
event = event.toBuilder()
|
||||
.setWarningBannerInfo(
|
||||
event.getWarningBannerInfo().toBuilder()
|
||||
.setTitleString(testTitle)
|
||||
.build())
|
||||
.build();
|
||||
when(mPowerUsageFeatureProvider.isBatteryTipsEnabled()).thenReturn(true);
|
||||
|
||||
mBatteryTipsController.handleBatteryTipsCardUpdated(event);
|
||||
|
||||
verify(mBatteryTipsCardPreference).setTitle(testTitle);
|
||||
verify(mBatteryTipsCardPreference).setMainButtonLabel("View Settings");
|
||||
verify(mBatteryTipsCardPreference).setDismissButtonLabel("Got it");
|
||||
verify(mBatteryTipsCardPreference).setMainButtonLauncherInfo(
|
||||
"com.android.settings.display.ScreenTimeoutSettings",
|
||||
1852);
|
||||
verify(mBatteryTipsCardPreference).setVisible(true);
|
||||
}
|
||||
}
|
@@ -18,6 +18,7 @@ package com.android.settings.testutils;
|
||||
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.hardware.usb.UsbManager;
|
||||
@@ -25,11 +26,17 @@ import android.hardware.usb.UsbPort;
|
||||
import android.hardware.usb.UsbPortStatus;
|
||||
import android.os.BatteryManager;
|
||||
import android.os.UserManager;
|
||||
|
||||
import androidx.room.Room;
|
||||
|
||||
import com.android.settings.display.AutoBrightnessSettings;
|
||||
import com.android.settings.display.ScreenTimeoutSettings;
|
||||
import com.android.settings.fuelgauge.batteryusage.BatteryInformation;
|
||||
import com.android.settings.fuelgauge.batteryusage.ConvertUtils;
|
||||
import com.android.settings.fuelgauge.batteryusage.DeviceBatteryState;
|
||||
import com.android.settings.fuelgauge.batteryusage.PowerAnomalyEvent;
|
||||
import com.android.settings.fuelgauge.batteryusage.PowerAnomalyEventList;
|
||||
import com.android.settings.fuelgauge.batteryusage.WarningBannerInfo;
|
||||
import com.android.settings.fuelgauge.batteryusage.db.AppUsageEventDao;
|
||||
import com.android.settings.fuelgauge.batteryusage.db.AppUsageEventEntity;
|
||||
import com.android.settings.fuelgauge.batteryusage.db.BatteryState;
|
||||
@@ -193,4 +200,33 @@ public class BatteryTestUtils {
|
||||
when(mockUsbPortStatus.getComplianceWarnings())
|
||||
.thenReturn(new int[]{UsbPortStatus.COMPLIANCE_WARNING_OTHER});
|
||||
}
|
||||
|
||||
/** Create an empty power anomaly event list proto. */
|
||||
public static PowerAnomalyEventList createEmptyPowerAnomalyEventList() {
|
||||
return PowerAnomalyEventList.getDefaultInstance();
|
||||
}
|
||||
|
||||
/** Create a power anomaly event proto of adaptive brightness. */
|
||||
public static PowerAnomalyEvent createAdaptiveBrightnessAnomalyEvent() {
|
||||
return PowerAnomalyEvent.newBuilder()
|
||||
.setType("settings banner")
|
||||
.setKey("adaptive_brightness")
|
||||
.setWarningBannerInfo(WarningBannerInfo.newBuilder()
|
||||
.setMainButtonDestination(AutoBrightnessSettings.class.getName())
|
||||
.setMainButtonSourceMetricsCategory(SettingsEnums.SETTINGS_AUTO_BRIGHTNESS)
|
||||
.build())
|
||||
.build();
|
||||
}
|
||||
|
||||
/** Create a power anomaly event proto of screen timeout. */
|
||||
public static PowerAnomalyEvent createScreenTimeoutAnomalyEvent() {
|
||||
return PowerAnomalyEvent.newBuilder()
|
||||
.setType("settings banner")
|
||||
.setKey("screen_timeout")
|
||||
.setWarningBannerInfo(WarningBannerInfo.newBuilder()
|
||||
.setMainButtonDestination(ScreenTimeoutSettings.class.getName())
|
||||
.setMainButtonSourceMetricsCategory(SettingsEnums.SCREEN_TIMEOUT)
|
||||
.build())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user