PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add extra to home settings starting intent.

Browse Source 
If intent contains a specific extra the picker will be
retricted to launchers that support managed profiles
no matter whether there are managed profiles present.

Bug:15099904
Change-Id: I31ab74afee7b5a790cb7aa621fff72f640fcedaf
This commit is contained in:
Sander Alewijnse
2014-08-19 18:07:47 +01:00
parent d05dd864d6
commit 1ac37a4199
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/HomeSettings.java
View File

@@ -19,6 +19,7 @@ package com.android.settings;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import android.app.Activity;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.ComponentName; import android.content.ComponentName;
@@ -59,6 +60,10 @@ import com.android.settings.search.SearchIndexableRaw;
public class HomeSettings extends SettingsPreferenceFragment implements Indexable { public class HomeSettings extends SettingsPreferenceFragment implements Indexable {
static final String TAG = "HomeSettings"; static final String TAG = "HomeSettings";
// Boolean extra, indicates only launchers that support managed profiles should be shown.
// Note: must match the constant defined in ManagedProvisioning
private static final String EXTRA_SUPPORT_MANAGED_PROFILES = "support_managed_profiles";
static final int REQUESTING_UNINSTALL = 10; static final int REQUESTING_UNINSTALL = 10;
public static final String HOME_PREFS = "home_prefs"; public static final String HOME_PREFS = "home_prefs";
@@ -118,6 +123,8 @@ public class HomeSettings extends SettingsPreferenceFragment implements Indexabl
mPm.replacePreferredActivity(mHomeFilter, IntentFilter.MATCH_CATEGORY_EMPTY, mPm.replacePreferredActivity(mHomeFilter, IntentFilter.MATCH_CATEGORY_EMPTY,
mHomeComponentSet, newHome.activityName); mHomeComponentSet, newHome.activityName);
getActivity().setResult(Activity.RESULT_OK);
} }
void uninstallApp(HomeAppPreference pref) { void uninstallApp(HomeAppPreference pref) {
@@ -175,7 +182,10 @@ public class HomeSettings extends SettingsPreferenceFragment implements Indexabl
mPrefs = new ArrayList<HomeAppPreference>(); mPrefs = new ArrayList<HomeAppPreference>();
mHomeComponentSet = new ComponentName[homeActivities.size()]; mHomeComponentSet = new ComponentName[homeActivities.size()];
int prefIndex = 0; int prefIndex = 0;
boolean hasManagedProfile = hasManagedProfile(); boolean supportManagedProfilesExtra =
getActivity().getIntent().getBooleanExtra(EXTRA_SUPPORT_MANAGED_PROFILES, false);
boolean mustSupportManagedProfile = hasManagedProfile()
|| supportManagedProfilesExtra;
for (int i = 0; i < homeActivities.size(); i++) { for (int i = 0; i < homeActivities.size(); i++) {
final ResolveInfo candidate = homeActivities.get(i); final ResolveInfo candidate = homeActivities.get(i);
final ActivityInfo info = candidate.activityInfo; final ActivityInfo info = candidate.activityInfo;
@@ -186,7 +196,7 @@ public class HomeSettings extends SettingsPreferenceFragment implements Indexabl
CharSequence name = info.loadLabel(mPm); CharSequence name = info.loadLabel(mPm);
HomeAppPreference pref; HomeAppPreference pref;
if (hasManagedProfile && !launcherHasManagedProfilesFeature(candidate)) { if (mustSupportManagedProfile && !launcherHasManagedProfilesFeature(candidate)) {
pref = new HomeAppPreference(context, activityName, prefIndex, pref = new HomeAppPreference(context, activityName, prefIndex,
icon, name, this, info, false /* not enabled */, icon, name, this, info, false /* not enabled */,
getResources().getString(R.string.home_work_profile_not_supported)); getResources().getString(R.string.home_work_profile_not_supported));
@@ -207,6 +217,10 @@ public class HomeSettings extends SettingsPreferenceFragment implements Indexabl
} }
if (mCurrentHome != null) { if (mCurrentHome != null) {
if (mCurrentHome.isEnabled()) {
getActivity().setResult(Activity.RESULT_OK);
}
new Handler().post(new Runnable() { new Handler().post(new Runnable() {
public void run() { public void run() {
mCurrentHome.setChecked(true); mCurrentHome.setChecked(true);