cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix elevation

Browse Source
This commit is contained in:
Dominik Schürmann
2015-03-06 01:12:33 +01:00
parent 0bb3b9c6cc
commit eaf7e5e005
7 changed files with 78 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java
View File

@@ -76,8 +76,8 @@ public class ViewKeyAdvActivity extends BaseActivity implements
mExportHelper = new ExportHelper(this); mExportHelper = new ExportHelper(this);
mProviderHelper = new ProviderHelper(this); mProviderHelper = new ProviderHelper(this);
mViewPager = (ViewPager) findViewById(R.id.view_key_pager); mViewPager = (ViewPager) findViewById(R.id.pager);
mSlidingTabLayout = (PagerSlidingTabStrip) findViewById(R.id.view_key_sliding_tab_layout); mSlidingTabLayout = (PagerSlidingTabStrip) findViewById(R.id.sliding_tab_layout);
int switchToTab = TAB_MAIN; int switchToTab = TAB_MAIN;
Intent intent = getIntent(); Intent intent = getIntent();

35
OpenKeychain/src/main/res/layout/help_activity.xml
View File

@@ -1,33 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
<include <include
android:id="@+id/toolbar_include" android:id="@+id/toolbar_tabs"
layout="@layout/toolbar_standalone" /> layout="@layout/toolbar_tabs" />
<LinearLayout <android.support.v4.view.ViewPager
android:layout_below="@id/toolbar_include" android:id="@+id/pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent" />
android:orientation="vertical"
android:elevation="4dp">
<com.astuetz.PagerSlidingTabStrip </LinearLayout>
android:id="@+id/sliding_tab_layout"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:textColor="@color/tab_text"
app:pstsTextColorSelected="@color/tab_text_selected"
app:pstsIndicatorColor="@color/tab_indicator" />
<android.support.v4.view.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</RelativeLayout>

26
OpenKeychain/src/main/res/layout/toolbar_inner_layout.xml Normal file
View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<merge 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">
<!--
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_height"
android:background="@color/transparent" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_below="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
android:background="@color/transparent"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
tools:ignore="UnusedAttribute" />
</merge>

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

@@ -1,31 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<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:tools="http://schemas.android.com/tools"
android:id="@+id/toolbar_include" android:id="@+id/toolbar_include"
android:elevation="4dp" android:elevation="4dp"
android:background="?attr/colorPrimary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<!-- <include
We always have windowTranslucentStatus=true to get under the status bar. android:id="@+id/toolbar_inner_layout"
Thus this ImageView is the part under the status bar! layout="@layout/toolbar_inner_layout" />
-->
<ImageView
android:id="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/statusbar_height"
android:background="?attr/colorPrimary" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_below="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
tools:ignore="UnusedAttribute" />
</RelativeLayout> </RelativeLayout>

26
OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml
View File

@@ -1,31 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<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:tools="http://schemas.android.com/tools"
android:id="@+id/toolbar_include" android:id="@+id/toolbar_include"
android:elevation="4dp" android:elevation="4dp"
android:background="@color/android_orange_light"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<!-- <include
We always have windowTranslucentStatus=true to get under the status bar. android:id="@+id/toolbar_inner_layout"
Thus this ImageView is the part under the status bar! layout="@layout/toolbar_inner_layout" />
-->
<ImageView
android:id="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/statusbar_height"
android:background="@color/android_orange_light" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_below="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
android:background="@color/android_orange_light"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
tools:ignore="UnusedAttribute" />
</RelativeLayout> </RelativeLayout>

24
OpenKeychain/src/main/res/layout/toolbar_tabs.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar_include"
android:elevation="4dp"
android:background="?attr/colorPrimary"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
android:id="@+id/toolbar_inner_layout"
layout="@layout/toolbar_inner_layout" />
<com.astuetz.PagerSlidingTabStrip
android:id="@+id/sliding_tab_layout"
android:layout_below="@id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:textColor="@color/tab_text"
app:pstsTextColorSelected="@color/tab_text_selected"
app:pstsIndicatorColor="@color/tab_indicator" />
</RelativeLayout>

43
OpenKeychain/src/main/res/layout/view_key_adv_activity.xml
View File

@@ -1,41 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
<include <include
android:id="@+id/toolbar_include" android:id="@+id/toolbar_tabs"
layout="@layout/toolbar_standalone" /> layout="@layout/toolbar_tabs" />
<LinearLayout <android.support.v4.view.ViewPager
android:layout_below="@id/toolbar_include" android:id="@+id/pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent" />
android:orientation="vertical">
<View </LinearLayout>
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider"
android:visibility="gone"
android:id="@+id/view_key_status_divider" />
<com.astuetz.PagerSlidingTabStrip
android:id="@+id/view_key_sliding_tab_layout"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:textColor="@color/tab_text"
app:pstsTextColorSelected="@color/tab_text_selected"
app:pstsIndicatorColor="@color/tab_indicator" />
<android.support.v4.view.ViewPager
android:id="@+id/view_key_pager"
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1"
android:background="@android:color/white" />
</LinearLayout>
</RelativeLayout>