diff options
| author | Kevin F. Haggerty <haggertk@lineageos.org> | 2021-04-10 13:30:12 -0600 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2021-04-10 13:30:16 -0600 |
| commit | 6005772c6962e9185bf7b0e1738ad4d7f4a3bcf0 (patch) | |
| tree | 96f786adc442ea326e9e8b56535763ff731f505c | |
| parent | 147d648f722fa209395152c73d7880b18cd8150b (diff) | |
| parent | 95c362d5a0d66bd024372cf8fb31efa25718802c (diff) | |
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
| -rw-r--r-- | AndroidManifest-common.xml | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/Utilities.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/graphics/GridCustomizationsProvider.java (renamed from src/com/android/launcher3/graphics/GridOptionsProvider.java) | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index 2d4e1cfff..2ba068f58 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -154,7 +154,7 @@ The content provider for exposing various launcher grid options. --> <provider - android:name="com.android.launcher3.graphics.GridOptionsProvider" + android:name="com.android.launcher3.graphics.GridCustomizationsProvider" android:authorities="${packageName}.grid_control" android:exported="true" android:writePermission="${packageName}.permission.WRITE_SETTINGS" diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index c9a8270a7..b32b39618 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -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; @@ -520,7 +520,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) { diff --git a/src/com/android/launcher3/graphics/GridOptionsProvider.java b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java index 08d7e4c65..cb42e7aa0 100644 --- a/src/com/android/launcher3/graphics/GridOptionsProvider.java +++ b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java @@ -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"; |