From e24533cb409e7aea9b500990c43ade680990a9e5 Mon Sep 17 00:00:00 2001 From: George Lin Date: Tue, 11 Mar 2025 23:02:59 +0000 Subject: Handle app icon preview and update cases Add 2 more cases: 1. Update icon shape only 2. Preview icon themed Test: TBD Bug: 402161932 Flag: com.android.systemui.shared.new_customization_picker_ui Change-Id: I2dc21e14d346a1d444ed8baa759e7a6d38f6cd41 --- .../launcher3/graphics/GridCustomizationsProxy.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src') diff --git a/src/com/android/launcher3/graphics/GridCustomizationsProxy.java b/src/com/android/launcher3/graphics/GridCustomizationsProxy.java index 70b9f46c1f..48519ce8bc 100644 --- a/src/com/android/launcher3/graphics/GridCustomizationsProxy.java +++ b/src/com/android/launcher3/graphics/GridCustomizationsProxy.java @@ -113,6 +113,7 @@ public class GridCustomizationsProxy implements ProxyProvider { private static final String KEY_SHAPE_OPTIONS = "/shape_options"; // default_grid is for setting grid and shape to system settings private static final String KEY_DEFAULT_GRID = "/default_grid"; + private static final String SET_SHAPE = "/shape"; private static final String METHOD_GET_PREVIEW = "get_preview"; @@ -130,6 +131,7 @@ public class GridCustomizationsProxy implements ProxyProvider { private static final int MESSAGE_ID_UPDATE_SHAPE = 2586; private static final int MESSAGE_ID_UPDATE_GRID = 7414; private static final int MESSAGE_ID_UPDATE_COLOR = 856; + private static final int MESSAGE_ID_UPDATE_ICON_THEMED = 311; // Set of all active previews used to track duplicate memory allocations private final Set mActivePreviews = @@ -264,6 +266,12 @@ public class GridCustomizationsProxy implements ProxyProvider { mContext.getContentResolver().notifyChange(uri, null); return 1; } + case SET_SHAPE: + if (Flags.newCustomizationPickerUi()) { + mPrefs.put(PREF_ICON_SHAPE, + requireNonNullElse(values.getAsString(KEY_SHAPE_KEY), "")); + } + return 1; case ICON_THEMED: case SET_ICON_THEMED: { mThemeManager.setMonoThemeEnabled(values.getAsBoolean(BOOLEAN_VALUE)); @@ -384,6 +392,12 @@ public class GridCustomizationsProxy implements ProxyProvider { renderer.previewColor(message.getData()); } break; + case MESSAGE_ID_UPDATE_ICON_THEMED: + if (Flags.newCustomizationPickerUi()) { + Boolean iconThemed = message.getData().getBoolean(BOOLEAN_VALUE); + // TODO Update icon themed in the preview + } + break; default: // Unknown command, destroy lifecycle Log.d(TAG, "Unknown preview command: " + message.what + ", destroying preview"); -- cgit v1.2.3-59-g8ed1b