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

Merge "Update the admin app icon in the support dialog." into nyc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2016-02-24 14:32:53 +00:00
committed by Android (Google) Code Review
parent 346c1f4f24 e3dbfb1a6b
commit df1cbdcf56
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/ShowAdminSupportDetailsDialog.java
View File

@@ -60,7 +60,7 @@ public class ShowAdminSupportDetailsDialog extends Activity
mDialogView = LayoutInflater.from(this).inflate( mDialogView = LayoutInflater.from(this).inflate(
R.layout.admin_support_details_dialog, null); R.layout.admin_support_details_dialog, null);
setAdminSupportDetails(this, mDialogView, mEnforcedAdmin, true); initializeDialogViews(mDialogView, mEnforcedAdmin.component, mEnforcedAdmin.userId);
new AlertDialog.Builder(this) new AlertDialog.Builder(this)
.setView(mDialogView) .setView(mDialogView)
@@ -75,7 +75,7 @@ public class ShowAdminSupportDetailsDialog extends Activity
EnforcedAdmin admin = getAdminDetailsFromIntent(intent); EnforcedAdmin admin = getAdminDetailsFromIntent(intent);
if (!mEnforcedAdmin.equals(admin)) { if (!mEnforcedAdmin.equals(admin)) {
mEnforcedAdmin = admin; mEnforcedAdmin = admin;
setAdminSupportDetails(this, mDialogView, mEnforcedAdmin, true); initializeDialogViews(mDialogView, mEnforcedAdmin.component, mEnforcedAdmin.userId);
} }
} }