commit e57655c204f3661fe0e50b4710ab31e900fa2f72
author Ching-Sung Li <chriscsli@google.com> Tue May 18 11:29:08 2021 +0800
committer Ching-Sung Li <chriscsli@google.com> Wed May 19 20:32:49 2021 +0800
tree 584a2749b48b3d07d6639af7eb42024f468e5cb9
parent cf80160fa3cc33c96d22895d04ffdb13bdbb1d3f

Update the themed icon feature's content Uri path

Update the themed icon feature's content Uri path for methods to handle
themed icon query / update in Launcher.

Bug: 186590551
Test: Manual
Change-Id: I2137adaf5fa0df802e4af2e9aba12fd9b7f374a8

src/com/android/customization/model/themedicon/ThemedIconSwitchProvider.java

diff --git a/src/com/android/customization/model/themedicon/ThemedIconSwitchProvider.java b/src/com/android/customization/model/themedicon/ThemedIconSwitchProvider.java
index 1a57223..761e2fa 100644
--- a/src/com/android/customization/model/themedicon/ThemedIconSwitchProvider.java
+++ b/src/com/android/customization/model/themedicon/ThemedIconSwitchProvider.java
@@ -23,12 +23,11 @@
 import androidx.annotation.WorkerThread;
 
 /**
- * Retrieves the themed icon switch by {@link ContentResolver}
+ * Retrieves the themed icon switch by {@link ContentResolver} from the current launcher
  */
 public class ThemedIconSwitchProvider {
 
-    private static final String GET_ICON_THEMED = "get_icon_themed";
-    private static final String SET_ICON_THEMED = "set_icon_themed";
+    private static final String ICON_THEMED = "icon_themed";
     private static final int ENABLED = 1;
     private static final String COL_ICON_THEMED_VALUE = "boolean_value";
 
@@ -48,7 +47,7 @@
     protected boolean fetchThemedIconEnabled() {
         ContentResolver contentResolver = mContext.getContentResolver();
         try (Cursor cursor = contentResolver.query(
-                mThemedIconUtils.getUriForPath(GET_ICON_THEMED), /* projection= */
+                mThemedIconUtils.getUriForPath(ICON_THEMED), /* projection= */
                 null, /* selection= */ null, /* selectionArgs= */ null, /* sortOrder= */ null)) {
             if (cursor != null && cursor.moveToNext()) {
                 int themedIconEnabled = cursor.getInt(cursor.getColumnIndex(COL_ICON_THEMED_VALUE));
@@ -61,7 +60,8 @@
     protected int setThemedIconEnabled(boolean enabled) {
         ContentValues values = new ContentValues();
         values.put(COL_ICON_THEMED_VALUE, enabled);
-        return mContext.getContentResolver().update(mThemedIconUtils.getUriForPath(SET_ICON_THEMED),
-                values, /* where= */ null, /* selectionArgs= */ null);
+        return mContext.getContentResolver().update(
+                mThemedIconUtils.getUriForPath(ICON_THEMED), values,
+                /* where= */ null, /* selectionArgs= */ null);
     }
 }