aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorIshan Khanna <ishan1604@gmail.com>2015-03-04 02:36:33 +0530
committerIshan Khanna <ishan1604@gmail.com>2015-03-04 02:36:33 +0530
commiteedc7064b9eca0e94c9fe9aadaee98aa1317a0c5 (patch)
tree92958a20d8abee3b79d455753cac97fd8b4f0e46 /OpenKeychain
parent3dda761791907befe1b3676ce804cf7a67596bda (diff)
downloadopen-keychain-eedc7064b9eca0e94c9fe9aadaee98aa1317a0c5.tar.gz
open-keychain-eedc7064b9eca0e94c9fe9aadaee98aa1317a0c5.tar.bz2
open-keychain-eedc7064b9eca0e94c9fe9aadaee98aa1317a0c5.zip
Fixes Issue#1088
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java21
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java21
2 files changed, 42 insertions, 0 deletions
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));
+ }
}