Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fa5f720 authored by Varun Shah's avatar Varun Shah Committed by android-build-merger
Browse files

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

am: 4e27d29e

Change-Id: I3c868ab4d881c1866a334420fc5bdf8efdea4af9
parents 2915d756 4e27d29e
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -27,12 +27,17 @@
              android:layout_height="0dp"
              android:layout_weight="1"
              android:scrollbars = "vertical"
              android:padding="?dialogPreferredPadding"
              android:paddingStart="24dp"
              android:paddingEnd="24dp"
              android:paddingTop="12dp"
              android:paddingBottom="6dp"
              android:gravity="center_vertical"/>

    <TextView android:id="@+id/admin_warning_simplified"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
              android:paddingStart="?dialogPreferredPadding"
              android:paddingEnd="?dialogPreferredPadding"/>
              android:paddingStart="24dp"
              android:paddingEnd="24dp"
              android:paddingTop="6dp"
              android:paddingBottom="12dp"/>
</LinearLayout>
+1 −1
Original line number Diff line number Diff line
@@ -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();