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

Snap for 11469542 from 3f52a6c47d to 24Q2-release

Browse Source 
Change-Id: Ifbfe3f0959e94c60eca4e003601a1ce4ad487c8b
This commit is contained in:
Android Build Coastguard Worker
2024-02-20 00:21:23 +00:00
parent 0710e476b3 3f52a6c47d
commit 39703fdd56
13 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/drawable/ic_battery_defender_tip_shield.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M20,5.64L12,2L4,5.64V11.09C4,16.14 7.41,20.85 12,22C16.59,20.85 20,16.14 20,11.09V5.64Z"
android:fillColor="?android:attr/colorAccent"/>
</vector>

4
res/values/strings.xml
View File

@@ -5679,8 +5679,8 @@
<string name="battery_tip_unrestrict_app_dialog_ok">Remove</string>
<!-- CANCEL button for dialog to remove restriction for app [CHAR LIMIT=NONE] -->
<string name="battery_tip_unrestrict_app_dialog_cancel">Cancel</string>
<!-- Charge to full button for battery defender tips [CHAR LIMIT=NONE] -->
<string name="battery_tip_charge_to_full_button">Charge to full</string>
<!-- Override button for Battery Defender Tip to start charging [CHAR LIMIT=NONE] -->
<string name="battery_tip_charge_to_full_button">Override</string>
<!-- Title of incompatible charging battery tip [CHAR LIMIT=NONE] -->
<string name="battery_tip_incompatible_charging_title">Check charging accessory</string>
<!-- Content description for the incompatible charging battery tip button [CHAR LIMIT=NONE] -->

12
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
View File

@@ -266,18 +266,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment
initHeader();
mOptimizationMode = mBatteryOptimizeUtils.getAppOptimizationMode();
initFooter();
mExecutor.execute(
() -> {
final String packageName =
BatteryUtils.getLoggingPackageName(
getContext(), mBatteryOptimizeUtils.getPackageName());
FeatureFactory.getFeatureFactory()
.getMetricsFeatureProvider()
.action(
getContext(),
SettingsEnums.OPEN_APP_BATTERY_USAGE,
packageName);
});
mLogStringBuilder = new StringBuilder("onResume mode = ").append(mOptimizationMode);
}

12
src/com/android/settings/fuelgauge/PowerBackgroundUsageDetail.java
View File

@@ -110,18 +110,6 @@ public class PowerBackgroundUsageDetail extends DashboardFragment
initHeader();
mOptimizationMode = mBatteryOptimizeUtils.getAppOptimizationMode();
initFooter();
mExecutor.execute(
() -> {
String packageName =
BatteryUtils.getLoggingPackageName(
getContext(), mBatteryOptimizeUtils.getPackageName());
FeatureFactory.getFeatureFactory()
.getMetricsFeatureProvider()
.action(
getContext(),
SettingsEnums.OPEN_POWER_USAGE_MANAGE_BACKGROUND,
packageName);
});
mLogStringBuilder = new StringBuilder("onResume mode = ").append(mOptimizationMode);
}

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

@@ -84,7 +84,7 @@ public class RestrictAppPreferenceController extends BasePreferenceController {
RestrictedAppDetails.startRestrictedAppDetails(mPreferenceFragment, mAppInfos);
FeatureFactory.getFeatureFactory()
.getMetricsFeatureProvider()
.action(mContext, SettingsEnums.OPEN_APP_RESTRICTED_LIST);
.action(mContext, SettingsEnums.ACTION_APP_RESTRICTED_LIST_MANAGED);
return true;
}

2
src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
View File

@@ -62,7 +62,7 @@ public class BatteryDefenderTip extends BatteryTip {
@Override
public int getIconId() {
return R.drawable.ic_battery_status_good_theme;
return R.drawable.ic_battery_defender_tip_shield;
}
@Override

1
src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTip.java
View File

@@ -81,6 +81,7 @@ public final class IncompatibleChargerTip extends BatteryTip {
}
cardPreference.setSelectable(false);
cardPreference.enableDismiss(false);
cardPreference.setIconResId(getIconId());
cardPreference.setPrimaryButtonText(context.getString(R.string.learn_more));
cardPreference.setPrimaryButtonAction(

2
src/com/android/settings/localepicker/TermsOfAddressFeminineController.java
View File

@@ -35,7 +35,7 @@ public class TermsOfAddressFeminineController extends TermsOfAddressBaseControll
@Override
protected int getMetricsActionKey() {
return 0;
return SettingsEnums.ACTION_TERMS_OF_ADDRESS_SPECIFIED;
}
@Override

2
src/com/android/settings/localepicker/TermsOfAddressMasculineController.java
View File

@@ -35,7 +35,7 @@ public class TermsOfAddressMasculineController extends TermsOfAddressBaseControl
@Override
protected int getMetricsActionKey() {
return 0;
return SettingsEnums.ACTION_TERMS_OF_ADDRESS_SPECIFIED;
}
@Override

2
src/com/android/settings/localepicker/TermsOfAddressNeutralController.java
View File

@@ -35,7 +35,7 @@ public class TermsOfAddressNeutralController extends TermsOfAddressBaseControlle
@Override
protected int getMetricsActionKey() {
return 0;
return SettingsEnums.ACTION_TERMS_OF_ADDRESS_SPECIFIED;
}
@Override

1
tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java
View File

@@ -97,6 +97,7 @@ public class TermsOfAddressFeminineControllerTest {
selectedPreference.performClick();
assertThat(selectedPreference.getKey()).isEqualTo(KEY_FEMININE);
assertThat(selectedPreference.isSelected()).isTrue();
assertThat(pref.isSelected()).isFalse();
}

1
tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java
View File

@@ -97,6 +97,7 @@ public class TermsOfAddressMasculineControllerTest {
selectedPreference.performClick();
assertThat(selectedPreference.getKey()).isEqualTo(KEY_MASCULINE);
assertThat(selectedPreference.isSelected()).isTrue();
assertThat(pref.isSelected()).isFalse();
}

1
tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java
View File

@@ -97,6 +97,7 @@ public class TermsOfAddressNeutralControllerTest {
selectedPreference.performClick();
assertThat(selectedPreference.getKey()).isEqualTo(KEY_NEUTRAL);
assertThat(selectedPreference.isSelected()).isTrue();
assertThat(pref.isSelected()).isFalse();
}