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

Snap for 7158291 from cb2c6bf3fa to sc-v2-release

Browse Source 
Change-Id: I74d2d7a94aefc7810a07946ef447088382191941
This commit is contained in:
android-build-team Robot
2021-02-20 02:08:42 +00:00
parent 06d61d7fc3 cb2c6bf3fa
commit 9651e45607
27 changed files with 383 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
res/values/strings.xml
View File

@@ -8306,6 +8306,9 @@
<!-- Configure Notifications Settings title. [CHAR LIMIT=30] --> <!-- Configure Notifications Settings title. [CHAR LIMIT=30] -->
<string name="configure_notification_settings">Notifications</string> <string name="configure_notification_settings">Notifications</string>
<!-- notification header - settings for conversation type notifications -->
<string name="conversation_notifs_category">Conversation</string>
<!-- notification header - apps that have recently sent notifications --> <!-- notification header - apps that have recently sent notifications -->
<string name="recent_notifications">Recently sent</string> <string name="recent_notifications">Recently sent</string>
@@ -8313,7 +8316,7 @@
<string name="recent_notifications_see_all_title">See all from last 7 days</string> <string name="recent_notifications_see_all_title">See all from last 7 days</string>
<!-- Configure Notifications: Advanced section header [CHAR LIMIT=30] --> <!-- Configure Notifications: Advanced section header [CHAR LIMIT=30] -->
<string name="advanced_section_header">Advanced</string> <string name="advanced_section_header">General</string>
<!-- Configure Notifications: Work profile section header [CHAR LIMIT=30] --> <!-- Configure Notifications: Work profile section header [CHAR LIMIT=30] -->
<string name="profile_section_header">Work notifications</string> <string name="profile_section_header">Work notifications</string>
@@ -8480,8 +8483,8 @@
<!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] --> <!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->
<string name="notification_pulse_title">Blink light</string> <string name="notification_pulse_title">Blink light</string>
<!-- Configure Notifications: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=60] --> <!-- Configure Notifications: Title for the option controlling privacy options for notifications. [CHAR LIMIT=60] -->
<string name="lock_screen_notifications_title">Notifications on lock screen</string> <string name="lock_screen_notifications_title">Privacy</string>
<!-- Configure lock screen: Title for the option of unlocking directly to home. [CHAR LIMIT=30] --> <!-- Configure lock screen: Title for the option of unlocking directly to home. [CHAR LIMIT=30] -->
<string name="lockscreen_bypass_title">Skip lock screen</string> <string name="lockscreen_bypass_title">Skip lock screen</string>
@@ -10638,7 +10641,7 @@
<string name="operator_warning">Carrier data accounting may differ from device accounting</string> <string name="operator_warning">Carrier data accounting may differ from device accounting</string>
<!-- A summary shown on data usage screens to indicate data tracking excluded from carrier networks [CHAR LIMIT=NONE] --> <!-- A summary shown on data usage screens to indicate data tracking excluded from carrier networks [CHAR LIMIT=NONE] -->
<string name="non_carrier_data_usage_warning">Excludes data that is used by carrier networks</string> <string name="non_carrier_data_usage_warning">Excludes data used by carrier networks</string>
<!-- Format string describing how much data has been used [CHAR LIMIT=20] --> <!-- Format string describing how much data has been used [CHAR LIMIT=20] -->
<string name="data_used_template"><xliff:g name="amount" example="1 GB">%1$s</xliff:g> used</string> <string name="data_used_template"><xliff:g name="amount" example="1 GB">%1$s</xliff:g> used</string>
@@ -12639,7 +12642,7 @@
<!-- Provider Model: No SIM status in summary for Calls & SMS --> <!-- Provider Model: No SIM status in summary for Calls & SMS -->
<string name="calls_sms_no_sim">No SIM</string> <string name="calls_sms_no_sim">No SIM</string>
<!-- Network & internet preferences title [CHAR LIMIT=NONE] --> <!-- Network & internet preferences title [CHAR LIMIT=NONE] -->
<string name="network_and_internet_preferences_title">Preferences</string> <string name="network_and_internet_preferences_title">Network preferences</string>
<!-- Network & internet preferences summary [CHAR LIMIT=NONE] --> <!-- Network & internet preferences summary [CHAR LIMIT=NONE] -->
<string name="network_and_internet_preferences_summary">Connect to public networks</string> <string name="network_and_internet_preferences_summary">Connect to public networks</string>
<!-- Search keywords for "Internet" settings [CHAR_LIMIT=NONE] --> <!-- Search keywords for "Internet" settings [CHAR_LIMIT=NONE] -->
@@ -12666,8 +12669,6 @@
<string name="airplane_mode_network_available">Airplane mode networks available</string> <string name="airplane_mode_network_available">Airplane mode networks available</string>
<!-- Summary for warning to disconnect ethernet first then switch to other networks. [CHAR LIMIT=60] --> <!-- Summary for warning to disconnect ethernet first then switch to other networks. [CHAR LIMIT=60] -->
<string name="to_switch_networks_disconnect_ethernet">To switch networks, disconnect ethernet</string> <string name="to_switch_networks_disconnect_ethernet">To switch networks, disconnect ethernet</string>
<!-- Summary for cannot switch networks to Wi-Fi nor mobile data networks while connected to an ethernet network. [CHAR LIMIT=60] -->
<string name="cannot_switch_networks_while_connected">Cannot switch networks while connected</string>
<!-- Title for airplane mode network panel. [CHAR LIMIT=60] --> <!-- Title for airplane mode network panel. [CHAR LIMIT=60] -->
<string name="airplane_mode_network_panel_title">Airplane mode networks</string> <string name="airplane_mode_network_panel_title">Airplane mode networks</string>

134
res/xml/configure_notification_settings_v2.xml
View File

@@ -18,59 +18,27 @@
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/configure_notification_settings"> android:title="@string/configure_notification_settings">
<com.android.settings.widget.VideoPreference <PreferenceCategory
android:key="notification_model_illustration" android:key="conversation_category"
android:title="@string/summary_placeholder" android:title="@string/conversation_notifs_category">
settings:animation="@raw/notification_interruption_model" <Preference
settings:controller="com.android.settings.widget.VideoPreferenceController" android:key="conversations"
android:persistent="false" /> android:title="@string/conversations_category_title"
settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"
<Preference android:fragment="com.android.settings.notification.app.ConversationListSettings"
android:key="notification_history" />
android:title="@string/notification_history" <Preference
android:summary="@string/notification_history_summary" android:key="notification_bubbles"
settings:allowDividerAbove="true" android:title="@string/notification_bubbles_title"
settings:allowDividerBelow="false" android:summary="@string/notifications_bubble_setting_on_summary"
android:order="2"> settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"
<intent android:fragment="com.android.settings.notification.BubbleNotificationSettings"
android:action="android.intent.action.MAIN" />
android:targetPackage="com.android.settings" </PreferenceCategory>
android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />
</Preference>
<Preference
android:key="conversations"
android:title="@string/conversations_category_title"
android:order="3"
settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"
android:fragment="com.android.settings.notification.app.ConversationListSettings"
/>
<Preference
android:key="notification_bubbles"
android:title="@string/notification_bubbles_title"
android:summary="@string/notifications_bubble_setting_on_summary"
android:order="4"
settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"
android:fragment="com.android.settings.notification.BubbleNotificationSettings"
/>
<com.android.settingslib.RestrictedPreference
android:key="app_and_notif_cell_broadcast_settings"
android:title="@string/cell_broadcast_settings"
android:order="5"
settings:useAdminDisabledSummary="true">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="@string/cell_broadcast_receiver_package"
android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
</com.android.settingslib.RestrictedPreference>
<PreferenceCategory <PreferenceCategory
android:key="recent_notifications_category" android:key="recent_notifications_category"
android:title="@string/recent_notifications" android:title="@string/recent_notifications">
settings:allowDividerAbove="true"
android:order="6">
<!-- Placeholder for a list of recent apps --> <!-- Placeholder for a list of recent apps -->
<!-- See all apps button --> <!-- See all apps button -->
@@ -78,7 +46,6 @@
android:key="all_notifications" android:key="all_notifications"
android:title="@string/notifications_title" android:title="@string/notifications_title"
android:fragment="com.android.settings.applications.manageapplications.ManageApplications" android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
android:order="7"
settings:searchable="false"> settings:searchable="false">
<extra <extra
android:name="classname" android:name="classname"
@@ -86,11 +53,18 @@
</Preference> </Preference>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:key="configure_notifications_lock" android:key="configure_notifications_lock"
android:title="@string/lock_screen_notifications_title" android:title="@string/lock_screen_notifications_title">
android:order="10"> <Preference
android:key="notification_history"
android:title="@string/notification_history"
android:summary="@string/notification_history_summary">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />
</Preference>
<!-- When device is locked --> <!-- When device is locked -->
<com.android.settings.RestrictedListPreference <com.android.settings.RestrictedListPreference
android:key="lock_screen_notifications" android:key="lock_screen_notifications"
@@ -120,14 +94,29 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:key="configure_notifications_advanced" android:key="advanced_section_header"
android:order="15" android:title="@string/advanced_section_header">
settings:initialExpandedChildrenCount="0"> <com.android.settingslib.RestrictedPreference
android:key="zen_mode_notifications"
android:title="@string/zen_mode_settings_title"
settings:useAdminDisabledSummary="true"
android:fragment="com.android.settings.notification.zen.ZenModeSettings"
settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
/>
<com.android.settingslib.RestrictedPreference
android:key="app_and_notif_cell_broadcast_settings"
android:title="@string/cell_broadcast_settings"
settings:useAdminDisabledSummary="true">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="@string/cell_broadcast_receiver_package"
android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
</com.android.settingslib.RestrictedPreference>
<SwitchPreference <SwitchPreference
android:key="silent_icons" android:key="silent_icons"
android:title="@string/silent_notifications_status_bar" android:title="@string/silent_notifications_status_bar"
settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/> settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>
<SwitchPreference <SwitchPreference
android:key="show_snooze_options" android:key="show_snooze_options"
@@ -140,33 +129,10 @@
android:title="@string/notification_badging_title" android:title="@string/notification_badging_title"
settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/> settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
<!-- Pulse notification light --> <!-- Pulse notification light, on devices that support it -->
<SwitchPreference <SwitchPreference
android:key="notification_pulse" android:key="notification_pulse"
android:title="@string/notification_pulse_title" android:title="@string/notification_pulse_title"
settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/> settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
<!-- Default notification ringtone -->
<com.android.settings.DefaultRingtonePreference
android:key="notification_default_ringtone"
android:title="@string/notification_ringtone_title"
android:dialogTitle="@string/notification_ringtone_title"
android:summary="@string/summary_placeholder"
android:ringtoneType="notification"
settings:searchable="false"/>
<Preference
android:key="gesture_swipe_down_fingerprint_notifications"
android:title="@string/fingerprint_swipe_for_notifications_title"
android:fragment="com.android.settings.gestures.SwipeToNotificationSettings"
settings:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController"/>
<com.android.settingslib.RestrictedPreference
android:key="zen_mode_notifications"
android:title="@string/zen_mode_settings_title"
settings:useAdminDisabledSummary="true"
android:fragment="com.android.settings.notification.zen.ZenModeSettings"
settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
settings:allowDividerAbove="false"/>
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

2
res/xml/network_provider_settings.xml
View File

@@ -39,7 +39,7 @@
<Preference <Preference
android:key="connected_ethernet_network" android:key="connected_ethernet_network"
android:title="@string/ethernet" android:title="@string/ethernet"
android:summary="@string/cannot_switch_networks_while_connected" android:summary="@string/to_switch_networks_disconnect_ethernet"
android:icon="@drawable/ic_settings_ethernet"/> android:icon="@drawable/ic_settings_ethernet"/>
<PreferenceCategory <PreferenceCategory

3
res/xml/power_usage_summary.xml
View File

@@ -21,11 +21,10 @@
android:title="@string/power_usage_summary_title" android:title="@string/power_usage_summary_title"
settings:keywords="@string/keywords_battery"> settings:keywords="@string/keywords_battery">
<com.android.settingslib.widget.LayoutPreference <com.android.settingslib.widget.UsageProgressBarPreference
android:key="battery_header" android:key="battery_header"
android:title="@string/summary_placeholder" android:title="@string/summary_placeholder"
android:selectable="false" android:selectable="false"
android:layout="@layout/battery_header"
settings:controller="com.android.settings.fuelgauge.BatteryHeaderPreferenceController" /> settings:controller="com.android.settings.fuelgauge.BatteryHeaderPreferenceController" />
<Preference <Preference

114
src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
View File

@@ -19,9 +19,12 @@ package com.android.settings.applications.appinfo;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.os.BatteryStats; import android.os.BatteryStats;
import android.os.BatteryUsageStats;
import android.os.Bundle; import android.os.Bundle;
import android.os.UidBatteryConsumer;
import android.os.UserManager; import android.os.UserManager;
import androidx.annotation.NonNull;
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;
@@ -36,6 +39,7 @@ import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.AdvancedPowerUsageDetail; import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;
import com.android.settings.fuelgauge.BatteryEntry; import com.android.settings.fuelgauge.BatteryEntry;
import com.android.settings.fuelgauge.BatteryStatsHelperLoader; import com.android.settings.fuelgauge.BatteryStatsHelperLoader;
import com.android.settings.fuelgauge.BatteryUsageStatsLoader;
import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -46,11 +50,19 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class AppBatteryPreferenceController extends BasePreferenceController public class AppBatteryPreferenceController extends BasePreferenceController
implements LoaderManager.LoaderCallbacks<BatteryStatsHelper>, implements LifecycleObserver, OnResume, OnPause {
LifecycleObserver, OnResume, OnPause {
private static final String KEY_BATTERY = "battery"; private static final String KEY_BATTERY = "battery";
// TODO(b/180630447): switch to BatteryUsageStatsLoader and remove all references to
// BatteryStatsHelper and BatterySipper
@VisibleForTesting
final BatteryStatsHelperLoaderCallbacks mBatteryStatsHelperLoaderCallbacks =
new BatteryStatsHelperLoaderCallbacks();
@VisibleForTesting
final BatteryUsageStatsLoaderCallbacks mBatteryUsageStatsLoaderCallbacks =
new BatteryUsageStatsLoaderCallbacks();
@VisibleForTesting @VisibleForTesting
BatterySipper mSipper; BatterySipper mSipper;
@VisibleForTesting @VisibleForTesting
@@ -58,6 +70,11 @@ public class AppBatteryPreferenceController extends BasePreferenceController
@VisibleForTesting @VisibleForTesting
BatteryUtils mBatteryUtils; BatteryUtils mBatteryUtils;
@VisibleForTesting
BatteryUsageStats mBatteryUsageStats;
@VisibleForTesting
UidBatteryConsumer mUidBatteryConsumer;
private Preference mPreference; private Preference mPreference;
private final AppInfoDashboardFragment mParent; private final AppInfoDashboardFragment mParent;
private String mBatteryPercent; private String mBatteryPercent;
@@ -96,7 +113,8 @@ public class AppBatteryPreferenceController extends BasePreferenceController
if (isBatteryStatsAvailable()) { if (isBatteryStatsAvailable()) {
final UserManager userManager = final UserManager userManager =
(UserManager) mContext.getSystemService(Context.USER_SERVICE); (UserManager) mContext.getSystemService(Context.USER_SERVICE);
final BatteryEntry entry = new BatteryEntry(mContext, null, userManager, mSipper); final BatteryEntry entry = new BatteryEntry(mContext, null, userManager, mSipper,
mUidBatteryConsumer);
entry.defaultPackageName = mPackageName; entry.defaultPackageName = mPackageName;
AdvancedPowerUsageDetail.startBatteryDetailPage(mParent.getActivity(), mParent, AdvancedPowerUsageDetail.startBatteryDetailPage(mParent.getActivity(), mParent,
mBatteryHelper, BatteryStats.STATS_SINCE_CHARGED, entry, mBatteryPercent); mBatteryHelper, BatteryStats.STATS_SINCE_CHARGED, entry, mBatteryPercent);
@@ -110,48 +128,48 @@ public class AppBatteryPreferenceController extends BasePreferenceController
@Override @Override
public void onResume() { public void onResume() {
mParent.getLoaderManager().restartLoader( mParent.getLoaderManager().restartLoader(
mParent.LOADER_BATTERY, Bundle.EMPTY, this); AppInfoDashboardFragment.LOADER_BATTERY, Bundle.EMPTY,
mBatteryStatsHelperLoaderCallbacks);
mParent.getLoaderManager().restartLoader(
AppInfoDashboardFragment.LOADER_BATTERY_USAGE_STATS, Bundle.EMPTY,
mBatteryUsageStatsLoaderCallbacks);
} }
@Override @Override
public void onPause() { public void onPause() {
mParent.getLoaderManager().destroyLoader(mParent.LOADER_BATTERY); mParent.getLoaderManager().destroyLoader(AppInfoDashboardFragment.LOADER_BATTERY);
mParent.getLoaderManager().destroyLoader(
AppInfoDashboardFragment.LOADER_BATTERY_USAGE_STATS);
} }
@Override private void onLoadFinished() {
public Loader<BatteryStatsHelper> onCreateLoader(int id, Bundle args) { // Wait for both loaders to finish before proceeding.
return new BatteryStatsHelperLoader(mContext); if (mBatteryHelper == null || mBatteryUsageStats == null) {
} return;
}
@Override
public void onLoadFinished(Loader<BatteryStatsHelper> loader,
BatteryStatsHelper batteryHelper) {
mBatteryHelper = batteryHelper;
final PackageInfo packageInfo = mParent.getPackageInfo(); final PackageInfo packageInfo = mParent.getPackageInfo();
if (packageInfo != null) { if (packageInfo != null) {
mSipper = findTargetSipper(batteryHelper, packageInfo.applicationInfo.uid); mSipper = findTargetSipper(mBatteryHelper, packageInfo.applicationInfo.uid);
mUidBatteryConsumer = findTargetUidBatteryConsumer(mBatteryUsageStats,
packageInfo.applicationInfo.uid);
if (mParent.getActivity() != null) { if (mParent.getActivity() != null) {
updateBattery(); updateBattery();
} }
} }
} }
@Override
public void onLoaderReset(Loader<BatteryStatsHelper> loader) {
}
@VisibleForTesting @VisibleForTesting
void updateBattery() { void updateBattery() {
mPreference.setEnabled(true); mPreference.setEnabled(true);
if (isBatteryStatsAvailable()) { if (isBatteryStatsAvailable()) {
final int dischargeAmount = mBatteryHelper.getStats().getDischargeAmount( final int dischargePercentage = mBatteryUsageStats.getDischargePercentage();
BatteryStats.STATS_SINCE_CHARGED);
final List<BatterySipper> usageList = new ArrayList<>(mBatteryHelper.getUsageList()); final List<BatterySipper> usageList = new ArrayList<>(mBatteryHelper.getUsageList());
final double hiddenAmount = mBatteryUtils.removeHiddenBatterySippers(usageList); final double hiddenAmount = mBatteryUtils.removeHiddenBatterySippers(usageList);
final int percentOfMax = (int) mBatteryUtils.calculateBatteryPercent( final int percentOfMax = (int) mBatteryUtils.calculateBatteryPercent(
mSipper.totalPowerMah, mBatteryHelper.getTotalPower(), hiddenAmount, mUidBatteryConsumer.getConsumedPower(), mBatteryUsageStats.getConsumedPower(),
dischargeAmount); hiddenAmount, dischargePercentage);
mBatteryPercent = Utils.formatPercentage(percentOfMax); mBatteryPercent = Utils.formatPercentage(percentOfMax);
mPreference.setSummary(mContext.getString(R.string.battery_summary, mBatteryPercent)); mPreference.setSummary(mContext.getString(R.string.battery_summary, mBatteryPercent));
} else { } else {
@@ -161,7 +179,7 @@ public class AppBatteryPreferenceController extends BasePreferenceController
@VisibleForTesting @VisibleForTesting
boolean isBatteryStatsAvailable() { boolean isBatteryStatsAvailable() {
return mBatteryHelper != null && mSipper != null; return mBatteryHelper != null && mSipper != null && mUidBatteryConsumer != null;
} }
@VisibleForTesting @VisibleForTesting
@@ -176,4 +194,54 @@ public class AppBatteryPreferenceController extends BasePreferenceController
return null; return null;
} }
@VisibleForTesting
UidBatteryConsumer findTargetUidBatteryConsumer(BatteryUsageStats batteryUsageStats, int uid) {
final List<UidBatteryConsumer> usageList = batteryUsageStats.getUidBatteryConsumers();
for (int i = 0, size = usageList.size(); i < size; i++) {
final UidBatteryConsumer consumer = usageList.get(i);
if (consumer.getUid() == uid) {
return consumer;
}
}
return null;
}
private class BatteryStatsHelperLoaderCallbacks
implements LoaderManager.LoaderCallbacks<BatteryStatsHelper> {
@Override
public Loader<BatteryStatsHelper> onCreateLoader(int id, Bundle args) {
return new BatteryStatsHelperLoader(mContext);
}
@Override
public void onLoadFinished(Loader<BatteryStatsHelper> loader,
BatteryStatsHelper batteryHelper) {
mBatteryHelper = batteryHelper;
AppBatteryPreferenceController.this.onLoadFinished();
}
@Override
public void onLoaderReset(Loader<BatteryStatsHelper> loader) {
}
}
private class BatteryUsageStatsLoaderCallbacks
implements LoaderManager.LoaderCallbacks<BatteryUsageStats> {
@Override
@NonNull
public Loader<BatteryUsageStats> onCreateLoader(int id, Bundle args) {
return new BatteryUsageStatsLoader(mContext);
}
@Override
public void onLoadFinished(Loader<BatteryUsageStats> loader,
BatteryUsageStats batteryUsageStats) {
mBatteryUsageStats = batteryUsageStats;
AppBatteryPreferenceController.this.onLoadFinished();
}
@Override
public void onLoaderReset(Loader<BatteryUsageStats> loader) {
}
}
} }

1
src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
View File

@@ -95,6 +95,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
static final int LOADER_CHART_DATA = 2; static final int LOADER_CHART_DATA = 2;
static final int LOADER_STORAGE = 3; static final int LOADER_STORAGE = 3;
static final int LOADER_BATTERY = 4; static final int LOADER_BATTERY = 4;
static final int LOADER_BATTERY_USAGE_STATS = 5;
public static final String ARG_PACKAGE_NAME = "package"; public static final String ARG_PACKAGE_NAME = "package";
public static final String ARG_PACKAGE_UID = "uid"; public static final String ARG_PACKAGE_UID = "uid";

12
src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.applications.assist;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri; import android.net.Uri;
import android.text.TextUtils; import android.text.TextUtils;
@@ -45,9 +46,11 @@ public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceC
private PreferenceScreen mScreen; private PreferenceScreen mScreen;
private Preference mPreference; private Preference mPreference;
private SettingObserver mSettingObserver; private SettingObserver mSettingObserver;
private Context mContext;
public DefaultVoiceInputPreferenceController(Context context, Lifecycle lifecycle) { public DefaultVoiceInputPreferenceController(Context context, Lifecycle lifecycle) {
super(context); super(context);
mContext = context;
mSettingObserver = new SettingObserver(); mSettingObserver = new SettingObserver();
mAssistUtils = new AssistUtils(context); mAssistUtils = new AssistUtils(context);
mHelper = new VoiceInputHelper(context); mHelper = new VoiceInputHelper(context);
@@ -59,13 +62,8 @@ public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceC
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
// If current assist is also voice service, don't show voice preference. return mContext.getPackageManager().hasSystemFeature(
final ComponentName currentVoiceService = PackageManager.FEATURE_VOICE_RECOGNIZERS);
DefaultVoiceInputPicker.getCurrentService(mHelper);
final ComponentName currentAssist =
mAssistUtils.getAssistComponentForUser(mUserId);
return !DefaultVoiceInputPicker.isCurrentAssistVoiceService(
currentAssist, currentVoiceService);
} }
@Override @Override

13
src/com/android/settings/emergency/EmergencyGesturePreferenceController.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.emergency; package com.android.settings.emergency;
import android.content.Context; import android.content.Context;
import android.provider.Settings;
import android.widget.Switch; import android.widget.Switch;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -26,6 +25,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
import com.android.settingslib.widget.MainSwitchPreference; import com.android.settingslib.widget.MainSwitchPreference;
import com.android.settingslib.widget.OnMainSwitchChangeListener; import com.android.settingslib.widget.OnMainSwitchChangeListener;
@@ -36,16 +36,13 @@ public class EmergencyGesturePreferenceController extends BasePreferenceControll
OnMainSwitchChangeListener { OnMainSwitchChangeListener {
@VisibleForTesting @VisibleForTesting
static final int ON = 1; EmergencyNumberUtils mEmergencyNumberUtils;
@VisibleForTesting
static final int OFF = 0;
private static final String SECURE_KEY = Settings.Secure.EMERGENCY_GESTURE_ENABLED;
private MainSwitchPreference mSwitchBar; private MainSwitchPreference mSwitchBar;
public EmergencyGesturePreferenceController(Context context, String key) { public EmergencyGesturePreferenceController(Context context, String key) {
super(context, key); super(context, key);
mEmergencyNumberUtils = new EmergencyNumberUtils(context);
} }
@Override @Override
@@ -71,11 +68,11 @@ public class EmergencyGesturePreferenceController extends BasePreferenceControll
@VisibleForTesting @VisibleForTesting
public boolean isChecked() { public boolean isChecked() {
return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, ON) == ON; return mEmergencyNumberUtils.getEmergencyGestureEnabled();
} }
@Override @Override
public void onSwitchChanged(Switch switchView, boolean isChecked) { public void onSwitchChanged(Switch switchView, boolean isChecked) {
Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY, isChecked ? ON : OFF); mEmergencyNumberUtils.setEmergencyGestureEnabled(isChecked);
} }
} }

15
src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java
View File

@@ -17,12 +17,12 @@
package com.android.settings.emergency; package com.android.settings.emergency;
import android.content.Context; import android.content.Context;
import android.provider.Settings;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
/** /**
* Preference controller for emergency sos gesture setting * Preference controller for emergency sos gesture setting
@@ -30,14 +30,11 @@ import com.android.settings.core.TogglePreferenceController;
public class EmergencyGestureSoundPreferenceController extends TogglePreferenceController { public class EmergencyGestureSoundPreferenceController extends TogglePreferenceController {
@VisibleForTesting @VisibleForTesting
static final int ON = 1; EmergencyNumberUtils mEmergencyNumberUtils;
@VisibleForTesting
static final int OFF = 0;
private static final String SECURE_KEY = Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED;
public EmergencyGestureSoundPreferenceController(Context context, String key) { public EmergencyGestureSoundPreferenceController(Context context, String key) {
super(context, key); super(context, key);
mEmergencyNumberUtils = new EmergencyNumberUtils(context);
} }
private static boolean isGestureAvailable(Context context) { private static boolean isGestureAvailable(Context context) {
@@ -57,12 +54,12 @@ public class EmergencyGestureSoundPreferenceController extends TogglePreferenceC
@Override @Override
public boolean isChecked() { public boolean isChecked() {
return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, ON) == ON; return mEmergencyNumberUtils.getEmergencyGestureSoundEnabled();
} }
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY, mEmergencyNumberUtils.setEmergencySoundEnabled(isChecked);
isChecked ? ON : OFF); return true;
} }
} }

2
src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
View File

@@ -208,7 +208,7 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro
} }
final UserHandle userHandle = new UserHandle(UserHandle.getUserId(sipper.getUid())); final UserHandle userHandle = new UserHandle(UserHandle.getUserId(sipper.getUid()));
final BatteryEntry entry = new BatteryEntry(mActivity, mHandler, mUserManager, final BatteryEntry entry = new BatteryEntry(mActivity, mHandler, mUserManager,
sipper); sipper, null);
final Drawable badgedIcon = mUserManager.getBadgedIconForUser(entry.getIcon(), final Drawable badgedIcon = mUserManager.getBadgedIconForUser(entry.getIcon(),
userHandle); userHandle);
final CharSequence contentDescription = mUserManager.getBadgedLabelForUser( final CharSequence contentDescription = mUserManager.getBadgedLabelForUser(

35
src/com/android/settings/fuelgauge/BatteryEntry.java
View File

@@ -28,6 +28,7 @@ import android.graphics.drawable.Drawable;
import android.os.Handler; import android.os.Handler;
import android.os.Process; import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UidBatteryConsumer;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.util.Log; import android.util.Log;
@@ -122,6 +123,7 @@ public class BatteryEntry {
public final Context context; public final Context context;
public final BatterySipper sipper; public final BatterySipper sipper;
public final UidBatteryConsumer uidBatteryConsumer;
public String name; public String name;
public Drawable icon; public Drawable icon;
@@ -134,10 +136,41 @@ public class BatteryEntry {
Drawable icon; Drawable icon;
} }
public BatteryEntry(Context context, Handler handler, UserManager um, BatterySipper sipper) { public BatteryEntry(Context context, Handler handler, UserManager um, BatterySipper sipper,
UidBatteryConsumer uidBatteryConsumer) {
sHandler = handler; sHandler = handler;
this.context = context; this.context = context;
this.sipper = sipper; this.sipper = sipper;
this.uidBatteryConsumer = uidBatteryConsumer;
// This condition is met when BatteryEntry is initialized from BatteryUsageStats.
// Once the conversion from BatteryStatsHelper is completed, the condition will
// always be true and can be removed.
if (uidBatteryConsumer != null) {
PackageManager pm = context.getPackageManager();
int uid = uidBatteryConsumer.getUid();
String[] packages = pm.getPackagesForUid(uid);
// Apps should only have one package
if (packages == null || packages.length != 1) {
name = uidBatteryConsumer.getPackageWithHighestDrain();
} else {
defaultPackageName = packages[0];
try {
ApplicationInfo appInfo =
pm.getApplicationInfo(defaultPackageName, 0 /* no flags */);
name = pm.getApplicationLabel(appInfo).toString();
} catch (NameNotFoundException e) {
Log.d(TAG, "PackageManager failed to retrieve ApplicationInfo for: "
+ defaultPackageName);
name = defaultPackageName;
}
}
if ((name == null || iconId == 0) && uid != 0) {
getQuickNameIconForUid(uid);
}
return;
}
switch (sipper.drainType) { switch (sipper.drainType) {
case IDLE: case IDLE:
name = context.getResources().getString(R.string.power_idle); name = context.getResources().getString(R.string.power_idle);

77
src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
View File

@@ -25,11 +25,6 @@ import android.icu.text.NumberFormat;
import android.os.BatteryManager; import android.os.BatteryManager;
import android.os.PowerManager; import android.os.PowerManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceFragmentCompat;
@@ -39,14 +34,12 @@ import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settings.utils.AnnotationSpan;
import com.android.settings.widget.EntityHeaderController; import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.widget.LayoutPreference; import com.android.settingslib.widget.UsageProgressBarPreference;
/** /**
* Controller that update the battery header view * Controller that update the battery header view
@@ -57,23 +50,18 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
@VisibleForTesting @VisibleForTesting
static final String KEY_BATTERY_HEADER = "battery_header"; static final String KEY_BATTERY_HEADER = "battery_header";
private static final String ANNOTATION_URL = "url"; private static final String ANNOTATION_URL = "url";
private static final int BATTERY_MAX_LEVEL = 100;
@VisibleForTesting @VisibleForTesting
BatteryStatusFeatureProvider mBatteryStatusFeatureProvider; BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
@VisibleForTesting @VisibleForTesting
BatteryMeterView mBatteryMeterView; UsageProgressBarPreference mBatteryUsageProgressBarPref;
@VisibleForTesting
TextView mBatteryPercentText;
@VisibleForTesting
TextView mSummary1;
private Activity mActivity; private Activity mActivity;
private PreferenceFragmentCompat mHost; private PreferenceFragmentCompat mHost;
private Lifecycle mLifecycle; private Lifecycle mLifecycle;
private final PowerManager mPowerManager; private final PowerManager mPowerManager;
private LayoutPreference mBatteryLayoutPref;
public BatteryHeaderPreferenceController(Context context, String key) { public BatteryHeaderPreferenceController(Context context, String key) {
super(context, key); super(context, key);
mPowerManager = context.getSystemService(PowerManager.class); mPowerManager = context.getSystemService(PowerManager.class);
@@ -96,16 +84,12 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
@Override @Override
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);
mBatteryLayoutPref = screen.findPreference(getPreferenceKey()); mBatteryUsageProgressBarPref = screen.findPreference(getPreferenceKey());
mBatteryMeterView = mBatteryLayoutPref
.findViewById(R.id.battery_header_icon);
mBatteryPercentText = mBatteryLayoutPref.findViewById(R.id.battery_percent);
mSummary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
if (com.android.settings.Utils.isBatteryPresent(mContext)) { if (com.android.settings.Utils.isBatteryPresent(mContext)) {
quickUpdateHeaderPreference(); quickUpdateHeaderPreference();
} else { } else {
showHelpMessage(); //TODO(b/179237551): Make new progress bar widget support help message
} }
} }
@@ -116,8 +100,7 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
@Override @Override
public void onStart() { public void onStart() {
EntityHeaderController.newInstance(mActivity, mHost, EntityHeaderController.newInstance(mActivity, mHost, null /* header view */)
mBatteryLayoutPref.findViewById(R.id.battery_entity_header))
.setRecyclerView(mHost.getListView(), mLifecycle) .setRecyclerView(mHost.getListView(), mLifecycle)
.styleActionBar(mActivity); .styleActionBar(mActivity);
} }
@@ -133,21 +116,20 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
} }
public void updateHeaderPreference(BatteryInfo info) { public void updateHeaderPreference(BatteryInfo info) {
mBatteryPercentText.setText(formatBatteryPercentageText(info.batteryLevel));
if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
mSummary1.setText(generateLabel(info));
}
mBatteryMeterView.setBatteryLevel(info.batteryLevel); //TODO(b/179237746): Make progress bar widget support battery state icon
mBatteryMeterView.setCharging(!info.discharging);
mBatteryMeterView.setPowerSave(mPowerManager.isPowerSaveMode()); mBatteryUsageProgressBarPref.setUsageSummary(
formatBatteryPercentageText(info.batteryLevel));
mBatteryUsageProgressBarPref.setTotalSummary(generateLabel(info));
mBatteryUsageProgressBarPref.setPercent(info.batteryLevel, BATTERY_MAX_LEVEL);
} }
/** /**
* Callback which receives text for the summary line. * Callback which receives text for the summary line.
*/ */
public void updateBatteryStatus(String label, BatteryInfo info) { public void updateBatteryStatus(String label, BatteryInfo info) {
mSummary1.setText(label != null ? label : generateLabel(info)); mBatteryUsageProgressBarPref.setTotalSummary(label != null ? label : generateLabel(info));
} }
public void quickUpdateHeaderPreference() { public void quickUpdateHeaderPreference() {
@@ -157,37 +139,10 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
final boolean discharging = final boolean discharging =
batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0; batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
// Set battery level and charging status //TODO(b/179237746): Make progress bar widget support battery state icon
mBatteryMeterView.setBatteryLevel(batteryLevel);
mBatteryMeterView.setCharging(!discharging);
mBatteryMeterView.setPowerSave(mPowerManager.isPowerSaveMode());
mBatteryPercentText.setText(formatBatteryPercentageText(batteryLevel));
}
@VisibleForTesting mBatteryUsageProgressBarPref.setUsageSummary(formatBatteryPercentageText(batteryLevel));
void showHelpMessage() { mBatteryUsageProgressBarPref.setPercent(batteryLevel, BATTERY_MAX_LEVEL);
final LinearLayout batteryInfoLayout =
mBatteryLayoutPref.findViewById(R.id.battery_info_layout);
// Remove battery meter icon
mBatteryMeterView.setVisibility(View.GONE);
// Update the width of battery info layout
final ViewGroup.LayoutParams params = batteryInfoLayout.getLayoutParams();
params.width = LinearLayout.LayoutParams.WRAP_CONTENT;
batteryInfoLayout.setLayoutParams(params);
mBatteryPercentText.setText(mContext.getText(R.string.unknown));
// Add linkable text for learn more
final Intent helpIntent = HelpUtils.getHelpIntent(mContext,
mContext.getString(R.string.help_url_battery_missing),
mContext.getClass().getName());
final AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan
.LinkInfo(mContext, ANNOTATION_URL, helpIntent);
if (linkInfo.isActionable()) {
mSummary1.setMovementMethod(LinkMovementMethod.getInstance());
mSummary1.setText(AnnotationSpan
.linkify(mContext.getText(R.string.battery_missing_help_message), linkInfo));
} else {
mSummary1.setText(mContext.getText(R.string.battery_missing_message));
}
} }
private CharSequence formatBatteryPercentageText(int batteryLevel) { private CharSequence formatBatteryPercentageText(int batteryLevel) {

44
src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java Normal file
View File

@@ -0,0 +1,44 @@
/*
* Copyright (C) 2020 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;
import android.content.Context;
import android.os.BatteryStatsManager;
import android.os.BatteryUsageStats;
import com.android.settingslib.utils.AsyncLoaderCompat;
/**
* Loader to get new {@link BatteryUsageStats} in the background
*/
public class BatteryUsageStatsLoader extends AsyncLoaderCompat<BatteryUsageStats> {
private final BatteryStatsManager mBatteryStatsManager;
public BatteryUsageStatsLoader(Context context) {
super(context);
mBatteryStatsManager = context.getSystemService(BatteryStatsManager.class);
}
@Override
public BatteryUsageStats loadInBackground() {
return mBatteryStatsManager.getBatteryUsageStats();
}
@Override
protected void onDiscardResult(BatteryUsageStats result) {
}
}

78
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -25,14 +25,9 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.provider.Settings.Global; import android.provider.Settings.Global;
import android.text.format.Formatter;
import android.view.View;
import android.view.View.OnLongClickListener;
import android.widget.TextView;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.loader.app.LoaderManager; import androidx.loader.app.LoaderManager;
import androidx.loader.app.LoaderManager.LoaderCallbacks;
import androidx.loader.content.Loader; import androidx.loader.content.Loader;
import com.android.settings.R; import com.android.settings.R;
@@ -44,7 +39,6 @@ import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.utils.PowerUtil;
import com.android.settingslib.widget.LayoutPreference; import com.android.settingslib.widget.LayoutPreference;
import java.util.List; import java.util.List;
@@ -54,18 +48,15 @@ import java.util.List;
* since the last time it was unplugged. * since the last time it was unplugged.
*/ */
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class PowerUsageSummary extends PowerUsageBase implements OnLongClickListener, public class PowerUsageSummary extends PowerUsageBase implements
BatteryTipPreferenceController.BatteryTipListener { BatteryTipPreferenceController.BatteryTipListener {
static final String TAG = "PowerUsageSummary"; static final String TAG = "PowerUsageSummary";
private static final String KEY_BATTERY_HEADER = "battery_header";
@VisibleForTesting @VisibleForTesting
static final int BATTERY_INFO_LOADER = 1; static final int BATTERY_INFO_LOADER = 1;
@VisibleForTesting @VisibleForTesting
static final int BATTERY_TIP_LOADER = 2; static final int BATTERY_TIP_LOADER = 2;
public static final int DEBUG_INFO_LOADER = 3;
@VisibleForTesting @VisibleForTesting
PowerUsageFeatureProvider mPowerFeatureProvider; PowerUsageFeatureProvider mPowerFeatureProvider;
@@ -112,49 +103,6 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList
} }
}; };
LoaderManager.LoaderCallbacks<List<BatteryInfo>> mBatteryInfoDebugLoaderCallbacks =
new LoaderCallbacks<List<BatteryInfo>>() {
@Override
public Loader<List<BatteryInfo>> onCreateLoader(int i, Bundle bundle) {
return new DebugEstimatesLoader(getContext(), mStatsHelper);
}
@Override
public void onLoadFinished(Loader<List<BatteryInfo>> loader,
List<BatteryInfo> batteryInfos) {
updateViews(batteryInfos);
}
@Override
public void onLoaderReset(Loader<List<BatteryInfo>> loader) {
}
};
protected void updateViews(List<BatteryInfo> batteryInfos) {
final BatteryMeterView batteryView = mBatteryLayoutPref
.findViewById(R.id.battery_header_icon);
final TextView percentRemaining =
mBatteryLayoutPref.findViewById(R.id.battery_percent);
final TextView summary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
BatteryInfo oldInfo = batteryInfos.get(0);
BatteryInfo newInfo = batteryInfos.get(1);
percentRemaining.setText(Utils.formatPercentage(oldInfo.batteryLevel));
// set the text to the old estimate (copied from battery info). Note that this
// can sometimes say 0 time remaining because battery stats requires the phone
// be unplugged for a period of time before being willing ot make an estimate.
final String OldEstimateString = mPowerFeatureProvider.getOldEstimateDebugString(
Formatter.formatShortElapsedTime(getContext(),
PowerUtil.convertUsToMs(oldInfo.remainingTimeUs)));
final String NewEstimateString = mPowerFeatureProvider.getEnhancedEstimateDebugString(
Formatter.formatShortElapsedTime(getContext(),
PowerUtil.convertUsToMs(newInfo.remainingTimeUs)));
summary1.setText(OldEstimateString + "\n" + NewEstimateString);
batteryView.setBatteryLevel(oldInfo.batteryLevel);
batteryView.setCharging(!oldInfo.discharging);
}
private LoaderManager.LoaderCallbacks<List<BatteryTip>> mBatteryTipsCallbacks = private LoaderManager.LoaderCallbacks<List<BatteryTip>> mBatteryTipsCallbacks =
new LoaderManager.LoaderCallbacks<List<BatteryTip>>() { new LoaderManager.LoaderCallbacks<List<BatteryTip>>() {
@@ -197,7 +145,6 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList
setAnimationAllowed(true); setAnimationAllowed(true);
initFeatureProvider(); initFeatureProvider();
mBatteryLayoutPref = (LayoutPreference) findPreference(KEY_BATTERY_HEADER);
mBatteryUtils = BatteryUtils.getInstance(getContext()); mBatteryUtils = BatteryUtils.getInstance(getContext());
@@ -274,17 +221,6 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList
mBatteryLayoutPref = layoutPreference; mBatteryLayoutPref = layoutPreference;
} }
@VisibleForTesting
void showBothEstimates() {
final Context context = getContext();
if (context == null
|| !mPowerFeatureProvider.isEnhancedBatteryPredictionEnabled(context)) {
return;
}
getLoaderManager().restartLoader(DEBUG_INFO_LOADER, Bundle.EMPTY,
mBatteryInfoDebugLoaderCallbacks);
}
@VisibleForTesting @VisibleForTesting
void initFeatureProvider() { void initFeatureProvider() {
final Context context = getContext(); final Context context = getContext();
@@ -303,11 +239,6 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList
} }
getLoaderManager().restartLoader(BATTERY_INFO_LOADER, Bundle.EMPTY, getLoaderManager().restartLoader(BATTERY_INFO_LOADER, Bundle.EMPTY,
mBatteryInfoLoaderCallbacks); mBatteryInfoLoaderCallbacks);
if (mPowerFeatureProvider.isEstimateDebugEnabled()) {
// Set long click action for summary to show debug info
View header = mBatteryLayoutPref.findViewById(R.id.summary1);
header.setOnLongClickListener(this);
}
} }
@VisibleForTesting @VisibleForTesting
@@ -315,13 +246,6 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList
mNeedUpdateBatteryTip = icicle == null || mBatteryTipPreferenceController.needUpdate(); mNeedUpdateBatteryTip = icicle == null || mBatteryTipPreferenceController.needUpdate();
} }
@Override
public boolean onLongClick(View view) {
showBothEstimates();
view.setOnLongClickListener(null);
return true;
}
@Override @Override
protected void restartBatteryStatsLoader(@BatteryUpdateType int refreshType) { protected void restartBatteryStatsLoader(@BatteryUpdateType int refreshType) {
super.restartBatteryStatsLoader(refreshType); super.restartBatteryStatsLoader(refreshType);

9
src/com/android/settings/gestures/SystemNavigationGestureSettings.java
View File

@@ -31,6 +31,7 @@ import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.FeatureFlagUtils;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -38,6 +39,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsTutorialDialogWrapperActivity; import com.android.settings.SettingsTutorialDialogWrapperActivity;
import com.android.settings.core.FeatureFlags;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
@@ -77,8 +79,11 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
@Override @Override
public void onAttach(Context context) { public void onAttach(Context context) {
super.onAttach(context); super.onAttach(context);
SearchMenuController.init(this /* host */); // TODO(b/176883483): Remove both search and help menu if this feature rolled out
HelpMenuController.init(this /* host */); if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
SearchMenuController.init(this /* host */);
HelpMenuController.init(this /* host */);
}
SuggestionFeatureProvider suggestionFeatureProvider = FeatureFactory.getFactory(context) SuggestionFeatureProvider suggestionFeatureProvider = FeatureFactory.getFactory(context)
.getSuggestionFeatureProvider(context); .getSuggestionFeatureProvider(context);

2
src/com/android/settings/network/ProviderModelSlice.java
View File

@@ -257,7 +257,7 @@ public class ProviderModelSlice extends WifiSlice {
} }
return rowBuilder return rowBuilder
.setTitle(mContext.getText(R.string.ethernet)) .setTitle(mContext.getText(R.string.ethernet))
.setSubtitle(mContext.getText(R.string.cannot_switch_networks_while_connected)); .setSubtitle(mContext.getText(R.string.to_switch_networks_disconnect_ethernet));
} }
/** /**

3
src/com/android/settings/network/ProviderModelSliceHelper.java
View File

@@ -29,6 +29,7 @@ import android.telephony.SignalStrength;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.Html;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@@ -141,7 +142,7 @@ public class ProviderModelSliceHelper {
.setTitleItem(levelIcon, ListBuilder.ICON_IMAGE) .setTitleItem(levelIcon, ListBuilder.ICON_IMAGE)
.addEndItem(toggleAction) .addEndItem(toggleAction)
.setPrimaryAction(primaryAction) .setPrimaryAction(primaryAction)
.setSubtitle(summary); .setSubtitle(Html.fromHtml(summary, Html.FROM_HTML_MODE_LEGACY));
return rowBuilder; return rowBuilder;
} }

4
src/com/android/settings/network/apn/ApnSettings.java
View File

@@ -43,6 +43,7 @@ import android.telephony.PreciseDataConnectionState;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.telephony.data.ApnSetting;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.Menu; import android.view.Menu;
@@ -344,7 +345,8 @@ public class ApnSettings extends RestrictedSettingsFragment
pref.setSummary(apn); pref.setSummary(apn);
} }
final boolean selectable = ((type == null) || !type.equals("mms")); final boolean selectable =
((type == null) || type.contains(ApnSetting.TYPE_DEFAULT_STRING));
pref.setSelectable(selectable); pref.setSelectable(selectable);
if (selectable) { if (selectable) {
if ((mSelectedKey != null) && mSelectedKey.equals(key)) { if ((mSelectedKey != null) && mSelectedKey.equals(key)) {

12
src/com/android/settings/notification/app/ConversationListPreferenceController.java
View File

@@ -163,8 +163,16 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe
return o1.getNotificationChannel().getId().compareTo( return o1.getNotificationChannel().getId().compareTo(
o2.getNotificationChannel().getId()); o2.getNotificationChannel().getId());
} }
return sCollator.compare(o1.getShortcutInfo().getLabel(), if (o1.getShortcutInfo().getLabel() == null
o2.getShortcutInfo().getLabel()); && o2.getShortcutInfo().getLabel() != null) {
return 1;
}
if (o1.getShortcutInfo().getLabel() != null
&& o2.getShortcutInfo().getLabel() == null) {
return -1;
}
return sCollator.compare(o1.getShortcutInfo().getLabel().toString(),
o2.getShortcutInfo().getLabel().toString());
} }
}; };
} }

15
tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java
View File

@@ -31,7 +31,9 @@ import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.os.BatteryStats; import android.os.BatteryStats;
import android.os.BatteryUsageStats;
import android.os.Bundle; import android.os.Bundle;
import android.os.UidBatteryConsumer;
import androidx.loader.app.LoaderManager; import androidx.loader.app.LoaderManager;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -67,6 +69,10 @@ public class AppBatteryPreferenceControllerTest {
@Mock @Mock
private BatteryUtils mBatteryUtils; private BatteryUtils mBatteryUtils;
@Mock @Mock
private BatteryUsageStats mBatteryUsageStats;
@Mock
private UidBatteryConsumer mUidBatteryConsumer;
@Mock
private BatterySipper mBatterySipper; private BatterySipper mBatterySipper;
@Mock @Mock
private BatterySipper mOtherBatterySipper; private BatterySipper mOtherBatterySipper;
@@ -143,6 +149,8 @@ public class AppBatteryPreferenceControllerTest {
public void updateBattery_hasBatteryStats_summaryPercent() { public void updateBattery_hasBatteryStats_summaryPercent() {
mController.mBatteryHelper = mBatteryStatsHelper; mController.mBatteryHelper = mBatteryStatsHelper;
mController.mSipper = mBatterySipper; mController.mSipper = mBatterySipper;
mController.mBatteryUsageStats = mBatteryUsageStats;
mController.mUidBatteryConsumer = mUidBatteryConsumer;
doReturn(BATTERY_LEVEL).when(mBatteryUtils).calculateBatteryPercent(anyDouble(), doReturn(BATTERY_LEVEL).when(mBatteryUtils).calculateBatteryPercent(anyDouble(),
anyDouble(), anyDouble(), anyInt()); anyDouble(), anyDouble(), anyInt());
doReturn(new ArrayList<>()).when(mBatteryStatsHelper).getUsageList(); doReturn(new ArrayList<>()).when(mBatteryStatsHelper).getUsageList();
@@ -157,6 +165,8 @@ public class AppBatteryPreferenceControllerTest {
public void isBatteryStatsAvailable_hasBatteryStatsHelperAndSipper_returnTrue() { public void isBatteryStatsAvailable_hasBatteryStatsHelperAndSipper_returnTrue() {
mController.mBatteryHelper = mBatteryStatsHelper; mController.mBatteryHelper = mBatteryStatsHelper;
mController.mSipper = mBatterySipper; mController.mSipper = mBatterySipper;
mController.mBatteryUsageStats = mBatteryUsageStats;
mController.mUidBatteryConsumer = mUidBatteryConsumer;
assertThat(mController.isBatteryStatsAvailable()).isTrue(); assertThat(mController.isBatteryStatsAvailable()).isTrue();
} }
@@ -175,6 +185,8 @@ public class AppBatteryPreferenceControllerTest {
when(mBatteryPreference.getKey()).thenReturn(key); when(mBatteryPreference.getKey()).thenReturn(key);
mController.mSipper = mBatterySipper; mController.mSipper = mBatterySipper;
mController.mBatteryHelper = mBatteryStatsHelper; mController.mBatteryHelper = mBatteryStatsHelper;
mController.mBatteryUsageStats = mBatteryUsageStats;
mController.mUidBatteryConsumer = mUidBatteryConsumer;
// Should not crash // Should not crash
mController.handlePreferenceTreeClick(mBatteryPreference); mController.handlePreferenceTreeClick(mBatteryPreference);
@@ -187,7 +199,8 @@ public class AppBatteryPreferenceControllerTest {
mController.onResume(); mController.onResume();
verify(mLoaderManager) verify(mLoaderManager)
.restartLoader(AppInfoDashboardFragment.LOADER_BATTERY, Bundle.EMPTY, mController); .restartLoader(AppInfoDashboardFragment.LOADER_BATTERY, Bundle.EMPTY,
mController.mBatteryStatsHelperLoaderCallbacks);
} }
@Test @Test

21
tests/robotests/src/com/android/settings/emergency/EmergencyGesturePreferenceControllerTest.java
View File

@@ -18,24 +18,25 @@ package com.android.settings.emergency;
import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.android.settings.emergency.EmergencyGesturePreferenceController.OFF;
import static com.android.settings.emergency.EmergencyGesturePreferenceController.ON;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.content.ContentResolver; import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
@@ -43,16 +44,18 @@ import org.robolectric.annotation.Config;
@Config(shadows = SettingsShadowResources.class) @Config(shadows = SettingsShadowResources.class)
public class EmergencyGesturePreferenceControllerTest { public class EmergencyGesturePreferenceControllerTest {
@Mock
private EmergencyNumberUtils mEmergencyNumberUtils;
private Context mContext; private Context mContext;
private ContentResolver mContentResolver;
private EmergencyGesturePreferenceController mController; private EmergencyGesturePreferenceController mController;
private static final String PREF_KEY = "gesture_emergency_button"; private static final String PREF_KEY = "gesture_emergency_button";
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = ApplicationProvider.getApplicationContext(); mContext = ApplicationProvider.getApplicationContext();
mContentResolver = mContext.getContentResolver();
mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY); mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
mController.mEmergencyNumberUtils = mEmergencyNumberUtils;
} }
@After @After
@@ -81,8 +84,7 @@ public class EmergencyGesturePreferenceControllerTest {
@Test @Test
public void isChecked_configIsNotSet_shouldReturnTrue() { public void isChecked_configIsNotSet_shouldReturnTrue() {
// Set the setting to be enabled. // Set the setting to be enabled.
Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_ENABLED, ON); when(mEmergencyNumberUtils.getEmergencyGestureEnabled()).thenReturn(true);
mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
assertThat(mController.isChecked()).isTrue(); assertThat(mController.isChecked()).isTrue();
} }
@@ -90,8 +92,7 @@ public class EmergencyGesturePreferenceControllerTest {
@Test @Test
public void isChecked_configIsSet_shouldReturnFalse() { public void isChecked_configIsSet_shouldReturnFalse() {
// Set the setting to be disabled. // Set the setting to be disabled.
Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_ENABLED, OFF); when(mEmergencyNumberUtils.getEmergencyGestureEnabled()).thenReturn(false);
mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
assertThat(mController.isChecked()).isFalse(); assertThat(mController.isChecked()).isFalse();
} }

22
tests/robotests/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceControllerTest.java
View File

@@ -16,40 +16,42 @@
package com.android.settings.emergency; package com.android.settings.emergency;
import static com.android.settings.emergency.EmergencyGestureSoundPreferenceController.OFF;
import static com.android.settings.emergency.EmergencyGestureSoundPreferenceController.ON;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.content.ContentResolver; import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(shadows = SettingsShadowResources.class) @Config(shadows = SettingsShadowResources.class)
public class EmergencyGestureSoundPreferenceControllerTest { public class EmergencyGestureSoundPreferenceControllerTest {
@Mock
private EmergencyNumberUtils mEmergencyNumberUtils;
private Context mContext; private Context mContext;
private ContentResolver mContentResolver;
private EmergencyGestureSoundPreferenceController mController; private EmergencyGestureSoundPreferenceController mController;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = ApplicationProvider.getApplicationContext(); mContext = ApplicationProvider.getApplicationContext();
mContentResolver = mContext.getContentResolver();
mController = new EmergencyGestureSoundPreferenceController(mContext, "test_key"); mController = new EmergencyGestureSoundPreferenceController(mContext, "test_key");
mController.mEmergencyNumberUtils = mEmergencyNumberUtils;
} }
@After @After
@@ -78,8 +80,7 @@ public class EmergencyGestureSoundPreferenceControllerTest {
@Test @Test
public void isChecked_configIsSet_shouldReturnTrue() { public void isChecked_configIsSet_shouldReturnTrue() {
// Set the setting to be enabled. // Set the setting to be enabled.
Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED, when(mEmergencyNumberUtils.getEmergencyGestureSoundEnabled()).thenReturn(true);
ON);
assertThat(mController.isChecked()).isTrue(); assertThat(mController.isChecked()).isTrue();
} }
@@ -87,8 +88,7 @@ public class EmergencyGestureSoundPreferenceControllerTest {
@Test @Test
public void isChecked_configIsSetToFalse_shouldReturnFalse() { public void isChecked_configIsSetToFalse_shouldReturnFalse() {
// Set the setting to be disabled. // Set the setting to be disabled.
Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED, when(mEmergencyNumberUtils.getEmergencyGestureSoundEnabled()).thenReturn(false);
OFF);
assertThat(mController.isChecked()).isFalse(); assertThat(mController.isChecked()).isFalse();
} }

8
tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
View File

@@ -79,7 +79,8 @@ public class BatteryEntryTest {
} }
private BatteryEntry createBatteryEntryForApp() { private BatteryEntry createBatteryEntryForApp() {
return new BatteryEntry(mockContext, mockHandler, mockUserManager, createSipperForApp()); return new BatteryEntry(mockContext, mockHandler, mockUserManager, createSipperForApp(),
null);
} }
private BatterySipper createSipperForApp() { private BatterySipper createSipperForApp() {
@@ -90,7 +91,8 @@ public class BatteryEntryTest {
} }
private BatteryEntry createBatteryEntryForSystem() { private BatteryEntry createBatteryEntryForSystem() {
return new BatteryEntry(mockContext, mockHandler, mockUserManager, createSipperForSystem()); return new BatteryEntry(mockContext, mockHandler, mockUserManager, createSipperForSystem(),
null);
} }
private BatterySipper createSipperForSystem() { private BatterySipper createSipperForSystem() {
@@ -144,7 +146,7 @@ public class BatteryEntryTest {
final BatterySipper batterySipper = mock(BatterySipper.class); final BatterySipper batterySipper = mock(BatterySipper.class);
batterySipper.drainType = DrainType.AMBIENT_DISPLAY; batterySipper.drainType = DrainType.AMBIENT_DISPLAY;
final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler, final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler,
mockUserManager, batterySipper); mockUserManager, batterySipper, null);
assertThat(entry.iconId).isEqualTo(R.drawable.ic_settings_aod); assertThat(entry.iconId).isEqualTo(R.drawable.ic_settings_aod);
assertThat(entry.name).isEqualTo("Ambient display"); assertThat(entry.name).isEqualTo("Ambient display");

73
tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
View File

@@ -32,9 +32,10 @@ import static org.mockito.Mockito.when;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.icu.text.NumberFormat;
import android.os.BatteryManager; import android.os.BatteryManager;
import android.os.PowerManager; import android.os.PowerManager;
import android.widget.TextView; import android.text.TextUtils;
import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceFragmentCompat;
@@ -47,7 +48,7 @@ import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settings.widget.EntityHeaderController; import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.LayoutPreference; import com.android.settingslib.widget.UsageProgressBarPreference;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
@@ -57,9 +58,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowPowerManager;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowEntityHeaderController.class, ShadowUtils.class}) @Config(shadows = {ShadowEntityHeaderController.class, ShadowUtils.class})
@@ -67,6 +66,7 @@ public class BatteryHeaderPreferenceControllerTest {
private static final String PREF_KEY = "battery_header"; private static final String PREF_KEY = "battery_header";
private static final int BATTERY_LEVEL = 60; private static final int BATTERY_LEVEL = 60;
private static final int BATTERY_MAX_LEVEL = 100;
private static final String TIME_LEFT = "2h30min"; private static final String TIME_LEFT = "2h30min";
private static final String BATTERY_STATUS = "Charging"; private static final String BATTERY_STATUS = "Charging";
@@ -80,13 +80,11 @@ public class BatteryHeaderPreferenceControllerTest {
private BatteryInfo mBatteryInfo; private BatteryInfo mBatteryInfo;
@Mock @Mock
private EntityHeaderController mEntityHeaderController; private EntityHeaderController mEntityHeaderController;
@Mock
private UsageProgressBarPreference mBatteryUsageProgressBarPref;
private BatteryHeaderPreferenceController mController; private BatteryHeaderPreferenceController mController;
private Context mContext; private Context mContext;
private PowerManager mPowerManager; private PowerManager mPowerManager;
private BatteryMeterView mBatteryMeterView;
private TextView mBatteryPercentText;
private TextView mSummary;
private LayoutPreference mBatteryLayoutPref;
private Intent mBatteryIntent; private Intent mBatteryIntent;
private LifecycleOwner mLifecycleOwner; private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle; private Lifecycle mLifecycle;
@@ -98,9 +96,6 @@ public class BatteryHeaderPreferenceControllerTest {
mLifecycleOwner = () -> mLifecycle; mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner); mLifecycle = new Lifecycle(mLifecycleOwner);
mContext = spy(RuntimeEnvironment.application); mContext = spy(RuntimeEnvironment.application);
mBatteryMeterView = new BatteryMeterView(mContext);
mBatteryPercentText = new TextView(mContext);
mSummary = new TextView(mContext);
ShadowEntityHeaderController.setUseMock(mEntityHeaderController); ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
mBatteryIntent = new Intent(); mBatteryIntent = new Intent();
@@ -109,8 +104,7 @@ public class BatteryHeaderPreferenceControllerTest {
mBatteryIntent.putExtra(BatteryManager.EXTRA_PLUGGED, 1); mBatteryIntent.putExtra(BatteryManager.EXTRA_PLUGGED, 1);
doReturn(mBatteryIntent).when(mContext).registerReceiver(any(), any()); doReturn(mBatteryIntent).when(mContext).registerReceiver(any(), any());
mBatteryLayoutPref = new LayoutPreference(mContext, R.layout.battery_header); doReturn(mBatteryUsageProgressBarPref).when(mPreferenceScreen)
doReturn(mBatteryLayoutPref).when(mPreferenceScreen)
.findPreference(BatteryHeaderPreferenceController.KEY_BATTERY_HEADER); .findPreference(BatteryHeaderPreferenceController.KEY_BATTERY_HEADER);
mBatteryInfo.batteryLevel = BATTERY_LEVEL; mBatteryInfo.batteryLevel = BATTERY_LEVEL;
@@ -122,9 +116,7 @@ public class BatteryHeaderPreferenceControllerTest {
mController.setActivity(mActivity); mController.setActivity(mActivity);
mController.setFragment(mPreferenceFragment); mController.setFragment(mPreferenceFragment);
mController.setLifecycle(mLifecycle); mController.setLifecycle(mLifecycle);
mController.mBatteryMeterView = mBatteryMeterView; mController.mBatteryUsageProgressBarPref = mBatteryUsageProgressBarPref;
mController.mBatteryPercentText = mBatteryPercentText;
mController.mSummary1 = mSummary;
} }
@After @After
@@ -137,11 +129,8 @@ public class BatteryHeaderPreferenceControllerTest {
public void displayPreference_displayBatteryLevel() { public void displayPreference_displayBatteryLevel() {
mController.displayPreference(mPreferenceScreen); mController.displayPreference(mPreferenceScreen);
assertThat(((BatteryMeterView) mBatteryLayoutPref.findViewById( verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
R.id.battery_header_icon)).getBatteryLevel()).isEqualTo(BATTERY_LEVEL); verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
assertThat(((TextView) mBatteryLayoutPref.findViewById(R.id.battery_percent))
.getText().toString())
.isEqualTo("60 %");
} }
@Test @Test
@@ -150,7 +139,7 @@ public class BatteryHeaderPreferenceControllerTest {
mController.updateHeaderPreference(mBatteryInfo); mController.updateHeaderPreference(mBatteryInfo);
assertThat(mSummary.getText()).isEqualTo(mBatteryInfo.remainingLabel); verify(mBatteryUsageProgressBarPref).setTotalSummary(mBatteryInfo.remainingLabel);
} }
@Test @Test
@@ -161,8 +150,9 @@ public class BatteryHeaderPreferenceControllerTest {
mController.updateHeaderPreference(mBatteryInfo); mController.updateHeaderPreference(mBatteryInfo);
assertThat(mBatteryMeterView.mDrawable.getBatteryLevel()).isEqualTo(BATTERY_LEVEL); verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
assertThat(mBatteryMeterView.mDrawable.getCharging()).isEqualTo(false); verify(mBatteryUsageProgressBarPref).setTotalSummary(mBatteryInfo.remainingLabel);
verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
} }
@Test @Test
@@ -172,7 +162,7 @@ public class BatteryHeaderPreferenceControllerTest {
mController.updateHeaderPreference(mBatteryInfo); mController.updateHeaderPreference(mBatteryInfo);
assertThat(mSummary.getText()).isEqualTo(BATTERY_STATUS); verify(mBatteryUsageProgressBarPref).setTotalSummary(BATTERY_STATUS);
} }
@Test @Test
@@ -181,7 +171,7 @@ public class BatteryHeaderPreferenceControllerTest {
mController.updateHeaderPreference(mBatteryInfo); mController.updateHeaderPreference(mBatteryInfo);
assertThat(mSummary.getText().toString().isEmpty()).isTrue(); verify(mBatteryUsageProgressBarPref).setTotalSummary(null);
} }
@Test @Test
@@ -197,27 +187,10 @@ public class BatteryHeaderPreferenceControllerTest {
@Test @Test
public void quickUpdateHeaderPreference_onlyUpdateBatteryLevelAndChargingState() { public void quickUpdateHeaderPreference_onlyUpdateBatteryLevelAndChargingState() {
mSummary.setText(BATTERY_STATUS);
mController.quickUpdateHeaderPreference(); mController.quickUpdateHeaderPreference();
assertThat(mBatteryMeterView.getBatteryLevel()).isEqualTo(BATTERY_LEVEL); verify(mBatteryUsageProgressBarPref).setUsageSummary(formatBatteryPercentageText());
assertThat(mBatteryMeterView.getCharging()).isTrue(); verify(mBatteryUsageProgressBarPref).setPercent(BATTERY_LEVEL, BATTERY_MAX_LEVEL);
assertThat(mBatteryPercentText.getText().toString()).isEqualTo("60 %");
assertThat(mSummary.getText()).isEqualTo(BATTERY_STATUS);
}
@Test
public void quickUpdateHeaderPreference_showPowerSave() {
boolean testValues[] = {false, true};
ShadowPowerManager shadowPowerManager = Shadows.shadowOf(mPowerManager);
for (boolean value : testValues) {
shadowPowerManager.setIsPowerSaveMode(value);
mController.quickUpdateHeaderPreference();
assertThat(mBatteryMeterView.getPowerSave()).isEqualTo(value);
}
} }
@Test @Test
@@ -226,12 +199,8 @@ public class BatteryHeaderPreferenceControllerTest {
BasePreferenceController.AVAILABLE_UNSEARCHABLE); BasePreferenceController.AVAILABLE_UNSEARCHABLE);
} }
@Test private CharSequence formatBatteryPercentageText() {
public void displayPreference_batteryNotPresent_shouldShowHelpMessage() { return TextUtils.expandTemplate(mContext.getText(R.string.battery_header_title_alternate),
ShadowUtils.setIsBatteryPresent(false); NumberFormat.getIntegerInstance().format(BATTERY_LEVEL));
mController.displayPreference(mPreferenceScreen);
verify(mController).showHelpMessage();
} }
} }

93
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
View File

@@ -23,13 +23,11 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -38,8 +36,6 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import android.view.View;
import android.widget.TextView;
import androidx.loader.app.LoaderManager; import androidx.loader.app.LoaderManager;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -53,19 +49,14 @@ import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.widget.LayoutPreference;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Answers; import org.mockito.Answers;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
@@ -79,15 +70,12 @@ import java.util.List;
public class PowerUsageSummaryTest { public class PowerUsageSummaryTest {
private static final int UID = 123; private static final int UID = 123;
private static final int UID_2 = 234;
private static final int POWER_MAH = 100; private static final int POWER_MAH = 100;
private static final long TIME_SINCE_LAST_FULL_CHARGE_MS = 120 * 60 * 1000; private static final long TIME_SINCE_LAST_FULL_CHARGE_MS = 120 * 60 * 1000;
private static final long TIME_SINCE_LAST_FULL_CHARGE_US = private static final long TIME_SINCE_LAST_FULL_CHARGE_US =
TIME_SINCE_LAST_FULL_CHARGE_MS * 1000; TIME_SINCE_LAST_FULL_CHARGE_MS * 1000;
private static final long USAGE_TIME_MS = 65 * 60 * 1000; private static final long USAGE_TIME_MS = 65 * 60 * 1000;
private static final double TOTAL_POWER = 200; private static final double TOTAL_POWER = 200;
private static final String NEW_ML_EST_SUFFIX = "(New ML est)";
private static final String OLD_EST_SUFFIX = "(Old est)";
private static Intent sAdditionalBatteryInfoIntent; private static Intent sAdditionalBatteryInfoIntent;
@BeforeClass @BeforeClass
@@ -101,12 +89,6 @@ public class PowerUsageSummaryTest {
private BatterySipper mScreenBatterySipper; private BatterySipper mScreenBatterySipper;
@Mock @Mock
private BatterySipper mCellBatterySipper; private BatterySipper mCellBatterySipper;
@Mock
private LayoutPreference mBatteryLayoutPref;
@Mock
private TextView mBatteryPercentText;
@Mock
private TextView mSummary1;
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private BatteryStatsHelper mBatteryHelper; private BatteryStatsHelper mBatteryHelper;
@Mock @Mock
@@ -114,8 +96,6 @@ public class PowerUsageSummaryTest {
@Mock @Mock
private LoaderManager mLoaderManager; private LoaderManager mLoaderManager;
@Mock @Mock
private BatteryInfo mBatteryInfo;
@Mock
private ContentResolver mContentResolver; private ContentResolver mContentResolver;
@Mock @Mock
private BatteryBroadcastReceiver mBatteryBroadcastReceiver; private BatteryBroadcastReceiver mBatteryBroadcastReceiver;
@@ -128,8 +108,6 @@ public class PowerUsageSummaryTest {
private Context mRealContext; private Context mRealContext;
private TestFragment mFragment; private TestFragment mFragment;
private FakeFeatureFactory mFeatureFactory; private FakeFeatureFactory mFeatureFactory;
private BatteryMeterView mBatteryMeterView;
private Intent mIntent;
@Before @Before
public void setUp() { public void setUp() {
@@ -139,8 +117,6 @@ public class PowerUsageSummaryTest {
mFeatureFactory = FakeFeatureFactory.setupForTest(); mFeatureFactory = FakeFeatureFactory.setupForTest();
mFragment = spy(new TestFragment(mRealContext)); mFragment = spy(new TestFragment(mRealContext));
mFragment.initFeatureProvider(); mFragment.initFeatureProvider();
mBatteryMeterView = new BatteryMeterView(mRealContext);
mBatteryMeterView.mDrawable = new BatteryMeterView.BatteryMeterDrawable(mRealContext, 0);
doNothing().when(mFragment).restartBatteryStatsLoader(anyInt()); doNothing().when(mFragment).restartBatteryStatsLoader(anyInt());
doReturn(mock(LoaderManager.class)).when(mFragment).getLoaderManager(); doReturn(mock(LoaderManager.class)).when(mFragment).getLoaderManager();
@@ -158,12 +134,6 @@ public class PowerUsageSummaryTest {
mCellBatterySipper.drainType = BatterySipper.DrainType.CELL; mCellBatterySipper.drainType = BatterySipper.DrainType.CELL;
mCellBatterySipper.totalPowerMah = POWER_MAH; mCellBatterySipper.totalPowerMah = POWER_MAH;
when(mBatteryLayoutPref.findViewById(R.id.summary1)).thenReturn(mSummary1);
when(mBatteryLayoutPref.findViewById(R.id.battery_percent)).thenReturn(mBatteryPercentText);
when(mBatteryLayoutPref.findViewById(R.id.battery_header_icon))
.thenReturn(mBatteryMeterView);
mFragment.setBatteryLayoutPreference(mBatteryLayoutPref);
mScreenBatterySipper.drainType = BatterySipper.DrainType.SCREEN; mScreenBatterySipper.drainType = BatterySipper.DrainType.SCREEN;
mScreenBatterySipper.usageTimeMs = USAGE_TIME_MS; mScreenBatterySipper.usageTimeMs = USAGE_TIME_MS;
@@ -206,51 +176,6 @@ public class PowerUsageSummaryTest {
.restartLoader(eq(PowerUsageSummary.BATTERY_TIP_LOADER), eq(Bundle.EMPTY), any()); .restartLoader(eq(PowerUsageSummary.BATTERY_TIP_LOADER), eq(Bundle.EMPTY), any());
} }
@Test
public void showBothEstimates_summariesAreBothModified() {
when(mFeatureFactory.powerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(any()))
.thenReturn(true);
doAnswer(new Answer() {
@Override
public Object answer(InvocationOnMock invocation) {
return mRealContext.getString(
R.string.power_usage_old_debug, invocation.getArguments()[0]);
}
}).when(mFeatureFactory.powerUsageFeatureProvider).getOldEstimateDebugString(any());
doAnswer(new Answer() {
@Override
public Object answer(InvocationOnMock invocation) {
return mRealContext.getString(
R.string.power_usage_enhanced_debug, invocation.getArguments()[0]);
}
}).when(mFeatureFactory.powerUsageFeatureProvider).getEnhancedEstimateDebugString(any());
doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary1);
mFragment.onLongClick(new View(mRealContext));
TextView summary1 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary1);
Robolectric.flushBackgroundThreadScheduler();
assertThat(summary1.getText().toString()).contains(NEW_ML_EST_SUFFIX);
assertThat(summary1.getText().toString()).contains(OLD_EST_SUFFIX);
}
@Test
public void debugMode() {
doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isEstimateDebugEnabled();
mFragment.restartBatteryInfoLoader();
ArgumentCaptor<View.OnLongClickListener> listener = ArgumentCaptor.forClass(
View.OnLongClickListener.class);
verify(mSummary1).setOnLongClickListener(listener.capture());
// Calling the listener should disable it.
listener.getValue().onLongClick(mSummary1);
verify(mSummary1).setOnLongClickListener(null);
// Restarting the loader should reset the listener.
mFragment.restartBatteryInfoLoader();
verify(mSummary1, times(2)).setOnLongClickListener(any(View.OnLongClickListener.class));
}
@Test @Test
public void refreshUi_deviceRotate_doNotUpdateBatteryTip() { public void refreshUi_deviceRotate_doNotUpdateBatteryTip() {
mFragment.mBatteryTipPreferenceController = mock(BatteryTipPreferenceController.class); mFragment.mBatteryTipPreferenceController = mock(BatteryTipPreferenceController.class);
@@ -330,23 +255,5 @@ public class PowerUsageSummaryTest {
// Override it so we can access this method in test // Override it so we can access this method in test
return super.getContentResolver(); return super.getContentResolver();
} }
@Override
void showBothEstimates() {
List<BatteryInfo> fakeBatteryInfo = new ArrayList<>(2);
BatteryInfo info1 = new BatteryInfo();
info1.batteryLevel = 10;
info1.remainingTimeUs = 10000;
info1.discharging = true;
BatteryInfo info2 = new BatteryInfo();
info2.batteryLevel = 10;
info2.remainingTimeUs = 10000;
info2.discharging = true;
fakeBatteryInfo.add(info1);
fakeBatteryInfo.add(info2);
updateViews(fakeBatteryInfo);
}
} }
} }

29
tests/robotests/src/com/android/settings/notification/app/ConversationListPreferenceControllerTest.java
View File

@@ -33,6 +33,12 @@ import android.content.pm.ShortcutInfo;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import android.service.notification.ConversationChannelWrapper; import android.service.notification.ConversationChannelWrapper;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.style.BulletSpan;
import android.text.style.QuoteSpan;
import android.text.style.SubscriptSpan;
import android.text.style.UnderlineSpan;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceCategory;
@@ -211,6 +217,29 @@ public class ConversationListPreferenceControllerTest {
ccw.getNotificationChannel().getConversationId()); ccw.getNotificationChannel().getConversationId());
} }
@Test
public void testCompareSpans() {
ConversationChannelWrapper one = new ConversationChannelWrapper();
String text1 = "one one";
SpannableStringBuilder builder1 = new SpannableStringBuilder(text1);
Object first1 = new SubscriptSpan();
builder1.setSpan(first1, 2, 4, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
ShortcutInfo s1 = new ShortcutInfo.Builder(mContext, "one").setShortLabel(
builder1).build();
one.setShortcutInfo(s1);
ConversationChannelWrapper two = new ConversationChannelWrapper();
String text2 = "two two";
SpannableStringBuilder builder2 = new SpannableStringBuilder(text2);
Object first2 = new SubscriptSpan();
builder2.setSpan(first2, 2, 4, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
ShortcutInfo s2 = new ShortcutInfo.Builder(mContext, "two").setShortLabel(
builder2).build();
two.setShortcutInfo(s2);
assertThat(mController.mConversationComparator.compare(one, two)).isLessThan(0);
}
private final class TestPreferenceController extends ConversationListPreferenceController { private final class TestPreferenceController extends ConversationListPreferenceController {
private TestPreferenceController(Context context, NotificationBackend backend) { private TestPreferenceController(Context context, NotificationBackend backend) {

8
tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
View File

@@ -40,6 +40,7 @@ import android.telephony.ServiceState;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.Html;
import androidx.slice.Slice; import androidx.slice.Slice;
import androidx.slice.builders.GridRowBuilder; import androidx.slice.builders.GridRowBuilder;
@@ -169,7 +170,7 @@ public class ProviderModelSliceHelperTest {
@Test @Test
public void createCarrierRow_hasDdsAndActiveNetworkIsNotCellular_verifyTitleAndSummary() { public void createCarrierRow_hasDdsAndActiveNetworkIsNotCellular_verifyTitleAndSummary() {
String expectDisplayName = "Name1"; String expectDisplayName = "Name1";
String expectedSubtitle = "5G"; CharSequence expectedSubtitle = Html.fromHtml("5G", Html.FROM_HTML_MODE_LEGACY);
String networkType = "5G"; String networkType = "5G";
final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId(); final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
@@ -199,8 +200,9 @@ public class ProviderModelSliceHelperTest {
String networkType = "5G"; String networkType = "5G";
String connectedText = ResourcesUtils.getResourcesString(mContext, String connectedText = ResourcesUtils.getResourcesString(mContext,
"mobile_data_connection_active"); "mobile_data_connection_active");
String expectedSubtitle = ResourcesUtils.getResourcesString(mContext, CharSequence expectedSubtitle = Html.fromHtml(ResourcesUtils.getResourcesString(mContext,
"preference_summary_default_combination", connectedText, networkType); "preference_summary_default_combination", connectedText, networkType),
Html.FROM_HTML_MODE_LEGACY);
final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId(); final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
when(mDefaultDataSubscriptionInfo.getSubscriptionId()).thenReturn(defaultDataSubId); when(mDefaultDataSubscriptionInfo.getSubscriptionId()).thenReturn(defaultDataSubId);