From f5b877ca2208e0b9f14886c7f6011ffb55e6898e Mon Sep 17 00:00:00 2001 From: Ishan Khanna Date: Wed, 4 Mar 2015 02:19:59 +0530 Subject: [PATCH 1/3] Fixed Submodules --- .gitmodules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmodules b/.gitmodules index 8238c3f80..249b72479 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,9 +19,11 @@ [submodule "extern/minidns"] path = extern/minidns url = https://github.com/open-keychain/minidns.git + ignore = dirty [submodule "extern/TokenAutoComplete"] path = extern/TokenAutoComplete url = https://github.com/open-keychain/TokenAutoComplete [submodule "extern/safeslinger-exchange"] path = extern/safeslinger-exchange url = https://github.com/open-keychain/exchange-android + ignore = dirty From eedc7064b9eca0e94c9fe9aadaee98aa1317a0c5 Mon Sep 17 00:00:00 2001 From: Ishan Khanna Date: Wed, 4 Mar 2015 02:36:33 +0530 Subject: [PATCH 2/3] Fixes Issue#1088 --- .../ui/CertifyFingerprintActivity.java | 21 +++++++++++++++++++ .../keychain/ui/CertifyKeyActivity.java | 21 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java index b7c80c1ed..fcfcc9cb2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java @@ -19,7 +19,10 @@ package org.sufficientlysecure.keychain.ui; import android.net.Uri; import android.os.Bundle; +import android.support.v7.widget.Toolbar; import android.view.View; +import android.widget.ImageView; +import android.widget.RelativeLayout; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; @@ -55,6 +58,7 @@ public class CertifyFingerprintActivity extends BaseActivity { @Override protected void initLayout() { setContentView(R.layout.certify_fingerprint_activity); + changeToolbarColor(); } private void startFragment(Bundle savedInstanceState, Uri dataUri) { @@ -77,4 +81,21 @@ public class CertifyFingerprintActivity extends BaseActivity { getSupportFragmentManager().executePendingTransactions(); } + /** + * Changes the color of our ToolBar. + * + * Currently Set to ORANGE + */ + private void changeToolbarColor() { + RelativeLayout mToolBarInclude = (RelativeLayout) findViewById(R.id.toolbar_include); + + // Changes the color of the Status Bar strip + ImageView mStatusBar = (ImageView) mToolBarInclude.findViewById(R.id.status_bar); + mStatusBar.setBackgroundResource(getResources().getColor(R.color.android_orange_dark)); + + // Changes the color of our Tool Bar + Toolbar toolbar = (Toolbar) mToolBarInclude.findViewById(R.id.toolbar); + toolbar.setBackgroundResource(getResources().getColor(R.color.android_orange_light)); + } + } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java index 1fb88b182..a2e717ed2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java @@ -18,6 +18,10 @@ package org.sufficientlysecure.keychain.ui; +import android.support.v7.widget.Toolbar; +import android.widget.ImageView; +import android.widget.RelativeLayout; + import org.sufficientlysecure.keychain.R; /** @@ -32,6 +36,23 @@ public class CertifyKeyActivity extends BaseActivity { @Override protected void initLayout() { setContentView(R.layout.certify_key_activity); + changeToolbarColor(); } + /** + * Changes the color of our ToolBar. + * + * Currently Set to ORANGE + */ + private void changeToolbarColor() { + RelativeLayout mToolBarInclude = (RelativeLayout) findViewById(R.id.toolbar_include); + + // Changes the color of the Status Bar strip + ImageView mStatusBar = (ImageView) mToolBarInclude.findViewById(R.id.status_bar); + mStatusBar.setBackgroundResource(getResources().getColor(R.color.android_orange_dark)); + + // Changes the color of our Tool Bar + Toolbar toolbar = (Toolbar) mToolBarInclude.findViewById(R.id.toolbar); + toolbar.setBackgroundResource(getResources().getColor(R.color.android_orange_light)); + } } From 0362dc6c1df7e33e9c25abb5b8aed293c67f1f84 Mon Sep 17 00:00:00 2001 From: Ishan Khanna Date: Wed, 4 Mar 2015 15:47:44 +0530 Subject: [PATCH 3/3] Orange Toolbar Added Fixes #1088 --- .../ui/CertifyFingerprintActivity.java | 21 ------------- .../keychain/ui/CertifyKeyActivity.java | 21 ------------- .../layout/certify_fingerprint_activity.xml | 2 +- .../main/res/layout/certify_key_activity.xml | 2 +- .../res/layout/toolbar_standalone_orange.xml | 31 +++++++++++++++++++ 5 files changed, 33 insertions(+), 44 deletions(-) create mode 100644 OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java index fcfcc9cb2..b7c80c1ed 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java @@ -19,10 +19,7 @@ package org.sufficientlysecure.keychain.ui; import android.net.Uri; import android.os.Bundle; -import android.support.v7.widget.Toolbar; import android.view.View; -import android.widget.ImageView; -import android.widget.RelativeLayout; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; @@ -58,7 +55,6 @@ public class CertifyFingerprintActivity extends BaseActivity { @Override protected void initLayout() { setContentView(R.layout.certify_fingerprint_activity); - changeToolbarColor(); } private void startFragment(Bundle savedInstanceState, Uri dataUri) { @@ -81,21 +77,4 @@ public class CertifyFingerprintActivity extends BaseActivity { getSupportFragmentManager().executePendingTransactions(); } - /** - * Changes the color of our ToolBar. - * - * Currently Set to ORANGE - */ - private void changeToolbarColor() { - RelativeLayout mToolBarInclude = (RelativeLayout) findViewById(R.id.toolbar_include); - - // Changes the color of the Status Bar strip - ImageView mStatusBar = (ImageView) mToolBarInclude.findViewById(R.id.status_bar); - mStatusBar.setBackgroundResource(getResources().getColor(R.color.android_orange_dark)); - - // Changes the color of our Tool Bar - Toolbar toolbar = (Toolbar) mToolBarInclude.findViewById(R.id.toolbar); - toolbar.setBackgroundResource(getResources().getColor(R.color.android_orange_light)); - } - } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java index a2e717ed2..1fb88b182 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java @@ -18,10 +18,6 @@ package org.sufficientlysecure.keychain.ui; -import android.support.v7.widget.Toolbar; -import android.widget.ImageView; -import android.widget.RelativeLayout; - import org.sufficientlysecure.keychain.R; /** @@ -36,23 +32,6 @@ public class CertifyKeyActivity extends BaseActivity { @Override protected void initLayout() { setContentView(R.layout.certify_key_activity); - changeToolbarColor(); } - /** - * Changes the color of our ToolBar. - * - * Currently Set to ORANGE - */ - private void changeToolbarColor() { - RelativeLayout mToolBarInclude = (RelativeLayout) findViewById(R.id.toolbar_include); - - // Changes the color of the Status Bar strip - ImageView mStatusBar = (ImageView) mToolBarInclude.findViewById(R.id.status_bar); - mStatusBar.setBackgroundResource(getResources().getColor(R.color.android_orange_dark)); - - // Changes the color of our Tool Bar - Toolbar toolbar = (Toolbar) mToolBarInclude.findViewById(R.id.toolbar); - toolbar.setBackgroundResource(getResources().getColor(R.color.android_orange_light)); - } } diff --git a/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml b/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml index ec91d1455..764b2eac0 100644 --- a/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml +++ b/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml @@ -7,7 +7,7 @@ + layout="@layout/toolbar_standalone_orange" /> + layout="@layout/toolbar_standalone_orange" /> + + + + + + + +