diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/activity_main.xml | 2 | ||||
| -rw-r--r-- | res/layout/save_apply_button.xml | 25 | ||||
| -rw-r--r-- | res/layout/save_apply_button_2.xml | 37 |
3 files changed, 18 insertions, 46 deletions
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index 834a525..54d0eb3 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -31,7 +31,7 @@ </LinearLayout> <include layout="@layout/component_selector"/> - <include layout="@layout/save_apply_button_2"/> + <include layout="@layout/save_apply_button"/> <include layout="@layout/shop_themes"/> </FrameLayout> diff --git a/res/layout/save_apply_button.xml b/res/layout/save_apply_button.xml index 79a5ff8..70d3b18 100644 --- a/res/layout/save_apply_button.xml +++ b/res/layout/save_apply_button.xml @@ -8,18 +8,27 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom|left" - android:background="#000000" android:visibility="gone"> - <Button - android:id="@+id/save_apply_button" + <LinearLayout + android:orientation="horizontal" android:layout_width="match_parent" - android:layout_height="48dp" - android:text="@string/save_and_apply_title" - android:textAllCaps="true" - android:textColor="@android:color/white" - android:background="@drawable/save_apply_button_selector"/> + android:layout_height="wrap_content"> + <Space + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1"/> + + <Button + android:id="@+id/save_apply_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:layout_marginBottom="8dp" + android:background="@drawable/save_apply_button_selector"/> + + </LinearLayout> <Space android:id="@+id/navbar_padding" android:layout_width="match_parent" diff --git a/res/layout/save_apply_button_2.xml b/res/layout/save_apply_button_2.xml deleted file mode 100644 index e255bb1..0000000 --- a/res/layout/save_apply_button_2.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 Cyanogen, Inc. ---> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/save_apply_layout" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom|left" - android:visibility="gone"> - - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <Space - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1"/> - - <Button - android:id="@+id/save_apply_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="8dp" - android:layout_marginBottom="8dp" - android:background="@drawable/save_apply_button_selector_2"/> - - </LinearLayout> - <Space - android:id="@+id/navbar_padding" - android:layout_width="match_parent" - android:layout_height="@*android:dimen/system_bar_height"/> - -</LinearLayout>
\ No newline at end of file |