Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f3a3d04b: Merge "Fix order of buttons for device admin toggle"

Browse Source 
* commit 'f3a3d04bba3441318d27db4e3845dc5ad44459d6':
  Fix order of buttons for device admin toggle
This commit is contained in:
Ben Komalo
2011-09-01 16:54:49 -07:00
committed by Android Git Automerger
parent 2f444f9039 f3a3d04bba
commit 6a7b1ba95d
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/layout/device_admin_add.xml
View File

@@ -120,13 +120,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone" /> android:visibility="gone" />
<Button android:id="@+id/action_button"
android:layout_width="0dip"
android:layout_gravity="left"
android:layout_weight="1"
android:maxLines="2"
style="?android:attr/buttonBarButtonStyle"
android:layout_height="wrap_content" />
<Button android:id="@+id/cancel_button" <Button android:id="@+id/cancel_button"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_gravity="right" android:layout_gravity="right"
@@ -135,6 +128,13 @@
android:text="@string/cancel" android:text="@string/cancel"
style="?android:attr/buttonBarButtonStyle" style="?android:attr/buttonBarButtonStyle"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<Button android:id="@+id/action_button"
android:layout_width="0dip"
android:layout_gravity="left"
android:layout_weight="1"
android:maxLines="2"
style="?android:attr/buttonBarButtonStyle"
android:layout_height="wrap_content" />
<LinearLayout android:id="@+id/rightSpacer" <LinearLayout android:id="@+id/rightSpacer"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_weight="0.25" android:layout_weight="0.25"