diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-29 00:07:24 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-29 00:07:24 +0000 |
| commit | 593f4389d10daee68e1818324743db8802008420 (patch) | |
| tree | 65c775839224538275a2430cceb0423e6d3619f6 | |
| parent | 54f986707b25b6d299ce3a1bc1e18828482ee406 (diff) | |
| parent | a62e49b365739d8b3c918380c316e65376de085e (diff) | |
Snap for 7109713 from a62e49b365739d8b3c918380c316e65376de085e to rvc-qpr3-release
Change-Id: I1ed17ac3dec5535219fc5f9fa3576b5db5ee17d5
| -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 ff5bf0d1e..77f242817 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -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" /> diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index bf637886b..292a808b4 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; @@ -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) { 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"; |