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

Merge "Add policy transparency to Settings > device administrators"

Browse Source
This commit is contained in:
Nicolas Prévot
2017-01-30 11:24:00 +00:00
committed by Android (Google) Code Review
parent ea40813d04 4735488902
commit 67b3450f33
2 changed files with 61 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
res/layout/device_admin_add.xml
View File

@@ -129,14 +129,25 @@
android:orientation="vertical"
android:divider="?android:attr/dividerHorizontal"
android:showDividers="beginning|middle|end">
<Button android:id="@+id/action_button"
android:layout_width="match_parent"
android:layout_gravity="start"
android:gravity="start|center_vertical"
android:maxLines="2"
style="?android:attr/buttonBarButtonStyle"
android:textAllCaps="false"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/restricted_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical">
<Button android:id="@+id/action_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:gravity="start|center_vertical"
android:maxLines="2"
style="?android:attr/buttonBarButtonStyle"
android:clickable="false"
android:focusable="false"
android:textAllCaps="false"
/>
<include layout="@layout/restricted_icon" />
</LinearLayout>
<Button android:id="@+id/cancel_button"
android:layout_width="match_parent"
android:layout_gravity="end"