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 am: df1cbdcf56

Browse Source 
am: 29fca4709f

* commit '29fca4709f48ca2d9fc786f6dfe3326301c3f9d8':
  Update the admin app icon in the support dialog.
This commit is contained in:
Sudheer Shanka
2016-02-24 14:41:37 +00:00
committed by android-build-merger
parent 5164f9a4ea 29fca4709f
commit 6a672d509c
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);
} }
} }