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

Merge "Update string reference" into sc-dev am: df0a84f08a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831291

Change-Id: Iccd7cd779ee68d6c208f4e1057cd1baec672d179
This commit is contained in:
TreeHugger Robot
2021-06-08 03:03:27 +00:00
committed by Automerger Merge Worker
parent c66236d2a1 df0a84f08a
commit c2fe36b100
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -5984,6 +5984,8 @@
<string name="manager_battery_usage_unrestricted_title">Unrestricted</string> <string name="manager_battery_usage_unrestricted_title">Unrestricted</string>
<!-- Title for the battery optimized settings [CHAR_LIMIT=40] --> <!-- Title for the battery optimized settings [CHAR_LIMIT=40] -->
<string name="manager_battery_usage_optimized_title">Optimized</string> <string name="manager_battery_usage_optimized_title">Optimized</string>
<!-- Title for the battery restricted settings [CHAR_LIMIT=40] -->
<string name="manager_battery_usage_restricted_title">Restricted</string>
<!-- Summary for the battery unrestricted settings [CHAR_LIMIT=NONE] --> <!-- Summary for the battery unrestricted settings [CHAR_LIMIT=NONE] -->
<string name="manager_battery_usage_unrestricted_summary">Allow battery usage in background without restrictions. May use more battery.</string> <string name="manager_battery_usage_unrestricted_summary">Allow battery usage in background without restrictions. May use more battery.</string>
<!-- Summary for the battery optimized settings [CHAR_LIMIT=NONE] --> <!-- Summary for the battery optimized settings [CHAR_LIMIT=NONE] -->

2
res/xml/power_usage_detail.xml
View File

@@ -45,7 +45,7 @@
<com.android.settingslib.widget.RadioButtonPreference <com.android.settingslib.widget.RadioButtonPreference
android:key="restricted_pref" android:key="restricted_pref"
android:summary="@string/manager_battery_usage_restricted_summary" android:summary="@string/manager_battery_usage_restricted_summary"
android:title="@string/restricted_true_label" android:title="@string/manager_battery_usage_restricted_title"
settings:controller="com.android.settings.fuelgauge.RestrictedPreferenceController"/> settings:controller="com.android.settings.fuelgauge.RestrictedPreferenceController"/>
</PreferenceCategory> </PreferenceCategory>

5
src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.fuelgauge.batterysaver; package com.android.settings.fuelgauge.batterysaver;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.text.SpannableStringBuilder;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -36,7 +35,6 @@ import com.android.settingslib.widget.FooterPreference;
public class BatterySaverSettings extends DashboardFragment { public class BatterySaverSettings extends DashboardFragment {
private static final String TAG = "BatterySaverSettings"; private static final String TAG = "BatterySaverSettings";
private static final String KEY_FOOTER_PREFERENCE = "battery_saver_footer_preference"; private static final String KEY_FOOTER_PREFERENCE = "battery_saver_footer_preference";
private SpannableStringBuilder mFooterText;
private String mHelpUri; private String mHelpUri;
@Override @Override
@@ -76,8 +74,6 @@ public class BatterySaverSettings extends DashboardFragment {
void setupFooter() { void setupFooter() {
mHelpUri = getString(R.string.help_url_battery_saver_settings); mHelpUri = getString(R.string.help_url_battery_saver_settings);
if (!TextUtils.isEmpty(mHelpUri)) { if (!TextUtils.isEmpty(mHelpUri)) {
mFooterText = new SpannableStringBuilder(getText(
com.android.internal.R.string.battery_saver_description_with_learn_more));
addHelpLink(); addHelpLink();
} }
} }
@@ -87,7 +83,6 @@ public class BatterySaverSettings extends DashboardFragment {
void addHelpLink() { void addHelpLink() {
FooterPreference pref = getPreferenceScreen().findPreference(KEY_FOOTER_PREFERENCE); FooterPreference pref = getPreferenceScreen().findPreference(KEY_FOOTER_PREFERENCE);
if (pref != null) { if (pref != null) {
pref.setTitle(mFooterText);
pref.setSelectable(false); pref.setSelectable(false);
pref.setLearnMoreAction(v -> { pref.setLearnMoreAction(v -> {
mMetricsFeatureProvider.action(getContext(), mMetricsFeatureProvider.action(getContext(),