From 2f61fd67d1ce0bee7d66338bb209c01aa3b219fe Mon Sep 17 00:00:00 2001
From: Alejandro Nijamkin <nijamkin@google.com>
Date: Sat, 24 Dec 2022 08:08:02 -0800
Subject: [PATCH] Renames customization content provider (2/7).

KeyguardQuickAffordanceProvider has started to be used for more than
just lock screen shortcuts. This collection of CLs updates its name,
authority, and table schema to become more generically about "system UI
customization".

Fix: 262879277
Test: manually verified Settings > Display > Lock screen shows the
"shortcuts" item
Test: manually verified that the Wallpaper picker properly renders the
preview and can change the quick affordances
Test: manually verified that system UI displays the right lock screen
shortcuts

Change-Id: Idc0765a8c3fe50c82689d2ca7f9d19b41a62baf2
Merged-In: Idc0765a8c3fe50c82689d2ca7f9d19b41a62baf2
---
 AndroidManifest.xml                                       | 2 +-
 .../settings/display/CustomizableLockScreenUtils.java     | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c87835c5f72..f9b15ebffe4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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"
diff --git a/src/com/android/settings/display/CustomizableLockScreenUtils.java b/src/com/android/settings/display/CustomizableLockScreenUtils.java
index 14601a3655b..2e9f53d9d0f 100644
--- a/src/com/android/settings/display/CustomizableLockScreenUtils.java
+++ b/src/com/android/settings/display/CustomizableLockScreenUtils.java
@@ -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";