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

Shape screen communication with the Launcher's app (2/2)

Browse Source 
This is a revertx2 of ag/29934361 with the fix of b/376371559

Support querying / preview / apply for the shapes from the Launcher's
app.

Test: Manually tested that it works
Fixes: 376371559
Bug: 348664593
Flag: com.android.systemui.shared.new_customization_picker_ui
Change-Id: I232040f4c3661f149de4c88810e51f6dd8bac9c3
This commit is contained in:
George Lin
2024-10-17 21:12:31 +00:00
parent 50d2c82de6
commit 2b6f265bf9
3 changed files with 167 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/graphics/GridCustomizationsProvider.java
+90 -12
View File
@@ -36,18 +36,24 @@ import android.os.Messenger;
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.NonNull;
import com.android.launcher3.InvariantDeviceProfile;
import com.android.launcher3.InvariantDeviceProfile.GridOption;
import com.android.launcher3.LauncherAppState;
import com.android.launcher3.LauncherModel;
import com.android.launcher3.LauncherPrefs;
import com.android.launcher3.model.BgDataModel;
import com.android.launcher3.shapes.AppShape;
import com.android.launcher3.shapes.AppShapesProvider;
import com.android.launcher3.util.Executors;
import com.android.launcher3.util.Preconditions;
import com.android.launcher3.util.RunnableList;
import com.android.systemui.shared.Flags;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.WeakHashMap;
import java.util.concurrent.ExecutionException;
@@ -55,18 +61,25 @@ import java.util.concurrent.ExecutionException;
/**
* Exposes various launcher grid options and allows the caller to change them.
* APIs:
* /list_options: List the various available grip options, has following columns
* name: name of the grid
* /shape_options: List of various available shape options, where each has following fields
* shape_key: key of the shape option
* title: translated title of the shape option
* path: path of the shape, assuming drawn on 100x100 view port
* is_default: true if this shape option is currently set to the system
*
* /list_options: List the various available grid options, where each has following fields
* name: key of the grid option
* rows: number of rows in the grid
* cols: number of columns in the grid
* preview_count: number of previews available for this grid option. The preview uri
* looks like /preview/<grid-name>/<preview index starting with 0>
* is_default: true if this grid is currently active
* is_default: true if this grid option is currently set to the system
*
* /preview: Opens a file stream for the grid preview
* /get_preview: Open a file stream for the grid preview
*
* /default_grid: Call update to set the current grid, with values
* name: name of the grid to apply
* /default_grid: Call update to set the current shape and grid, with values
* shape_key: key of the shape to apply
* name: key of the grid to apply
*/
public class GridCustomizationsProvider extends ContentProvider {
@@ -77,9 +90,16 @@ public class GridCustomizationsProvider extends ContentProvider {
private static final String KEY_ROWS = "rows";
private static final String KEY_COLS = "cols";
private static final String KEY_PREVIEW_COUNT = "preview_count";
// is_default means if a certain option is currently set to the system
private static final String KEY_IS_DEFAULT = "is_default";
private static final String KEY_SHAPE_KEY = "shape_key";
private static final String KEY_SHAPE_TITLE = "shape_title";
private static final String KEY_PATH = "path";
// list_options is the key for grid option list
private static final String KEY_LIST_OPTIONS = "/list_options";
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 METHOD_GET_PREVIEW = "get_preview";
@@ -95,6 +115,7 @@ public class GridCustomizationsProvider extends ContentProvider {
public static final String KEY_GRID_NAME = "grid_name";
private static final int MESSAGE_ID_UPDATE_PREVIEW = 1337;
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;
@@ -110,7 +131,33 @@ public class GridCustomizationsProvider extends ContentProvider {
@Override
public Cursor query(Uri uri, String[] projection, String selection,
String[] selectionArgs, String sortOrder) {
switch (uri.getPath()) {
Context context = getContext();
String path = uri.getPath();
if (context == null || path == null) {
return null;
}
switch (path) {
case KEY_SHAPE_OPTIONS: {
if (Flags.newCustomizationPickerUi()) {
MatrixCursor cursor = new MatrixCursor(new String[]{
KEY_SHAPE_KEY, KEY_SHAPE_TITLE, KEY_PATH, KEY_IS_DEFAULT});
List<AppShape> shapes = AppShapesProvider.INSTANCE.getShapes();
for (int i = 0; i < shapes.size(); i++) {
AppShape shape = shapes.get(i);
cursor.newRow()
.add(KEY_SHAPE_KEY, shape.getKey())
.add(KEY_SHAPE_TITLE, shape.getTitle())
.add(KEY_PATH, shape.getPath())
// TODO (b/348664593): We should fetch the currently-set shape
// option from the preferences.
.add(KEY_IS_DEFAULT, i == 0);
}
return cursor;
} else {
return null;
}
}
case KEY_LIST_OPTIONS: {
MatrixCursor cursor = new MatrixCursor(new String[]{
KEY_NAME, KEY_GRID_TITLE, KEY_ROWS, KEY_COLS, KEY_PREVIEW_COUNT,
@@ -163,6 +210,14 @@ public class GridCustomizationsProvider extends ContentProvider {
}
switch (path) {
case KEY_DEFAULT_GRID: {
if (Flags.newCustomizationPickerUi()) {
String shapeKey = values.getAsString(KEY_SHAPE_KEY);
Optional<AppShape> optionalShape = AppShapesProvider.INSTANCE.getShapes()
.stream().filter(shape -> shape.getKey().equals(shapeKey)).findFirst();
String pathToSet = optionalShape.map(AppShape::getPath).orElse(null);
// TODO (b/348664593): Apply shapeName to the system. This needs to be a
// synchronous call.
}
String gridName = values.getAsString(KEY_NAME);
InvariantDeviceProfile idp = InvariantDeviceProfile.INSTANCE.get(context);
// Verify that this is a valid grid option
@@ -220,20 +275,30 @@ public class GridCustomizationsProvider extends ContentProvider {
}
@Override
public Bundle call(String method, String arg, Bundle extras) {
if (getContext().checkPermission("android.permission.BIND_WALLPAPER",
public Bundle call(@NonNull String method, String arg, Bundle extras) {
Context context = getContext();
if (context == null) {
return null;
}
if (context.checkPermission("android.permission.BIND_WALLPAPER",
Binder.getCallingPid(), Binder.getCallingUid())
!= PackageManager.PERMISSION_GRANTED) {
return null;
}
if (!METHOD_GET_PREVIEW.equals(method)) {
if (METHOD_GET_PREVIEW.equals(method)) {
return getPreview(extras);
} else {
return null;
}
return getPreview(extras);
}
private synchronized Bundle getPreview(Bundle request) {
Context context = getContext();
if (context == null) {
return null;
}
RunnableList lifeCycleTracker = new RunnableList();
try {
PreviewSurfaceRenderer renderer = new PreviewSurfaceRenderer(
@@ -271,7 +336,9 @@ public class GridCustomizationsProvider extends ContentProvider {
public final PreviewSurfaceRenderer renderer;
public boolean destroyed = false;
PreviewLifecycleObserver(RunnableList lifeCycleTracker, PreviewSurfaceRenderer renderer) {
PreviewLifecycleObserver(
RunnableList lifeCycleTracker,
PreviewSurfaceRenderer renderer) {
this.lifeCycleTracker = lifeCycleTracker;
this.renderer = renderer;
lifeCycleTracker.add(() -> destroyed = true);
@@ -287,6 +354,17 @@ public class GridCustomizationsProvider extends ContentProvider {
case MESSAGE_ID_UPDATE_PREVIEW:
renderer.hideBottomRow(message.getData().getBoolean(KEY_HIDE_BOTTOM_ROW));
break;
case MESSAGE_ID_UPDATE_SHAPE:
if (Flags.newCustomizationPickerUi()) {
String shapeKey = message.getData().getString(KEY_SHAPE_KEY);
Optional<AppShape> optionalShape = AppShapesProvider.INSTANCE.getShapes()
.stream()
.filter(shape -> shape.getKey().equals(shapeKey))
.findFirst();
String pathToSet = optionalShape.map(AppShape::getPath).orElse(null);
// TODO (b/348664593): Update launcher preview with the given shape
}
break;
case MESSAGE_ID_UPDATE_GRID:
String gridName = message.getData().getString(KEY_GRID_NAME);
if (!TextUtils.isEmpty(gridName)) {