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

Commit 68d53c04 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Pre-setup restrictions DO NOT MERGE am: e6ad6e86 

am: 2d21d1b9

Change-Id: I1fc62827de765434ac88a7cb75d63febb074b565
parents 5527ac9c 2d21d1b9

src/com/android/settings/HelpUtils.java

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.pm.PackageInfo; 
import android.content.pm.PackageManager.NameNotFoundException;

import android.content.res.Resources.Theme;

import android.net.Uri;

import android.provider.Settings.Global;

import android.text.TextUtils;

import android.util.Log;

import android.util.TypedValue;
@@ -90,6 +91,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);
@@ -123,6 +127,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,

src/com/android/settings/SettingsActivity.java

+5 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.preference.Preference; 
import android.preference.PreferenceFragment;

import android.preference.PreferenceManager;

import android.preference.PreferenceScreen;

import android.provider.Settings.Global;

import android.text.TextUtils;

import android.transition.TransitionManager;

import android.util.ArrayMap;
@@ -1316,6 +1317,10 @@ public class SettingsActivity extends Activity 
    }



    private void addExternalTiles(List<DashboardCategory> target) {

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

            // Don't add external tiles until device is set up.

            return;

        }

        Map<Pair<String, String>, DashboardTile> addedCache =

                new ArrayMap<Pair<String, String>, DashboardTile>();

        UserManager userManager = UserManager.get(this);

src/com/android/settings/users/UserSettings.java

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.preference.Preference.OnPreferenceClickListener; 
import android.preference.PreferenceGroup;

import android.preference.PreferenceScreen;

import android.provider.Settings;

import android.provider.Settings.Global;

import android.provider.Settings.Secure;

import android.util.Log;

import android.util.SparseArray;
@@ -229,6 +230,11 @@ public class UserSettings extends SettingsPreferenceFragment 
        filter.addAction(Intent.ACTION_USER_INFO_CHANGED);

        context.registerReceiverAsUser(mUserChangeReceiver, UserHandle.ALL, filter, null,

                mHandler);



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

            getActivity().finish();

            return;

        }

    }



    @Override