openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE"

This commit is contained in:
Bill Yi 2021-04-14 04:59:51 +00:00 committed by Gerrit Code Review
parent 278edf2938 756c47bc96
commit f78b6ea226
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest-common.xml
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" />

4
src/com/android/launcher3/Utilities.java
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) {

4
src/com/android/launcher3/graphics/GridOptionsProvider.java → src/com/android/launcher3/graphics/GridCustomizationsProvider.java
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";