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

* commit 'df1cbdcf56945c0eb86ecbfd247341b94b0aa563':
  Update the admin app icon in the support dialog.
This commit is contained in:
Sudheer Shanka
2016-02-24 14:37:38 +00:00
committed by android-build-merger
parent 59ed2c9dcf df1cbdcf56
commit 29fca4709f
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(
R.layout.admin_support_details_dialog, null);
setAdminSupportDetails(this, mDialogView, mEnforcedAdmin, true);
initializeDialogViews(mDialogView, mEnforcedAdmin.component, mEnforcedAdmin.userId);
new AlertDialog.Builder(this)
.setView(mDialogView)
@@ -75,7 +75,7 @@ public class ShowAdminSupportDetailsDialog extends Activity
EnforcedAdmin admin = getAdminDetailsFromIntent(intent);
if (!mEnforcedAdmin.equals(admin)) {
mEnforcedAdmin = admin;
setAdminSupportDetails(this, mDialogView, mEnforcedAdmin, true);
initializeDialogViews(mDialogView, mEnforcedAdmin.component, mEnforcedAdmin.userId);
}
}