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

Merge "Improve the UI of Press & hold power button settings" into tm-qpr-dev

Browse Source
This commit is contained in:
Peter Zhang
2022-07-25 17:18:25 +00:00
committed by Android (Google) Code Review
parent aea8f1aeb2 f0013da134
commit 1cc741a745
20 changed files with 1213 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
res/raw/lottie_power_menu.json → res/raw/lottie_long_press_power_for_assistant.json
View File

1
res/raw/lottie_long_press_power_for_power_menu.json Normal file
View File

File diff suppressed because one or more lines are too long

35
res/values/strings.xml
View File

@@ -12743,7 +12743,7 @@
<!-- Summary for prevent ringing setting -->
<string name="prevent_ringing_option_mute_summary">Mute</string>
<!-- Summary for prevent ringing setting when the option itself is unavailable. [CHAR LIMIT=NONE] -->
<string name="prevent_ringing_option_unavailable_lpp_summary">To enable, first change \"Press and hold power button\" to the power menu.</string>
<string name="prevent_ringing_option_unavailable_lpp_summary">To enable, first change \"Press &amp; hold power button\" to the power menu.</string>
<!-- Title for detail page of wifi network [CHAR LIMIT=30] -->
<string name="pref_title_network_details">Network details</string>
@@ -13502,29 +13502,28 @@
<!-- Cards and passes name lower case [CHAR LIMIT=40] -->
<string name="cards_passes_lower">cards &amp; passes</string>
<!-- Power menu setting name [CHAR LIMIT=NONE] -->
<string name="power_menu_setting_name">Press and hold power button</string>
<!-- Power menu setting name [CHAR LIMIT=60] -->
<string name="power_menu_setting_name">Press &amp; hold power button</string>
<!-- Power menu setting summary to describe press and hold power button for Assistant is enabled. [CHAR LIMIT=NONE] -->
<string name="power_menu_summary_long_press_for_assist_enabled">Press and hold for the Assistant</string>
<!-- Power menu setting summary to describe press and hold power button for Assistant is disabled and power menu will appear. [CHAR LIMIT=NONE] -->
<string name="power_menu_summary_long_press_for_assist_disabled_with_power_menu">Press and hold for the power menu</string>
<!-- Power menu setting summary to describe press and hold power button for Assistant is disabled and nothing will happen. [CHAR LIMIT=NONE] -->
<string name="power_menu_summary_long_press_for_assist_disabled_no_action">Press and hold disabled</string>
<!-- Power menu setting section title for selecting the press and hold power button behavior. [CHAR LIMIT=60] -->
<string name="power_menu_long_press_category_title">Press &amp; hold power button to access</string>
<!-- Power menu setting option to make press and hold power button to open Power Menu. [CHAR LIMIT=60] -->
<string name="power_menu_long_press_for_power_menu_title">Power menu</string>
<!-- Power menu setting option to make press and hold power button to open Assistant. [CHAR LIMIT=60] -->
<string name="power_menu_long_press_for_assistant_title">Digital assistant</string>
<!-- Power menu setting summary to describe press and hold power button will open Assistant. [CHAR LIMIT=NONE] -->
<string name="power_menu_summary_long_press_for_assistant">Access digital assistant</string>
<!-- Power menu setting summary to describe press and hold power button will open Power Menu. [CHAR LIMIT=NONE] -->
<string name="power_menu_summary_long_press_for_power_menu">Access power menu</string>
<!-- Power menu setting privacy no secure screen lock set [CHAR_LIMIT=NONE] -->
<string name="lockscreen_privacy_not_secure">To use, first set a screen lock</string>
<!-- Power menu setting use long press power to invoke assistant. [CHAR LIMIT=NONE] -->
<string name="power_menu_long_press_for_assist">Hold for Assistant</string>
<!-- Power menu setting use log press power to invoke assistant summary. [CHAR LIMIT=NONE] -->
<string name="power_menu_long_press_for_assist_summary">Trigger the Assistant by holding the power button</string>
<!-- Power menu explanation to press power and volume up to show power and emergency menu. [CHAR LIMIT=NONE] -->
<string name="power_menu_power_volume_up_hint">Power &amp; Emergency Menu:\nPress Power and Volume up at the same time.</string>
<!-- Power menu explanation to press power and volume up to show power menu. [CHAR LIMIT=NONE] -->
<string name="power_menu_power_volume_up_hint">Power menu:\nPress the power button and the volume up button at the same time</string>
<!-- Power menu explanation where to find prevent ringing option. [CHAR LIMIT=NONE] -->
<string name="power_menu_power_prevent_ringing_hint">Prevent ringing:\nShortcut available in the volume menu.</string>
<string name="power_menu_power_prevent_ringing_hint">Prevent ringing:\nPress a volume button for the shortcut</string>
<!-- Power menu title of the seekbar setting controlling duration of how long the power button must be held to invoke assistant. [CHAR LIMIT=NONE]-->
<string name="power_menu_long_press_for_assist_sensitivity_title">Press &amp; hold duration</string>

26
res/xml/power_menu_settings.xml
View File

@@ -23,19 +23,28 @@
android:key="gesture_power_menu_video"
settings:searchable="false"
settings:lottie_imageAssetsFolder="power_menu"
settings:lottie_rawRes="@raw/lottie_power_menu"/>
settings:lottie_rawRes="@raw/lottie_long_press_power_for_power_menu"
settings:controller="com.android.settings.gestures.LongPressPowerIllustrationPreferenceController"/>
<SwitchPreference
android:key="gesture_power_menu_long_press_for_assist"
android:title="@string/power_menu_long_press_for_assist"
android:summary="@string/power_menu_long_press_for_assist_summary"
settings:controller="com.android.settings.gestures.LongPressPowerButtonPreferenceController"
/>
<PreferenceCategory
android:key="gesture_power_menu_long_press_category"
android:title="@string/power_menu_long_press_category_title">
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="gesture_power_menu_long_press_for_power_menu"
android:title="@string/power_menu_long_press_for_power_menu_title"
settings:controller="com.android.settings.gestures.LongPressPowerForPowerMenuPreferenceController"/>
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="gesture_power_menu_long_press_for_assistant"
android:title="@string/power_menu_long_press_for_assistant_title"
settings:controller="com.android.settings.gestures.LongPressPowerForAssistantPreferenceController"/>
</PreferenceCategory>
<com.android.settings.widget.LabeledSeekBarPreference
android:key="gesture_power_menu_long_press_for_assist_sensitivity"
android:title="@string/power_menu_long_press_for_assist_sensitivity_title"
android:summary="@string/power_menu_long_press_for_assist_sensitivity_summary"
settings:allowDividerAbove="true"
settings:textStart="@string/power_menu_long_press_for_assist_sensitivity_low_label"
settings:textEnd="@string/power_menu_long_press_for_assist_sensitivity_high_label"
settings:controller="com.android.settings.gestures.LongPressPowerSensitivityPreferenceController"
@@ -45,5 +54,6 @@
android:key="power_menu_power_volume_up_hint"
android:title="@string/power_menu_power_volume_up_hint"
android:selectable="false"
settings:searchable="false"/>
settings:searchable="false"
settings:controller="com.android.settings.gestures.LongPressPowerFooterPreferenceController"/>
</PreferenceScreen>