aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--OpenPGP-Keychain/res/layout/stickylist_header.xml2
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java (renamed from OpenPGP-Keychain/src/se/emilsjolander/stickylistheaders/views/UnderlineTextView.java)25
-rw-r--r--README.md4
3 files changed, 27 insertions, 4 deletions
diff --git a/OpenPGP-Keychain/res/layout/stickylist_header.xml b/OpenPGP-Keychain/res/layout/stickylist_header.xml
index cbd65bb72..5768e4153 100644
--- a/OpenPGP-Keychain/res/layout/stickylist_header.xml
+++ b/OpenPGP-Keychain/res/layout/stickylist_header.xml
@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" >
- <se.emilsjolander.stickylistheaders.views.UnderlineTextView
+ <org.sufficientlysecure.keychain.ui.widget.UnderlineTextView
android:id="@+id/stickylist_header_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/OpenPGP-Keychain/src/se/emilsjolander/stickylistheaders/views/UnderlineTextView.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java
index c202c00b8..752d44f89 100644
--- a/OpenPGP-Keychain/src/se/emilsjolander/stickylistheaders/views/UnderlineTextView.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java
@@ -1,4 +1,20 @@
-package se.emilsjolander.stickylistheaders.views;
+/*
+ * Copyright (C) 2013 Eric Frohnhoefer
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.sufficientlysecure.keychain.ui.widget;
import android.content.Context;
import android.content.res.Resources;
@@ -9,9 +25,11 @@ import android.util.TypedValue;
import android.widget.TextView;
/**
+ * Copied from StickyListHeaders lib example
+ *
* @author Eric Frohnhoefer
*/
-public class UnderlineTextView extends TextView {
+public class UnderlineTextView extends TextView {
private final Paint mPaint = new Paint();
private int mUnderlineHeight = 0;
@@ -31,7 +49,8 @@ public class UnderlineTextView extends TextView {
private void init(Context context, AttributeSet attrs) {
Resources r = getResources();
- mUnderlineHeight = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2, r.getDisplayMetrics());
+ mUnderlineHeight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2,
+ r.getDisplayMetrics());
}
@Override
diff --git a/README.md b/README.md
index 059cbb806..59a6c1660 100644
--- a/README.md
+++ b/README.md
@@ -118,6 +118,10 @@ TODO
On error see: http://code.google.com/p/zxing/issues/detail?id=1207
+## ZXing
+
+XZing classes were extracted from the ZXing library (http://code.google.com/p/zxing/).
+Only classes related to QR Code generation are utilized.
## Bouncy Castle