diff options
Diffstat (limited to 'OpenKeychain/src')
5 files changed, 20 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java index fbba400a0..4d6df24d2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java @@ -57,6 +57,7 @@ public class AccountSettingsActivity extends BaseActivity { finish(); } }); + setTitle(null); mAccountSettingsFragment = (AccountSettingsFragment) getSupportFragmentManager().findFragmentById( R.id.api_account_settings_fragment); 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 f6bda3428..c7b8c9b3a 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml @@ -10,20 +10,20 @@ <RelativeLayout android:id="@+id/toolbar_big" android:layout_width="match_parent" - android:layout_height="120dp" + android:layout_height="@dimen/big_toolbar" android:elevation="4dp" - android:background="?attr/colorPrimaryDark" + android:background="?attr/colorPrimary" android:orientation="horizontal"> <ImageView - android:id="@+id/statusBar" + android:id="@+id/status_bar" android:layout_width="match_parent" - android:layout_height="@dimen/statusMargin" + android:layout_height="@dimen/statusbar_margin" android:background="?attr/colorPrimary" /> <android.support.v7.widget.Toolbar android:id="@+id/toolbar" - android:layout_below="@+id/statusBar" + android:layout_below="@+id/status_bar" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml index ff1f99e03..cef0b862d 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml @@ -2,24 +2,24 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/header" + android:id="@+id/toolbar_include" + android:elevation="4dp" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content"> <ImageView - android:id="@+id/statusBar" + android:id="@+id/status_bar" android:layout_width="match_parent" - android:layout_height="@dimen/statusMargin" + android:layout_height="@dimen/statusbar_margin" android:background="?attr/colorPrimary" /> <android.support.v7.widget.Toolbar android:id="@+id/toolbar" - android:layout_below="@+id/statusBar" + android:layout_below="@+id/status_bar" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:background="?attr/colorPrimary" - android:elevation="4dp" app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" tools:ignore="UnusedAttribute" /> diff --git a/OpenKeychain/src/main/res/values-v21/dimens.xml b/OpenKeychain/src/main/res/values-v21/dimens.xml new file mode 100644 index 000000000..d54327293 --- /dev/null +++ b/OpenKeychain/src/main/res/values-v21/dimens.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="statusbar_margin">21dp</dimen> + <!-- 120dp + statusbar_margin --> + <dimen name="big_toolbar">141dp</dimen> +</resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml index 55344e519..21ef110ea 100644 --- a/OpenKeychain/src/main/res/values/dimens.xml +++ b/OpenKeychain/src/main/res/values/dimens.xml @@ -1,3 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources> + <dimen name="statusbar_margin">0dp</dimen> + <dimen name="big_toolbar">120dp</dimen> </resources>
\ No newline at end of file |