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

Commit 47d17a4f authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge \"Pre-setup restrictions\" into nyc-dev 

am: f84c05c3

Change-Id: I2902c765eeacdbe05a393b01936572233c783988
parents 9c3d64ca f84c05c3

packages/SettingsLib/src/com/android/settingslib/HelpUtils.java

+7 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.pm.PackageManager.NameNotFoundException; 
import android.content.res.Resources.Theme;

import android.content.res.TypedArray;

import android.net.Uri;

import android.provider.Settings.Global;

import android.text.TextUtils;

import android.util.Log;

import android.util.TypedValue;
@@ -92,6 +93,9 @@ public class HelpUtils { 
     */

    public static boolean prepareHelpMenuItem(final Activity activity, MenuItem helpMenuItem,

            String helpUriString, String backupContext) {

        if (Global.getInt(activity.getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {

            return false;

        }

        if (TextUtils.isEmpty(helpUriString)) {

            // The help url string is empty or null, so set the help menu item to be invisible.

            helpMenuItem.setVisible(false);
@@ -129,6 +133,9 @@ public class HelpUtils { 


    public static Intent getHelpIntent(Context context, String helpUriString,

            String backupContext) {

        if (Global.getInt(context.getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {

            return null;

        }

        // Try to handle as Intent Uri, otherwise just treat as Uri.

        try {

            Intent intent = Intent.parseUri(helpUriString,

packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java

+6 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.graphics.drawable.Icon; 
import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings.Global;

import android.text.TextUtils;

import android.util.Log;

import android.util.Pair;
@@ -115,6 +116,8 @@ public class TileUtils { 
    public static List<DashboardCategory> getCategories(Context context,

            HashMap<Pair<String, String>, Tile> cache) {

        final long startTime = System.currentTimeMillis();

        boolean setup = Global.getInt(context.getContentResolver(), Global.DEVICE_PROVISIONED, 0)

                != 0;

        ArrayList<Tile> tiles = new ArrayList<>();

        UserManager userManager = UserManager.get(context);

        for (UserHandle user : userManager.getUserProfiles()) {
@@ -127,8 +130,10 @@ public class TileUtils { 
                getTilesForAction(context, user, MANUFACTURER_SETTINGS, cache,

                        MANUFACTURER_DEFAULT_CATEGORY, tiles, false);

            }

            if (setup) {

                getTilesForAction(context, user, EXTRA_SETTINGS_ACTION, cache, null, tiles, false);

            }

        }

        HashMap<String, DashboardCategory> categoryMap = new HashMap<>();

        for (Tile tile : tiles) {

            DashboardCategory category = categoryMap.get(tile.category);