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

Merge "Profile select only shows with multiple profiles present." into qt-r1-dev

Browse Source 
am: c9364bffbc

Change-Id: Id993b35b08fa052544441205c13e18a75e3d7dd1
This commit is contained in:
Adam He
2019-05-30 11:42:35 -07:00
committed by android-build-merger
parent a88d150d16 c9364bffbc
commit 0fab9b60b3
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java
View File

@@ -96,19 +96,24 @@ public final class EnableContentCaptureWithServiceSettingsPreferenceController
for (UserInfo info: userInfos) { for (UserInfo info: userInfos) {
userHandles.add(info.getUserHandle()); userHandles.add(info.getUserHandle());
} }
if (userHandles.size() == 1) {
final Intent intent = pref.getIntent().addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
context.startActivityAsUser(intent, userHandles.get(0));
} else {
AlertDialog.Builder builder = new AlertDialog.Builder(context); AlertDialog.Builder builder = new AlertDialog.Builder(context);
UserAdapter adapter = UserAdapter.createUserAdapter(userManager, context, userHandles); UserAdapter adapter = UserAdapter.createUserAdapter(userManager, context,
userHandles);
builder.setTitle(com.android.settingslib.R.string.choose_profile) builder.setTitle(com.android.settingslib.R.string.choose_profile)
.setAdapter(adapter, (DialogInterface dialog, int which) -> { .setAdapter(adapter, (DialogInterface dialog, int which) -> {
final UserHandle user = userHandles.get(which); final UserHandle user = userHandles.get(which);
// Show menu on top level items. // Show menu on top level items.
final Intent intent = pref.getIntent(); final Intent intent = pref.getIntent()
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
context.startActivityAsUser(intent, user); context.startActivityAsUser(intent, user);
}) })
.show(); .show();
} }
} }
}
} }