diff options
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
4 files changed, 9 insertions, 9 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml index bcbb5f5c1..50134f4e7 100644 --- a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml +++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml @@ -17,9 +17,9 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:divider="@drawable/abs__list_divider_holo_light" android:dividerPadding="12dp" android:orientation="horizontal" + android:divider="@drawable/abc_list_divider_holo_light" android:showDividers="end" > <include layout="@layout/actionbar_include_done_button" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml index 8c8428e75..1d0476361 100644 --- a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml +++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml @@ -17,10 +17,10 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:divider="@drawable/abs__list_divider_holo_light" android:dividerPadding="12dp" + android:divider="@drawable/abc_list_divider_holo_light" android:orientation="horizontal" - android:showDividers="middle" > + android:showDividers="middle"> <include layout="@layout/actionbar_include_cancel_button" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml index 0f0521d3c..5fd36286b 100644 --- a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml +++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml @@ -16,14 +16,13 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/actionbar_cancel" - style="@style/Widget.Sherlock.ActionButton" + style="@style/Widget.AppCompat.ActionButton" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_weight="1" > + android:layout_weight="1"> <TextView android:id="@+id/actionbar_cancel_text" - style="@style/Widget.Sherlock.ActionBar.TabText" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" @@ -31,6 +30,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:paddingRight="20dp" + style="@style/Widget.AppCompat.Light.ActionBar.TabText" android:text="Cancel (set in-code!)" /> </FrameLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml index 54e5933e3..e51f63c80 100644 --- a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml +++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml @@ -16,14 +16,13 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/actionbar_done" - style="@style/Widget.Sherlock.ActionButton" + style="@style/Widget.AppCompat.ActionButton" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_weight="1" > + android:layout_weight="1"> <TextView android:id="@+id/actionbar_done_text" - style="@style/Widget.Sherlock.ActionBar.TabText" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" @@ -31,6 +30,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:paddingRight="20dp" + style="@style/Widget.AppCompat.Light.ActionBar.TabText" android:text="Done (set in-code!)" /> </FrameLayout>
\ No newline at end of file |