diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
4 files changed, 12 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml index c7b8c9b3a..253836080 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml @@ -18,7 +18,7 @@ <ImageView android:id="@+id/status_bar" android:layout_width="match_parent" - android:layout_height="@dimen/statusbar_margin" + android:layout_height="@dimen/statusbar_height" android:background="?attr/colorPrimary" /> <android.support.v7.widget.Toolbar diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml index 61737e548..ba80214a6 100644 --- a/OpenKeychain/src/main/res/layout/first_time_activity.xml +++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml @@ -7,7 +7,7 @@ <ImageView android:id="@+id/status_bar" android:layout_width="match_parent" - android:layout_height="@dimen/statusbar_margin" /> + android:layout_height="@dimen/statusbar_height" /> <LinearLayout android:id="@+id/first_time_buttons" diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml index 0c3c6404a..290e56872 100644 --- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml +++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml @@ -63,18 +63,20 @@ android:layout_marginEnd="16dp"> <com.getbase.floatingactionbutton.FloatingActionButton - android:id="@+id/fab_add_cloud" + android:id="@+id/fab_add_qr_code" android:layout_width="wrap_content" android:layout_height="wrap_content" + fab:fab_icon="@drawable/qrcode" fab:fab_colorNormal="@color/fab" fab:fab_colorPressed="@color/fab_pressed" fab:fab_title="Scan QR Code" fab:fab_size="mini" /> <com.getbase.floatingactionbutton.FloatingActionButton - android:id="@+id/fab_add_qr_code" + android:id="@+id/fab_add_cloud" android:layout_width="wrap_content" android:layout_height="wrap_content" + fab:fab_icon="@drawable/ic_cloud_search_24px" fab:fab_colorNormal="@color/fab" fab:fab_colorPressed="@color/fab_pressed" fab:fab_title="Search Cloud" @@ -84,6 +86,7 @@ android:id="@+id/fab_add_file" android:layout_width="wrap_content" android:layout_height="wrap_content" + fab:fab_icon="@drawable/ic_folder_white_24dp" fab:fab_colorNormal="@color/fab" fab:fab_colorPressed="@color/fab_pressed" fab:fab_title="Import from File" diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml index cef0b862d..950c2f2ae 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml @@ -7,10 +7,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> + <!-- + We always have windowTranslucentStatus=true to get under the status bar. + Thus this ImageView is the part under the status bar! + --> <ImageView android:id="@+id/status_bar" android:layout_width="match_parent" - android:layout_height="@dimen/statusbar_margin" + android:layout_height="@dimen/statusbar_height" android:background="?attr/colorPrimary" /> <android.support.v7.widget.Toolbar |