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

Commit 390c348d authored by Jason Chiu's avatar Jason Chiu Committed by Automerger Merge Worker
Browse files

Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cd 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473



Change-Id: I3d1b66a4288434d52075538af737c2d1ac33f4e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 381ac521 428e97cd

src/com/android/settings/dashboard/CategoryManager.java

+9 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ import com.android.settingslib.drawer.ProviderTile; 
import com.android.settingslib.drawer.Tile;

import com.android.settingslib.drawer.TileUtils;



import com.google.android.setupcompat.util.WizardManagerHelper;



import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;
@@ -77,6 +79,9 @@ public class CategoryManager { 
    }



    public synchronized List<DashboardCategory> getCategories(Context context) {

        if (!WizardManagerHelper.isUserSetupComplete(context)) {

            return new ArrayList<>();

        }

        tryInitCategories(context);

        return mCategories;

    }
@@ -140,6 +145,10 @@ public class CategoryManager { 
    }



    private synchronized void tryInitCategories(Context context, boolean forceClearCache) {

        if (!WizardManagerHelper.isUserSetupComplete(context)) {

            // Don't init while setup wizard is still running.

            return;

        }

        if (mCategories == null) {

            final boolean firstLoading = mCategoryByKeyMap.isEmpty();

            if (forceClearCache) {