Merge "Fix rendering of policy transparency activity." into nyc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
98704bc495
@@ -59,14 +59,13 @@ public class ShowAdminSupportDetailsDialog extends Activity
|
|||||||
mDpm = getSystemService(DevicePolicyManager.class);
|
mDpm = getSystemService(DevicePolicyManager.class);
|
||||||
mEnforcedAdmin = getAdminDetailsFromIntent(getIntent());
|
mEnforcedAdmin = getAdminDetailsFromIntent(getIntent());
|
||||||
|
|
||||||
mDialogView = LayoutInflater.from(this).inflate(
|
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||||
|
mDialogView = LayoutInflater.from(builder.getContext()).inflate(
|
||||||
R.layout.admin_support_details_dialog, null);
|
R.layout.admin_support_details_dialog, null);
|
||||||
initializeDialogViews(mDialogView, mEnforcedAdmin.component, mEnforcedAdmin.userId);
|
initializeDialogViews(mDialogView, mEnforcedAdmin.component, mEnforcedAdmin.userId);
|
||||||
|
builder.setOnDismissListener(this)
|
||||||
new AlertDialog.Builder(this)
|
|
||||||
.setView(mDialogView)
|
|
||||||
.setPositiveButton(R.string.okay, null)
|
.setPositiveButton(R.string.okay, null)
|
||||||
.setOnDismissListener(this)
|
.setView(mDialogView)
|
||||||
.show();
|
.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user