Skip to content

Commit

Permalink
Adjust AOD helper string on Samsung to indicate user may not be able …
Browse files Browse the repository at this point in the history
…to change AOD settings while it's enabled
  • Loading branch information
Chainfire committed Feb 22, 2021
1 parent 17202f4 commit 2f5b1aa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ private PreferenceScreen createPreferenceHierarchy() {

if (Manufacturer.isSamsung()) {
prefAODHelperControl = check(catAODHelper, R.string.settings_aod_helper_control_title, 0, Settings.AOD_HELPER_CONTROL, Settings.AOD_HELPER_CONTROL_DEFAULT, true);
prefAODHelperControl.setSummary(Html.fromHtml(getString(Manufacturer.isSamsung() ? R.string.settings_aod_helper_control_description_samsung : Manufacturer.isGoogle() ? R.string.settings_aod_helper_control_description_google : R.string.manufacturer_detection_error)));
prefAODHelperControl.setSummary(Html.fromHtml(getString(Manufacturer.isSamsung() ? R.string.settings_aod_helper_control_description_samsung_2 : Manufacturer.isGoogle() ? R.string.settings_aod_helper_control_description_google : R.string.manufacturer_detection_error)));
}

if (Manufacturer.isGoogle()) {
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
<string name="settings_aod_helper_update_description_normal"><![CDATA[<b>AOD Helper</b> is installed but outdated. It needs to updated to be used again. Tap for instructions.]]></string>
<string name="settings_aod_helper_update_description_permissions"><![CDATA[<b>AOD Helper</b> is installed but does not have the required permissions. Tap for instructions.]]></string>
<string name="settings_aod_helper_control_title">Automatic AOD control</string>
<!-- Samsung --><string name="settings_aod_helper_control_description_samsung"><![CDATA[Enable and disable AOD automatically based on notification status. Reduces power usage when no notifications are active. <b>Not</b> compatible with AOD in <b>Tap to show</b> mode!]]></string>
<!-- obsolete --><string name="settings_aod_helper_control_description_samsung"><![CDATA[Enable and disable AOD automatically based on notification status. Reduces power usage when no notifications are active. <b>Not</b> compatible with AOD in <b>Tap to show</b> mode!]]></string>
<!-- Google --><string name="settings_aod_helper_control_description_google">Enabled and disable AOD automatically based on notification status. Reduces power usage when no notifications are active.</string>
<!-- Google --><string name="settings_aod_helper_increase_brightness_title_google">Maximize AOD brightness</string>
<!-- Google --><string name="settings_aod_helper_increase_brightness_description_google">While still limited to automatic brightness settings, this option usually does increase AOD brightness significantly.</string>
Expand All @@ -296,4 +296,5 @@
<!-- v0.71 RC3 -->

<string name="tune_thickness">Add thickness: %.2fdp</string>
<!-- Samsung --><string name="settings_aod_helper_control_description_samsung_2"><![CDATA[Enable and disable AOD automatically based on notification status. Reduces power usage when no notifications are active. <b>Not</b> compatible with AOD in <b>Tap to show</b> mode! AOD settings may be locked while enabled.]]></string>
</resources>

0 comments on commit 2f5b1aa

Please sign in to comment.