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

Commit 3802fbf7 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Automerger Merge Worker
Browse files

Merge "Renames customization content provider (2/7)." into tm-qpr-dev am: 53b342a8 

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



Change-Id: I165e83754f1d6cfe7cf144c12ed5ac902dc01e90
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 420afe23 53b342a8

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +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" />

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



    <application

            android:name=".SettingsApplication"

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

+5 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ public final class CustomizableLockScreenUtils { 
    private static final String TAG = "CustomizableLockScreenUtils";

    private static final Uri BASE_URI = new Uri.Builder()

            .scheme(ContentResolver.SCHEME_CONTENT)

            .authority("com.android.systemui.keyguard.quickaffordance")

            .authority("com.android.systemui.customization")

            .build();

    @VisibleForTesting

    static final Uri FLAGS_URI = BASE_URI.buildUpon()
@@ -45,14 +45,16 @@ public final class CustomizableLockScreenUtils { 
            .build();

    @VisibleForTesting

    static final Uri SELECTIONS_URI = BASE_URI.buildUpon()

            .path("selections")

            .appendPath("lockscreen_quickaffordance")

            .appendPath("selections")

            .build();

    @VisibleForTesting

    static final String NAME = "name";

    @VisibleForTesting

    static final String VALUE = "value";

    @VisibleForTesting

    static final String ENABLED_FLAG = "is_feature_enabled";

    static final String ENABLED_FLAG =

            "is_custom_lock_screen_quick_affordances_feature_enabled";

    @VisibleForTesting

    static final String AFFORDANCE_NAME = "affordance_name";