From 7914aa5c08d25306be0def7873fe850514e89cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 3 Feb 2015 16:05:18 +0100 Subject: Toolbar fixes, Toolbar under status bar on Lollipop --- .../keychain/remote/ui/AppSettingsActivity.java | 26 +++++++++++++----- .../keychain/ui/BaseActivity.java | 9 ------ .../res/layout/api_account_settings_activity.xml | 4 +-- .../main/res/layout/api_app_settings_activity.xml | 15 +++++++--- .../main/res/layout/api_remote_create_account.xml | 7 ++--- .../main/res/layout/api_remote_error_message.xml | 9 +++--- .../main/res/layout/api_remote_register_app.xml | 7 ++--- .../main/res/layout/api_remote_select_pub_keys.xml | 5 ++-- .../src/main/res/layout/certify_key_activity.xml | 5 ++-- .../src/main/res/layout/create_key_activity.xml | 5 ++-- .../src/main/res/layout/decrypt_files_activity.xml | 4 +-- .../src/main/res/layout/decrypt_text_activity.xml | 4 +-- .../src/main/res/layout/edit_key_activity.xml | 4 +-- .../src/main/res/layout/encrypt_files_activity.xml | 4 +-- .../src/main/res/layout/encrypt_text_activity.xml | 4 +-- OpenKeychain/src/main/res/layout/help_activity.xml | 4 +-- .../src/main/res/layout/import_keys_activity.xml | 4 +-- .../src/main/res/layout/key_list_content.xml | 4 +-- .../src/main/res/layout/key_server_preference.xml | 4 +-- .../src/main/res/layout/log_display_activity.xml | 4 +-- OpenKeychain/src/main/res/layout/nfc_activity.xml | 4 +-- .../res/layout/preference_toolbar_activity.xml | 2 +- .../src/main/res/layout/qr_code_activity.xml | 4 +-- .../src/main/res/layout/safe_slinger_activity.xml | 4 +-- .../main/res/layout/select_public_key_activity.xml | 4 +-- .../src/main/res/layout/toolbar_standalone.xml | 32 ++++++++++++++++------ .../src/main/res/layout/upload_key_activity.xml | 4 +-- .../src/main/res/layout/view_cert_activity.xml | 4 +-- .../src/main/res/layout/view_key_activity.xml | 4 +-- .../main/res/layout/view_key_advanced_activity.xml | 4 +-- OpenKeychain/src/main/res/values-v21/themes.xml | 2 ++ OpenKeychain/src/main/res/values/colors.xml | 8 +++--- OpenKeychain/src/main/res/values/strings.xml | 3 +- OpenKeychain/src/main/res/values/themes.xml | 3 +- 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,15 +205,21 @@ 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(); 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"> 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 @@ + android:layout_height="wrap_content"> + + 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"> 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"> 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"> 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"> 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"> 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"> 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"> 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"> 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"> 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"> 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"> \ 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"> 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"> 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"> 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 @@ - \ No newline at end of file + android:layout_height="match_parent"> + + + + + + 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"> 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"> 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"> 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"> 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 @@