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

Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev am: ea4e5a33bf

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

Change-Id: I9d2819fd3a9a043302295e8f1c6ba9d0e67c86cf
This commit is contained in:
TreeHugger Robot
2021-08-20 11:11:08 +00:00
committed by Automerger Merge Worker
parent 8818495cfb ea4e5a33bf
commit ef2c734413
12 changed files with 61 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/layout/preference_labeled_slider.xml
View File

@@ -37,18 +37,9 @@
android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textAlignment="viewStart"
android:textColor="?android:attr/textColorSecondary" />
<SeekBar
android:id="@*android:id/seekbar"
android:layout_below="@android:id/summary"
android:layout_below="@android:id/title"
android:layout_gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="48dp"

9
res/values/strings.xml
View File

@@ -13225,15 +13225,6 @@
<!-- 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>
<!-- 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>
<!-- Power menu summary 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_summary">Adjust sensitivity by choosing how long to press &amp; hold the power button</string>
<!-- Label at the lowest end of duration slider for long press power invocation of assistant. [CHAR LIMIT=30] -->
<string name="power_menu_long_press_for_assist_sensitivity_low_label">Short</string>
<!-- Label at the highest end of duration slider for long press power invocation of assistant. [CHAR LIMIT=30] -->
<string name="power_menu_long_press_for_assist_sensitivity_high_label">Long</string>
<!-- Wallet (formerly Cards and passes) toggle name [CHAR LIMIT=60] -->
<string name="lockscreen_privacy_wallet_setting_toggle">Show wallet</string>
<!-- Wallet (formerly Cards and passes) summary [CHAR LIMIT=NONE] -->

14
res/xml/power_menu_settings.xml
View File

@@ -22,21 +22,11 @@
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"
/>
<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"
android:selectable="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"
/>
/>
<com.android.settingslib.widget.FooterPreference
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" />
</PreferenceScreen>