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

Commit 2b8067e7 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"... 

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

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



Change-Id: I2e223f815b9d96f0766a139cdee53884f47d849b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ccf9d95 390c348d

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