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

Commit 01df2b4e authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

Adds settings item for quick affordances. 

This is in Display > Lock screen. It reads "Buttons" and the summary
text below it is a comma delimited list of the names of the
currently-selected quick affordances.

Fix: 256662519
Test: Manual verification that the lock screen and wallet
items are gone and the new item is visible and clicking it opens the
Wallpaper & style settings screen

Change-Id: If3746b5d0eb8c61edb9378cdb217ca248b999944
parent 8a0074e9

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ 
    <uses-permission android:name="android.permission.READ_SAFETY_CENTER_STATUS" />

    <uses-permission android:name="android.permission.SEND_SAFETY_CENTER_UPDATE" />

    <uses-permission android:name="android.permission.START_VIEW_APP_FEATURES" />

    <uses-permission android:name="android.permission.ACCESS_KEYGUARD_QUICK_AFFORDANCES" />



    <application

            android:name=".SettingsApplication"

res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -13743,6 +13743,14 @@ 
    <string name="lockscreen_double_line_clock_summary">Show double-line clock when available</string>

    <!-- Lockscreen double-line clock toggle [CHAR LIMIT=60] -->

    <string name="lockscreen_double_line_clock_setting_toggle">Double-line clock</string>

    <!-- Lock screen buttons preference [CHAR LIMIT=60] -->

    <string name="lockscreen_quick_affordances_title">Buttons</string>

    <!-- Summary for the lock screen button preference [CHAR LIMIT=60] -->

    <plurals name="lockscreen_quick_affordances_summary">

        <item quantity="zero">None</item>

        <item quantity="one"><xliff:g id="first">%1$s</xliff:g></item>

        <item quantity="other"><xliff:g id="first">%1$s</xliff:g>, <xliff:g id="second">%2$s</xliff:g></item>

    </plurals>















    <!-- Title for RTT setting. [CHAR LIMIT=NONE] -->















    <string name="rtt_settings_title"></string>

























res/xml/security_lockscreen_settings.xml



+5
−0




























Original line number
Diff line number
Diff line








@@ -69,6 +69,11 @@













            android:summary="@string/lockscreen_trivial_controls_summary"















            settings:controller="com.android.settings.display.ControlsTrivialPrivacyPreferenceController"/>





























        <Preference













            android:key="customizable_lock_screen_quick_affordances"













            android:title="@string/lockscreen_quick_affordances_title"













            settings:controller="com.android.settings.display.CustomizableLockScreenQuickAffordancesPreferenceController" />





























        <SwitchPreference















            android:key="lockscreen_double_line_clock_switch"















            android:title="@string/lockscreen_double_line_clock_setting_toggle"

































src/com/android/settings/display/ControlsPrivacyPreferenceController.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -62,6 +62,11 @@ public class ControlsPrivacyPreferenceController extends TogglePreferenceControl





























    @Override















    public int getAvailabilityStatus() {













        // hide if we should use customizable lock screen quick affordances













        if (CustomizableLockScreenUtils.isFeatureEnabled(mContext)) {













            return UNSUPPORTED_ON_DEVICE;













        }





























        // hide if lockscreen isn't secure for this user















        return isEnabled() && isSecure() ? AVAILABLE : DISABLED_DEPENDENT_SETTING;















    }

































src/com/android/settings/display/ControlsTrivialPrivacyPreferenceController.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -70,6 +70,10 @@ public class ControlsTrivialPrivacyPreferenceController extends TogglePreference





























    @Override















    public int getAvailabilityStatus() {













        if (CustomizableLockScreenUtils.isFeatureEnabled(mContext)) {













            return UNSUPPORTED_ON_DEVICE;













        }





























        return showDeviceControlsSettingsEnabled() ? AVAILABLE : DISABLED_DEPENDENT_SETTING;















    }