diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-03-03 17:50:29 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-03 17:50:29 -0800 |
commit | 1c19940fa4e07653b6add268e58c928b7532af8a (patch) | |
tree | d3a00f8c24596f40e88513ddd910e744f4dc2c6f /res | |
parent | d5f121c66ab83f5304fca37c14ac519fcd530fb8 (diff) | |
parent | 97de6bccfe81655a16feb988da1d208f95a8d6e3 (diff) | |
download | packages_apps_settings-1c19940fa4e07653b6add268e58c928b7532af8a.zip packages_apps_settings-1c19940fa4e07653b6add268e58c928b7532af8a.tar.gz packages_apps_settings-1c19940fa4e07653b6add268e58c928b7532af8a.tar.bz2 |
Merge "Fix issue #2477264: "Force Stop" in "Manage Applications" is not working"
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/device_admin_add.xml | 9 |
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> |