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

Only show headers in Master Clear when there are multiple profiles

Browse Source 
The Master Clear dialog lists the accounts whose data will be lost by
a factory reset. The list contains the headings "Personal" and "Work"
to distinguish accounts in the main user and the work profile. When
there is no work profile, the header (only "Personal" would be shown in
this case) is superfluous and misleading (as the user may be using the
device for work).

Bug: 30132270
Test: Manual :(

Change-Id: Id493652fc331d4500c4d772a9abcc716995565b3
(cherry picked from commit 30ba868014)
This commit is contained in:
Bartosz Fabianowski
2017-04-19 11:51:43 +02:00
parent 008a9adef9
commit 28ec98cd1f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/MasterClear.java
View File

@@ -284,11 +284,13 @@ public class MasterClear extends OptionsMenuFragment
.getAuthenticatorTypesAsUser(profileId);
final int M = descs.length;
View titleView = Utils.inflateCategoryHeader(inflater, contents);
final TextView titleText = (TextView) titleView.findViewById(android.R.id.title);
titleText.setText(userInfo.isManagedProfile() ? R.string.category_work
: R.string.category_personal);
contents.addView(titleView);
if (profilesSize > 1) {
View titleView = Utils.inflateCategoryHeader(inflater, contents);
final TextView titleText = (TextView) titleView.findViewById(android.R.id.title);
titleText.setText(userInfo.isManagedProfile() ? R.string.category_work
: R.string.category_personal);
contents.addView(titleView);
}
for (int i = 0; i < N; i++) {
Account account = accounts[i];