Merge "Fix refresh in Gestures, not reflecting the changes after toggling on/off one-handed mode" into sc-dev am: aafe9ac0a0

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

Change-Id: I0c2c63ff60ccb4652801cbfd14ac4e17a579f701
This commit is contained in:
Jason Chang
2021-03-24 15:20:16 +00:00
committed by Automerger Merge Worker
12 changed files with 85 additions and 84 deletions

View File

@@ -21,7 +21,7 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerCrop"
android:scaleType="centerInside"
android:cropToPadding="true"
android:src="@drawable/one_handed_guideline"
android:contentDescription="@null" />

View File

@@ -11286,8 +11286,8 @@
<!-- Title text for swiping downwards on the bottom of the screen for notifications [CHAR LIMIT=60]-->
<string name="swipe_bottom_to_notifications_title">Swipe for notifications</string>
<!-- Summary text for swiping downwards on the bottom of the screen for notifications [CHAR LIMIT=80]-->
<string name="swipe_bottom_to_notifications_summary">Swipe down on the bottom edge of the screen to show your notifications</string>
<!-- Summary text for swiping downwards on the bottom of the screen for notifications [CHAR LIMIT=NONE]-->
<string name="swipe_bottom_to_notifications_summary">Swipe down on the bottom edge of the screen to show your notifications.\nYou can\'t use one-handed mode when this feature is turned on.</string>
<!-- Preference and settings suggestion title text for one handed [CHAR LIMIT=60] -->
<string name="one_handed_title">One-Handed mode</string>

View File

@@ -20,11 +20,13 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/swipe_bottom_to_notifications_title">
<com.android.settings.widget.VideoPreference
android:title="@string/swipe_bottom_to_notifications_title"
settings:animation="@raw/gesture_fingerprint_swipe"
settings:preview="@drawable/gesture_fingerprint_swipe"
settings:controller="com.android.settings.widget.VideoPreferenceController"/>
<com.android.settingslib.widget.LayoutPreference
android:key="one_handed_header"
android:layout="@layout/one_handed_header"
android:persistent="false"
android:selectable="false"
settings:allowDividerBelow="false"
settings:searchable="false"/>
<SwitchPreference
android:key="gesture_swipe_bottom_to_notification"