Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfb24c77 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Moving all DB management logic from LauncherProvider into a separate class" into udc-dev

parents 95b6f8c4 1ae46ca8

src/com/android/launcher3/AutoInstallsLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class AutoInstallsLayout { 
    private static final String FORMATTED_LAYOUT_RES = "default_layout_%dx%d";

    private static final String LAYOUT_RES = "default_layout";



    static AutoInstallsLayout get(Context context, LauncherWidgetHolder appWidgetHolder,

    public static AutoInstallsLayout get(Context context, LauncherWidgetHolder appWidgetHolder,

            LayoutParserCallback callback) {

        Partner partner = Partner.get(context.getPackageManager(), ACTION_LAUNCHER_CUSTOMIZATION);

        if (partner == null) {

src/com/android/launcher3/InvariantDeviceProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ public class InvariantDeviceProfile { 


    public String dbFile;

    public int defaultLayoutId;

    int demoModeLayoutId;

    public int demoModeLayoutId;

    public boolean[] inlineQsb = new boolean[COUNT_SIZES];



    /**

src/com/android/launcher3/LauncherProvider.java

+27 −316

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/launcher3/model/DatabaseHelper.java

+2 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.launcher3.AutoInstallsLayout.LayoutParserCallback; 
import com.android.launcher3.InvariantDeviceProfile;

import com.android.launcher3.LauncherFiles;

import com.android.launcher3.LauncherPrefs;

import com.android.launcher3.LauncherProvider;

import com.android.launcher3.LauncherSettings;

import com.android.launcher3.LauncherSettings.Favorites;

import com.android.launcher3.Utilities;
@@ -77,6 +76,7 @@ public class DatabaseHelper extends NoLocaleSQLiteHelper implements 
    private static final boolean LOGD = false;



    private static final String DOWNGRADE_SCHEMA_FILE = "downgrade_schema.json";

    public static final String EMPTY_DATABASE_CREATED = "EMPTY_DATABASE_CREATED";



    private final Context mContext;

    private final boolean mForMigration;
@@ -165,8 +165,7 @@ public class DatabaseHelper extends NoLocaleSQLiteHelper implements 
     */

    protected void onEmptyDbCreated() {

        // Set the flag for empty DB

        LauncherPrefs.getPrefs(mContext).edit().putBoolean(getKey(

                        LauncherProvider.EMPTY_DATABASE_CREATED), true)

        LauncherPrefs.getPrefs(mContext).edit().putBoolean(getKey(EMPTY_DATABASE_CREATED), true)

                .commit();

    }

src/com/android/launcher3/model/ModelDbController.java

0 → 100644
+462 −0

File added.

Preview size limit exceeded, changes collapsed.