Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 150ed0b0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change One-handed mode controls states in the Settings pages for... 

Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev
parents a6a4fe47 d9a4197d

res/values/arrays.xml

+0 −8
Original line number Diff line number Diff line
@@ -1575,14 +1575,6 @@ 
        <item>@string/rtt_settings_always_visible</item>

    </string-array>



    <!-- Array of titles list for one-handed timeout options. [DO NOT TRANSLATE] -->

    <string-array name="one_handed_timeout_title" translatable="false">

        <item>@string/screensaver_settings_summary_never</item>

        <item>@string/one_handed_timeout_short</item>

        <item>@string/one_handed_timeout_medium</item>

        <item>@string/one_handed_timeout_long</item>

    </string-array>



    <!-- Values of list for one-handed timeout options. [DO NOT TRANSLATE] -->

    <string-array name="one_handed_timeout_values" translatable="false">

        <item>0</item>

res/values/strings.xml

+2 −15
Original line number Diff line number Diff line
@@ -11744,29 +11744,16 @@ 
    <!-- Preference and settings suggestion title text for ambient display double tap (device) [CHAR LIMIT=60]-->

    <string name="ambient_display_title" product="device">Double-tap to check device</string>













    <!-- 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=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>















    <!-- Preference Switch for enabling one handed [CHAR LIMIT=60] -->















    <string name="one_handed_mode_enabled">Use one-handed mode</string>













    <!-- Preference Switch for app taps to exit one handed [CHAR LIMIT=60] -->













    <string name="one_handed_app_taps_to_exit">Exit when switching apps</string>













    <!-- Timeout(Never) title for one handed [CHAR LIMIT=60] -->













    <string name="one_handed_timeout_title">Timeout</string>













    <!-- Timeout(Short) title for one handed [CHAR LIMIT=60] -->













    <string name="one_handed_timeout_short">4 seconds</string>













    <!-- Timeout(Medium) title for one handed [CHAR LIMIT=60] -->













    <string name="one_handed_timeout_medium">8 seconds</string>













    <!-- Timeout(Long) title for one handed [CHAR LIMIT=60] -->













    <string name="one_handed_timeout_long">12 seconds</string>















    <!-- Search keywords for "One-Handed" settings [CHAR_LIMIT=NONE] -->















    <string name="keywords_one_handed">reachability</string>















    <!-- Category title for one handed swipe down [CHAR_LIMIT=60] -->















    <string name="one_handed_mode_swipe_down_category">Swipe down to</string>













    <!-- Category title for one handed use the shortcut [CHAR_LIMIT=60] -->













    <string name="one_handed_mode_use_shortcut_category">Use the shortcut to</string>















    <!-- One-handed mode Intro Text [CHAR_LIMIT=NONE] -->















    <string name="one_handed_mode_intro_text">To use one handed mode, swipe down from the bottom edge of the screen. To use this feature, make sure gesture navigation is turned on in system navigation settings.</string>















    <!-- One-handed mode pull down screen into reach action title [CHAR_LIMIT=60] -->

























res/xml/one_handed_settings.xml



+2
−2




























Original line number
Diff line number
Diff line








@@ -39,7 +39,8 @@





























    <PreferenceCategory















        android:key="gesture_one_handed_mode_swipe_down"













        android:title="@string/one_handed_mode_swipe_down_category">













        android:title="@string/one_handed_mode_swipe_down_category"













        settings:controller="com.android.settings.gestures.OneHandedPreferenceCategoryController">































        <com.android.settingslib.widget.RadioButtonPreference















            android:key="gesture_one_handed_action_pull_screen_down"









@@ -54,5 +55,4 @@













            settings:controller="com.android.settings.gestures.OneHandedActionShowNotificationPrefController"/>































    </PreferenceCategory>





























</PreferenceScreen>
























src/com/android/settings/gestures/OneHandedActionPullDownPrefController.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -92,7 +92,8 @@ public class OneHandedActionPullDownPrefController extends BasePreferenceControl













        if (mPreference == null) {















            return;















        }













        if (uri.equals(OneHandedSettingsUtils.ONE_HANDED_MODE_ENABLED_URI)) {













        if (uri.equals(OneHandedSettingsUtils.ONE_HANDED_MODE_ENABLED_URI)













                || uri.equals(OneHandedSettingsUtils.SHORTCUT_ENABLED_URI)) {















            mPreference.setEnabled(OneHandedSettingsUtils.canEnableController(mContext));















        } else if (uri.equals(OneHandedSettingsUtils.SHOW_NOTIFICATION_ENABLED_URI)) {















            updateState(mPreference);

































src/com/android/settings/gestures/OneHandedActionShowNotificationPrefController.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -92,7 +92,8 @@ public class OneHandedActionShowNotificationPrefController extends BasePreferenc













        if (mPreference == null) {















            return;















        }













        if (uri.equals(OneHandedSettingsUtils.ONE_HANDED_MODE_ENABLED_URI)) {













        if (uri.equals(OneHandedSettingsUtils.ONE_HANDED_MODE_ENABLED_URI)













                || uri.equals(OneHandedSettingsUtils.SHORTCUT_ENABLED_URI)) {















            mPreference.setEnabled(OneHandedSettingsUtils.canEnableController(mContext));















        } else if (uri.equals(OneHandedSettingsUtils.SHOW_NOTIFICATION_ENABLED_URI)) {















            updateState(mPreference);