moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-24 01:32:16 -05:00
Code Issues Releases Wiki Activity

More toolbar fixes

Browse Source
This commit is contained in:
Dominik Schürmann 2015-02-03 18:10:13 +01:00
parent b77bbb6027
commit 9e011860c4
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java
View File

@ -57,6 +57,7 @@ public class AccountSettingsActivity extends BaseActivity {
finish(); finish();
} }
}); });
setTitle(null);
mAccountSettingsFragment = (AccountSettingsFragment) getSupportFragmentManager().findFragmentById( mAccountSettingsFragment = (AccountSettingsFragment) getSupportFragmentManager().findFragmentById(
R.id.api_account_settings_fragment); R.id.api_account_settings_fragment);

10
OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
View File

@ -10,20 +10,20 @@
<RelativeLayout <RelativeLayout
android:id="@+id/toolbar_big" android:id="@+id/toolbar_big"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="120dp" android:layout_height="@dimen/big_toolbar"
android:elevation="4dp" android:elevation="4dp"
android:background="?attr/colorPrimaryDark" android:background="?attr/colorPrimary"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/statusBar" android:id="@+id/status_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/statusMargin" android:layout_height="@dimen/statusbar_margin"
android:background="?attr/colorPrimary" /> android:background="?attr/colorPrimary" />
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_below="@+id/statusBar" android:layout_below="@+id/status_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize"

12
OpenKeychain/src/main/res/layout/toolbar_standalone.xml
View File

@ -2,24 +2,24 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" 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_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content">
<ImageView <ImageView
android:id="@+id/statusBar" android:id="@+id/status_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/statusMargin" android:layout_height="@dimen/statusbar_margin"
android:background="?attr/colorPrimary" /> android:background="?attr/colorPrimary" />
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_below="@+id/statusBar" android:layout_below="@+id/status_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize"
android:background="?attr/colorPrimary" android:background="?attr/colorPrimary"
android:elevation="4dp"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light" app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
tools:ignore="UnusedAttribute" /> tools:ignore="UnusedAttribute" />

6
OpenKeychain/src/main/res/values-v21/dimens.xml Normal file
View File

@ -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>

2
OpenKeychain/src/main/res/values/dimens.xml
View File

@ -1,3 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<dimen name="statusbar_margin">0dp</dimen>
<dimen name="big_toolbar">120dp</dimen>
</resources> </resources>