diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-09 20:20:24 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-09 20:20:24 +0000 |
| commit | 95c362d5a0d66bd024372cf8fb31efa25718802c (patch) | |
| tree | b5fbc092fa86ed11cf78d50fafda74dd0dc15c12 | |
| parent | 6c9849a0e8a8bd31d55d0cb99c5c7c541a86c8a6 (diff) | |
| parent | 1283f546dee2ed58fc8875e079722ee62788a9b9 (diff) | |
Merge cherrypicks of [13532551, 13532552, 13534990, 13533561, 13533870, 13533871, 13534991, 13533562, 13532553, 13533872, 13534992, 13532554, 13535065, 13535085, 13535105, 13535125, 13535126, 13535106, 13535107, 13535086] into rvc-qpr2-release
Change-Id: I02773d2c5a849e00c0f12d4a807c24b5eaebedcf
| -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"; |