PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I165e83754f1d6cfe7cf144c12ed5ac902dc01e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ale Nijamkin
2022-12-28 18:37:37 +00:00
committed by Automerger Merge Worker
parent 420afe232b 53b342a81a
commit 3802fbf7a2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -118,7 +118,7 @@
<uses-permission android:name="android.permission.READ_SAFETY_CENTER_STATUS" /> <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.SEND_SAFETY_CENTER_UPDATE" />
<uses-permission android:name="android.permission.START_VIEW_APP_FEATURES" /> <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 <application
android:name=".SettingsApplication" android:name=".SettingsApplication"

8
src/com/android/settings/display/CustomizableLockScreenUtils.java
View File

@@ -37,7 +37,7 @@ public final class CustomizableLockScreenUtils {
private static final String TAG = "CustomizableLockScreenUtils"; private static final String TAG = "CustomizableLockScreenUtils";
private static final Uri BASE_URI = new Uri.Builder() private static final Uri BASE_URI = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT) .scheme(ContentResolver.SCHEME_CONTENT)
.authority("com.android.systemui.keyguard.quickaffordance") .authority("com.android.systemui.customization")
.build(); .build();
@VisibleForTesting @VisibleForTesting
static final Uri FLAGS_URI = BASE_URI.buildUpon() static final Uri FLAGS_URI = BASE_URI.buildUpon()
@@ -45,14 +45,16 @@ public final class CustomizableLockScreenUtils {
.build(); .build();
@VisibleForTesting @VisibleForTesting
static final Uri SELECTIONS_URI = BASE_URI.buildUpon() static final Uri SELECTIONS_URI = BASE_URI.buildUpon()
.path("selections") .appendPath("lockscreen_quickaffordance")
.appendPath("selections")
.build(); .build();
@VisibleForTesting @VisibleForTesting
static final String NAME = "name"; static final String NAME = "name";
@VisibleForTesting @VisibleForTesting
static final String VALUE = "value"; static final String VALUE = "value";
@VisibleForTesting @VisibleForTesting
static final String ENABLED_FLAG = "is_feature_enabled"; static final String ENABLED_FLAG =
"is_custom_lock_screen_quick_affordances_feature_enabled";
@VisibleForTesting @VisibleForTesting
static final String AFFORDANCE_NAME = "affordance_name"; static final String AFFORDANCE_NAME = "affordance_name";