Merge "Update design for Family Link supervision enrollment dialog." into qt-dev

am: 4e27d29e6d Change-Id: I3c868ab4d881c1866a334420fc5bdf8efdea4af9
2019-05-23 13:53:07 -07:00
parent 2915d75658 4e27d29e6d
commit 8fa5f72067
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();