Merge "Fix missing grid for devices that upgrade from R" into sc-dev am: db46688e65

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c533b724b225733007595829e1219eb65d6bab9
This commit is contained in:
TreeHugger Robot authored and Automerger Merge Worker committed 2021-01-28 02:40:26 +00:00
commit a610d431bb
3 files changed
+5 -5

No files matched your search

+1 -1
View File
@@ -141,7 +141,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" />
+2 -2
View File
@@ -67,7 +67,7 @@ import android.view.animation.Interpolator;
import androidx.core.os.BuildCompat;
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) {
@@ -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";