summaryrefslogtreecommitdiffstats
path: root/res/layout/device_admin_add.xml
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-03-03 17:18:13 -0800
committerDianne Hackborn <hackbod@google.com>2010-03-03 17:18:13 -0800
commit97de6bccfe81655a16feb988da1d208f95a8d6e3 (patch)
tree5b0d660f0d7abe3df67c6b6b4939617a6262ee82 /res/layout/device_admin_add.xml
parent65daa5f593a2ed59805a629cba4767ae89771bc8 (diff)
downloadpackages_apps_Settings-97de6bccfe81655a16feb988da1d208f95a8d6e3.zip
packages_apps_Settings-97de6bccfe81655a16feb988da1d208f95a8d6e3.tar.gz
packages_apps_Settings-97de6bccfe81655a16feb988da1d208f95a8d6e3.tar.bz2
Fix issue #2477264: "Force Stop" in "Manage Applications" is not working
Also add cancel button when adding a device admin.
Diffstat (limited to 'res/layout/device_admin_add.xml')
-rw-r--r--res/layout/device_admin_add.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index 3ff190b..f560331 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -104,5 +104,14 @@
android:layout_width="0dip"
android:layout_height="0dip"
android:layout_weight="1" />
+ <Button android:id="@+id/cancel_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/cancel" />
+ <View
+ android:layout_width="0dip"
+ android:layout_height="0dip"
+ android:layout_weight="1" />
</LinearLayout>
</LinearLayout>