Fix missing grid for devices that upgrade from R am: a62e49b365

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13420191

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id968c2fe398e1ff8ce8425804c0f7e20fdfd1b28
This commit is contained in:
Tracy Zhou
2021-01-28 03:11:28 +00:00
committed by Automerger Merge Worker
3 changed files with 5 additions and 5 deletions

View File

@@ -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" />

View File

@@ -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) {

View File

@@ -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";