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

Unverified Commit 6005772c authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-11.0.0_r34' into staging/lineage-18.1_merge-android-11.0.0_r34 

Android 11.0.0 release 34

* tag 'android-11.0.0_r34':
  Fix missing grid for devices that upgrade from R

Change-Id: Idb5e7b21280940dc8d47e909d5a08026d93d1b42
parents 147d648f 95c362d5

AndroidManifest-common.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -154,7 +154,7 @@ 
        The content provider for exposing various launcher grid options.

        The content provider for exposing various launcher grid options.

        -->

        -->

        <provider

        <provider

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

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

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

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

            android:exported="true"

            android:exported="true"

            android:writePermission="${packageName}.permission.WRITE_SETTINGS"

            android:writePermission="${packageName}.permission.WRITE_SETTINGS"

src/com/android/launcher3/Utilities.java

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




import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.dragndrop.FolderAdaptiveIcon;

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.graphics.TintedDrawableSpan;

import com.android.launcher3.icons.IconProvider;

import com.android.launcher3.icons.IconProvider;

import com.android.launcher3.icons.LauncherIcons;

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

    public static boolean isGridOptionsEnabled(Context context) {

        return isComponentEnabled(context.getPackageManager(),

        return isComponentEnabled(context.getPackageManager(),

                context.getPackageName(),

                context.getPackageName(),

                GridOptionsProvider.class.getName());

                GridCustomizationsProvider.class.getName());

    }

    }





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

    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 Original line Diff line number Diff line
@@ -40,9 +40,9 @@ import java.util.List; 
 *     /default_grid: Call update to set the current grid, with values

 *     /default_grid: Call update to set the current grid, with values

 *          name: name of the grid to apply

 *          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_NAME = "name";

    private static final String KEY_ROWS = "rows";

    private static final String KEY_ROWS = "rows";