Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85e48c82 authored by Bill Yi's avatar Bill Yi
Browse files

Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE 

Merged-In: I31f76112edeb770bc3b9c017f6205392dbe3f5a8
Change-Id: Ic4c3cfbde42e2318988c073662c95863bb13f27d
parents dc71c017 95c362d5

AndroidManifest-common.xml

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 
        TODO: Add proper permissions

        -->

        <provider

            android:name="com.android.launcher3.graphics.GridOptionsProvider"

            android:name="com.android.launcher3.graphics.GridCustomizationsProvider"

            android:authorities="${packageName}.grid_control"

            android:exported="true" />

src/com/android/launcher3/Utilities.java

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ import androidx.core.os.BuildCompat; 


import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.dragndrop.FolderAdaptiveIcon;

import com.android.launcher3.graphics.GridOptionsProvider;

import com.android.launcher3.graphics.GridCustomizationsProvider;

import com.android.launcher3.graphics.TintedDrawableSpan;

import com.android.launcher3.icons.IconProvider;

import com.android.launcher3.icons.LauncherIcons;
@@ -521,7 +521,7 @@ public final class Utilities { 
    public static boolean isGridOptionsEnabled(Context context) {

        return isComponentEnabled(context.getPackageManager(),

                context.getPackageName(),

                GridOptionsProvider.class.getName());

                GridCustomizationsProvider.class.getName());

    }



    private static boolean isComponentEnabled(PackageManager pm, String pkgName, String clsName) {

src/com/android/launcher3/graphics/GridOptionsProvider.java→src/com/android/launcher3/graphics/GridCustomizationsProvider.java

+2 −2
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ import java.util.List; 
 *     /default_grid: Call update to set the current grid, with values

 *          name: name of the grid to apply

 */

public class GridOptionsProvider extends ContentProvider {

public class GridCustomizationsProvider extends ContentProvider {



    private static final String TAG = "GridOptionsProvider";

    private static final String TAG = "GridCustomizationsProvider";



    private static final String KEY_NAME = "name";

    private static final String KEY_ROWS = "rows";