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
This commit is contained in:
TreeHugger Robot
2019-05-30 18:32:54 +00:00
committed by Android (Google) Code Review
parent d164bf2309 83f0d24f67
commit c9364bffbc
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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