diff options
Diffstat (limited to 'OpenKeychain')
34 files changed, 118 insertions, 96 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java index fa72f4de3..c6b8b186c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java @@ -21,6 +21,7 @@ import android.app.Activity; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.database.Cursor; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; @@ -48,7 +49,6 @@ import java.security.NoSuchAlgorithmException; public class AppSettingsActivity extends BaseActivity { private Uri mAppUri; - private AccountsListFragment mAccountsListFragment; private AppSettingsAllowedKeysListFragment mAllowedKeysFragment; private TextView mAppNameView; @@ -58,6 +58,11 @@ public class AppSettingsActivity extends BaseActivity { private FloatingActionButton mStartFab; + // deprecated API + private AccountsListFragment mAccountsListFragment; + private TextView mAccountsLabel; + + // model AppSettings mAppSettings; @@ -65,6 +70,7 @@ public class AppSettingsActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + mAccountsLabel = (TextView) findViewById(R.id.api_accounts_label); mAppNameView = (TextView) findViewById(R.id.api_app_settings_app_name); mAppIconView = (ImageView) findViewById(R.id.api_app_settings_app_icon); mPackageName = (TextView) findViewById(R.id.api_app_settings_package_name); @@ -199,16 +205,22 @@ public class AppSettingsActivity extends BaseActivity { return; } - // Create an instance of the fragment - mAccountsListFragment = AccountsListFragment.newInstance(accountsUri); - mAllowedKeysFragment = AppSettingsAllowedKeysListFragment.newInstance(allowedKeysUri); + // show accounts only if available (deprecated API) + Cursor cursor = getContentResolver().query(accountsUri, null, null, null, null); + if (cursor.moveToFirst()) { + mAccountsLabel.setVisibility(View.VISIBLE); + mAccountsListFragment = AccountsListFragment.newInstance(accountsUri); + // Create an instance of the fragments + getSupportFragmentManager().beginTransaction() + .replace(R.id.api_accounts_list_fragment, mAccountsListFragment) + .commitAllowingStateLoss(); + } + // Create an instance of the fragments + mAllowedKeysFragment = AppSettingsAllowedKeysListFragment.newInstance(allowedKeysUri); // Add the fragment to the 'fragment_container' FrameLayout // NOTE: We use commitAllowingStateLoss() to prevent weird crashes! getSupportFragmentManager().beginTransaction() - .replace(R.id.api_accounts_list_fragment, mAccountsListFragment) - .commitAllowingStateLoss(); - getSupportFragmentManager().beginTransaction() .replace(R.id.api_allowed_keys_list_fragment, mAllowedKeysFragment) .commitAllowingStateLoss(); // do it immediately! diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java index 7037b5536..03bb2f733 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java @@ -26,7 +26,6 @@ import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.LinearLayout; import android.widget.TextView; import org.sufficientlysecure.keychain.R; @@ -127,12 +126,4 @@ public abstract class BaseActivity extends ActionBarActivity { ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); } -// public void add() { -// LayoutInflater inflater = LayoutInflater.from(mToolbar.getContext()); -// View view = inflater.inflate(R.layout.api_app_settings_fragment, null); -// Toolbar.LayoutParams layoutParams = new Toolbar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); -//// layoutParams.gravity = Gravity.BOTTOM; -// mToolbar.addView(view, layoutParams); -// } - } diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml index b12bfb080..f88225a66 100644 --- a/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml +++ b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> 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 cdf450f6e..a59bca59b 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml @@ -30,11 +30,10 @@ <LinearLayout android:layout_below="@+id/toolbar" - android:paddingLeft="48dp" - android:paddingBottom="8dp" - android:paddingRight="72dp" + android:layout_marginLeft="48dp" + android:layout_marginRight="72dp" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content"> <ImageView android:id="@+id/api_app_settings_app_icon" @@ -84,9 +83,11 @@ android:orientation="vertical" /> <TextView + android:id="@+id/api_accounts_label" style="@style/SectionHeader" android:layout_width="match_parent" android:layout_height="wrap_content" + android:visibility="gone" android:text="@string/api_settings_accounts" /> <FrameLayout @@ -95,6 +96,12 @@ android:layout_height="match_parent" android:orientation="vertical" /> + <TextView + style="@style/SectionHeader" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/api_settings_advanced" /> + <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/OpenKeychain/src/main/res/layout/api_remote_create_account.xml b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml index f57ec9ad1..7863f3c7f 100644 --- a/OpenKeychain/src/main/res/layout/api_remote_create_account.xml +++ b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml @@ -1,16 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" + android:layout_below="@id/toolbar_include" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/api_remote_error_message.xml b/OpenKeychain/src/main/res/layout/api_remote_error_message.xml index 293443f62..0bcf40407 100644 --- a/OpenKeychain/src/main/res/layout/api_remote_error_message.xml +++ b/OpenKeychain/src/main/res/layout/api_remote_error_message.xml @@ -4,14 +4,13 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_below="@id/toolbar_include" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical"> <TextView diff --git a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml index 903a92ea4..7cb3666bf 100644 --- a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml +++ b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml @@ -1,16 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <ScrollView - android:layout_below="@id/toolbar" - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" + android:layout_below="@id/toolbar_include" android:layout_width="match_parent" android:layout_height="wrap_content"> diff --git a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml index fa0f73144..3d3d55f3c 100644 --- a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml +++ b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml @@ -4,12 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" - xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_below="@id/toolbar_include" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml index d36e9e141..fab8bc2d2 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml @@ -4,12 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" - xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_below="@id/toolbar_include" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml index 1d51e3818..e8422fb37 100644 --- a/OpenKeychain/src/main/res/layout/create_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml @@ -4,12 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" - xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_below="@id/toolbar_include" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml index 10dd7b1f9..608fce111 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml index 80b8b65fd..b97fc9c8e 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml index a5c93ec77..c8b0e3afc 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml index b8d2c2546..d292b1a5b 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:id="@+id/content_frame" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml index d5f6f9ee8..66abd03b1 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:id="@+id/content_frame" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml index dab3c4f05..6a78aa273 100644 --- a/OpenKeychain/src/main/res/layout/help_activity.xml +++ b/OpenKeychain/src/main/res/layout/help_activity.xml @@ -5,11 +5,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml index 637ea1e3f..93d630437 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml index 5760d0906..bd0239da7 100644 --- a/OpenKeychain/src/main/res/layout/key_list_content.xml +++ b/OpenKeychain/src/main/res/layout/key_list_content.xml @@ -4,12 +4,12 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout android:orientation="vertical" - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml index d3d1f6e88..5319a3ec0 100644 --- a/OpenKeychain/src/main/res/layout/key_server_preference.xml +++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/log_display_activity.xml b/OpenKeychain/src/main/res/layout/log_display_activity.xml index 8aa618280..a243a9d2b 100644 --- a/OpenKeychain/src/main/res/layout/log_display_activity.xml +++ b/OpenKeychain/src/main/res/layout/log_display_activity.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/OpenKeychain/src/main/res/layout/nfc_activity.xml b/OpenKeychain/src/main/res/layout/nfc_activity.xml index 64e239bc8..9acd0676c 100644 --- a/OpenKeychain/src/main/res/layout/nfc_activity.xml +++ b/OpenKeychain/src/main/res/layout/nfc_activity.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" diff --git a/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml b/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml index 0d608fde2..f17bc30bc 100644 --- a/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml +++ b/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/qr_code_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_activity.xml index fd495608c..11b502b34 100644 --- a/OpenKeychain/src/main/res/layout/qr_code_activity.xml +++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml index 65d198eda..c2a5b2f53 100644 --- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml +++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <ScrollView - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/OpenKeychain/src/main/res/layout/select_public_key_activity.xml b/OpenKeychain/src/main/res/layout/select_public_key_activity.xml index e14acc17b..5a607e5ec 100644 --- a/OpenKeychain/src/main/res/layout/select_public_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/select_public_key_activity.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <RelativeLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_centerHorizontal="true"> diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml index 5d83a2aa1..ff1f99e03 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml @@ -1,13 +1,27 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v7.widget.Toolbar 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" + android:id="@+id/header" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - android:background="?attr/colorPrimaryDark" - android:elevation="4dp" - app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" - app:popupTheme="@style/ThemeOverlay.AppCompat.Light" - tools:ignore="UnusedAttribute" />
\ No newline at end of file + android:layout_height="match_parent"> + + <ImageView + android:id="@+id/statusBar" + android:layout_width="match_parent" + android:layout_height="@dimen/statusMargin" + android:background="?attr/colorPrimary" /> + + <android.support.v7.widget.Toolbar + android:id="@+id/toolbar" + android:layout_below="@+id/statusBar" + 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" /> + +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml index 342052bdd..19e37783b 100644 --- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml index ddc42dd7e..0a6b46a93 100644 --- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <ScrollView - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 7084627e8..cb6456082 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -5,11 +5,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml index 991d92ed3..c7f0f50d9 100644 --- a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml @@ -4,11 +4,11 @@ android:layout_height="match_parent"> <include - android:id="@+id/toolbar" + android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> <LinearLayout - android:layout_below="@id/toolbar" + android:layout_below="@id/toolbar_include" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/OpenKeychain/src/main/res/values-v21/themes.xml b/OpenKeychain/src/main/res/values-v21/themes.xml index 7ba601d79..93d534873 100644 --- a/OpenKeychain/src/main/res/values-v21/themes.xml +++ b/OpenKeychain/src/main/res/values-v21/themes.xml @@ -2,6 +2,8 @@ <resources> <style name="KeychainTheme" parent="KeychainTheme.Base"> + <item name="android:windowTranslucentStatus">true</item> + <item name="android:windowContentTransitions">true</item> <item name="android:windowAllowEnterTransitionOverlap">true</item> <item name="android:windowAllowReturnTransitionOverlap">true</item> diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index e4dbbc968..48fe11798 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -12,12 +12,12 @@ <color name="black_translucent">#80000000</color> <!-- Palette generated by Material Palette materialpalette.com/green/indigo --> - <color name="colorPrimary">#4CAF50</color> - <color name="colorPrimaryDark">#388E3C</color> + <color name="colorPrimary">#8bc34a</color> + <color name="colorPrimaryDark">#558b2f</color> <!-- TODO: --> - <color name="primary">#4CAF50</color> - <color name="primary_dark">#388E3C</color> + <color name="primary">#8bc34a</color> + <color name="primary_dark">#558b2f</color> <color name="primary_light">#C8E6C9</color> <color name="accent">#00BCD4</color> <color name="fab">#00BCD4</color> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 2fd74f5a4..23b549660 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -488,7 +488,8 @@ <string name="api_settings_delete_account">"Delete account"</string> <string name="api_settings_package_name">"Package Name"</string> <string name="api_settings_package_signature">"SHA-256 of Package Signature"</string> - <string name="api_settings_accounts">"Accounts"</string> + <string name="api_settings_accounts">"Accounts (deprecated API)"</string> + <string name="api_settings_advanced">"Advanced Information"</string> <string name="api_settings_allowed_keys">"Allowed Keys"</string> <string name="api_settings_settings">"Settings"</string> <string name="api_settings_key">"Account key:"</string> diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 075f538e6..f1d1ea490 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -6,10 +6,11 @@ <!--<style name="KeychainTheme.Base" parent="HoloKeychainTheme">--> <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light.NoActionBar"> <item name="colorPrimary">@color/colorPrimary</item> - <item name="colorPrimaryDark">@color/colorPrimary</item> + <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorAccent">@color/accent</item> <item name="android:windowNoTitle">true</item> + <!-- remove actionbar, we use toolbar! --> <item name="windowActionBar">false</item> <item name="searchViewStyle">@style/MySearchViewStyle</item> |