diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-15 03:16:46 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-15 03:16:46 +0100 |
| commit | b0cb0346c17d4f136cbcc3660ff173584fe2b9c7 (patch) | |
| tree | a614b149a06fa336537092fc6d04a6b7d69bad05 /OpenKeychain/src/main/res/layout | |
| parent | cf51366bb7863f68989e30dba86a0d2dc1e41ce3 (diff) | |
| parent | a41e6e0c705e8c927d1f905fad9b36e810dc5acc (diff) | |
| download | open-keychain-b0cb0346c17d4f136cbcc3660ff173584fe2b9c7.tar.gz open-keychain-b0cb0346c17d4f136cbcc3660ff173584fe2b9c7.tar.bz2 open-keychain-b0cb0346c17d4f136cbcc3660ff173584fe2b9c7.zip | |
Merge branch 'master' into v/decrypt-key-lookup
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
3 files changed, 43 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml index 26cedd362..6aaf5be25 100644 --- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml +++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml @@ -3,6 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="match_parent" android:layout_width="match_parent" + xmlns:tools="http://schemas.android.com/tools" + xmlns:custom="http://schemas.android.com/apk/res-auto" > <!--rebuild functionality of ListFragment --> @@ -23,10 +25,11 @@ <LinearLayout android:id="@+id/key_list_empty" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="240dp" android:gravity="center" android:orientation="vertical" - android:visibility="visible"> + android:animateLayoutChanges="true" + > <TextView android:layout_width="wrap_content" @@ -35,6 +38,30 @@ android:text="@string/key_list_empty_text1" android:textAppearance="?android:attr/textAppearanceLarge" /> + <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/search_container" + android:inAnimation="@anim/fade_in_delayed" + android:outAnimation="@anim/fade_out" + android:measureAllChildren="true" + custom:initialView="1"> + + <Space + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + android:id="@+id/search_button" + android:gravity="center" + tools:text="@string/btn_search_for_query" + /> + + </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> + </LinearLayout> </FrameLayout> diff --git a/OpenKeychain/src/main/res/layout/qr_code_capture_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_capture_activity.xml new file mode 100644 index 000000000..094901740 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/qr_code_capture_activity.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <com.journeyapps.barcodescanner.CompoundBarcodeView + android:id="@+id/zxing_barcode_scanner" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_alignParentBottom="true" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/toolbar_tabs.xml b/OpenKeychain/src/main/res/layout/toolbar_tabs.xml index ed42ef52e..315aaf75a 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_tabs.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_tabs.xml @@ -18,7 +18,7 @@ android:layout_height="?attr/actionBarSize" android:background="?attr/colorPrimary" android:textColor="?attr/colorTabText" - app:pstsTextColorSelected="?attr/colorTabTextSelected" + app:pstsTabTextColor="?attr/colorTabTextSelected" app:pstsIndicatorColor="?attr/colorTabIndicator" /> </RelativeLayout> |