Merge "Update design for Family Link supervision enrollment dialog." into qt-dev am: 4e27d29e6d am: dfdac2d9e0

am: b4432823ee Change-Id: I331c704139f2c50a1310c88d00683edf92d494d7
2019-05-24 16:42:10 -07:00
parent a0017cc2f3 b4432823ee
commit 783985296f
2 changed files with 9 additions and 4 deletions
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
@@ -312,7 +312,7 @@ public class DeviceAdminAdd extends Activity {
                            addAndFinish();
                        }
                    })
-                    .setNeutralButton(R.string.cancel, null)
+                    .setNegativeButton(R.string.cancel, null)
                    .setOnDismissListener(new DialogInterface.OnDismissListener() {
                        public void onDismiss(DialogInterface dialogInterface) {
                            finish();