PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 4e27d29e6d

Change-Id: I25af902f0a0f94faa8f89edf85a6657c11d6ea9d
This commit is contained in:
Varun Shah
2019-05-23 14:21:17 -07:00
committed by android-build-merger
parent 81141a5918 4e27d29e6d
commit dfdac2d9e0
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/layout/profile_owner_add.xml
View File

@@ -27,12 +27,17 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:scrollbars = "vertical" android:scrollbars = "vertical"
android:padding="?dialogPreferredPadding" android:paddingStart="24dp"
android:paddingEnd="24dp"
android:paddingTop="12dp"
android:paddingBottom="6dp"
android:gravity="center_vertical"/> android:gravity="center_vertical"/>
<TextView android:id="@+id/admin_warning_simplified" <TextView android:id="@+id/admin_warning_simplified"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="?dialogPreferredPadding" android:paddingStart="24dp"
android:paddingEnd="?dialogPreferredPadding"/> android:paddingEnd="24dp"
android:paddingTop="6dp"
android:paddingBottom="12dp"/>
</LinearLayout> </LinearLayout>

2
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
View File

@@ -312,7 +312,7 @@ public class DeviceAdminAdd extends Activity {
addAndFinish(); addAndFinish();
} }
}) })
.setNeutralButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.setOnDismissListener(new DialogInterface.OnDismissListener() { .setOnDismissListener(new DialogInterface.OnDismissListener() {
public void onDismiss(DialogInterface dialogInterface) { public void onDismiss(DialogInterface dialogInterface) {
finish(); finish();