From 47a5845e7c701ca542acce7b2b97e0d465713090 Mon Sep 17 00:00:00 2001
From: xudafeng <xudafeng@126.com>
Date: Sun, 26 Jul 2015 15:37:53 +0800
Subject: [PATCH 1/3] tweak style

---
 AndroidManifest.xml                           |  14 +-
 project.properties                            |   2 +-
 res/anim/slide_left_in.xml                    |   1 +
 res/anim/slide_left_out.xml                   |   1 +
 res/anim/slide_right_in.xml                   |   1 +
 res/anim/slide_right_out.xml                  |   1 +
 res/layout/activity_about.xml                 |  20 +--
 res/layout/activity_history.xml               |  71 ++++----
 res/layout/activity_main.xml                  |  26 +--
 res/layout/cell_body.xml                      |   2 +-
 res/layout/title.xml                          |  19 ++-
 res/values-v11/styles.xml                     |   1 -
 res/values-v14/styles.xml                     |   1 -
 res/values/colors.xml                         | 151 +++++++++++++++++-
 res/values/styles.xml                         |   2 +-
 .../iscanner_android/AboutActivity.java       |   7 +-
 .../iscanner_android/HistoryActivity.java     |   4 +-
 .../iscanner_android/MainActivity.java        |   4 +-
 .../SwipeableCellAdapter.java                 |   4 +-
 19 files changed, 251 insertions(+), 81 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 432f73c..455ba17 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.iscanner.iscanner_android"
     android:versionCode="1"
-    android:versionName="1.2.0" >
+    android:versionName="1.3.0" >
     <uses-sdk
         android:minSdkVersion="14"
         android:targetSdkVersion="21" />
@@ -26,9 +26,17 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".HistoryActivity" >
+        <activity
+            android:name=".HistoryActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateAlwaysHidden" >
         </activity>
-        <activity android:name=".AboutActivity" >
+        <activity
+            android:name=".AboutActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateAlwaysHidden" >
         </activity>
     </application>
 </manifest>
\ No newline at end of file
diff --git a/project.properties b/project.properties
index 8937e94..4ab1256 100644
--- a/project.properties
+++ b/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-14
+target=android-19
diff --git a/res/anim/slide_left_in.xml b/res/anim/slide_left_in.xml
index c07a54b..77f91ec 100644
--- a/res/anim/slide_left_in.xml
+++ b/res/anim/slide_left_in.xml
@@ -3,5 +3,6 @@
     <translate
         android:duration="200"
         android:fromXDelta="-100.0%p"
+        android:interpolator="@android:anim/accelerate_interpolator"
         android:toXDelta="0.0" />
 </set>
\ No newline at end of file
diff --git a/res/anim/slide_left_out.xml b/res/anim/slide_left_out.xml
index b4cdb4c..6339ef0 100644
--- a/res/anim/slide_left_out.xml
+++ b/res/anim/slide_left_out.xml
@@ -3,5 +3,6 @@
     <translate
         android:duration="200"
         android:fromXDelta="0.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
         android:toXDelta="-100.0%p" />
 </set>
\ No newline at end of file
diff --git a/res/anim/slide_right_in.xml b/res/anim/slide_right_in.xml
index 0f356ca..304c5f8 100644
--- a/res/anim/slide_right_in.xml
+++ b/res/anim/slide_right_in.xml
@@ -3,5 +3,6 @@
     <translate
         android:duration="200"
         android:fromXDelta="100.0%p"
+        android:interpolator="@android:anim/accelerate_interpolator"
         android:toXDelta="0.0" />
 </set>
\ No newline at end of file
diff --git a/res/anim/slide_right_out.xml b/res/anim/slide_right_out.xml
index 29e69a4..f4a07ac 100644
--- a/res/anim/slide_right_out.xml
+++ b/res/anim/slide_right_out.xml
@@ -3,5 +3,6 @@
     <translate
         android:duration="200"
         android:fromXDelta="0.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
         android:toXDelta="100.0%p" />
 </set>
\ No newline at end of file
diff --git a/res/layout/activity_about.xml b/res/layout/activity_about.xml
index c5b3a20..b1353f4 100644
--- a/res/layout/activity_about.xml
+++ b/res/layout/activity_about.xml
@@ -2,11 +2,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="com.github.iscanner.iscanner_android.MainActivity" >
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal" >
+        <include layout="@layout/title" />
+    </LinearLayout>
     <TextView
         android:id="@+id/copyright"
         android:layout_width="wrap_content"
@@ -22,22 +24,22 @@
         android:layout_height="20dp"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:gravity="center_vertical|center"
-        android:background="@color/transparent"
         android:layout_marginBottom="0dp"
+        android:background="@color/transparent"
+        android:gravity="center_vertical|center"
         android:height="20dp"
-        android:textSize="14sp"
         android:text="@string/check_for_update"
-        android:textColor="@color/lightgrey" />
+        android:textColor="@color/lightgrey"
+        android:textSize="14sp" />
     <ImageView
         android:id="@+id/icon"
-        android:contentDescription="@string/app_name"
         android:layout_width="300dp"
         android:layout_height="300dp"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="30dp"
         android:alpha="0.6"
+        android:contentDescription="@string/app_name"
         android:scaleType="centerInside"
         android:src="@drawable/ic_logo" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_history.xml b/res/layout/activity_history.xml
index 2d4c826..2bdffdc 100644
--- a/res/layout/activity_history.xml
+++ b/res/layout/activity_history.xml
@@ -3,39 +3,46 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity" >
-    <com.github.iscanner.iscanner_android.SwipeableCell
-        android:id="@+id/historyListView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/qr_dialog"
-        android:divider="#dddbdb"
-        android:dividerHeight="1dp" >
-    </com.github.iscanner.iscanner_android.SwipeableCell>
-    <RelativeLayout
-        android:id="@+id/qr_dialog"
+    <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:background="@color/black"
-        android:visibility="gone" >
-        <ImageView
-            android:id="@+id/qr_image_view"
-            android:contentDescription="@string/app_name"
-            android:layout_width="300dp"
-            android:layout_height="300dp"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:background="@color/white"
-            android:scaleType="centerInside"
-            android:src="@drawable/ic_logo"
-            android:visibility="visible" />
-        <TextView
-            android:id="@+id/tip_text"
+        android:orientation="horizontal" >
+        <include layout="@layout/title" />
+        <com.github.iscanner.iscanner_android.SwipeableCell
+            android:id="@+id/historyListView"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:layout_alignParentLeft="true"
-            android:layout_below="@+id/qr_image_view"
-            android:gravity="center_vertical|center"
-            android:text="@string/tip_content"
-            android:textColor="@color/white" />
-    </RelativeLayout>
+            android:layout_height="match_parent"
+            android:layout_above="@+id/qr_dialog"
+            android:divider="#dddbdb"
+            android:dividerHeight="1dp" >
+        </com.github.iscanner.iscanner_android.SwipeableCell>
+        <RelativeLayout
+            android:id="@+id/qr_dialog"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@color/black"
+            android:visibility="gone" >
+            <ImageView
+                android:id="@+id/qr_image_view"
+                android:layout_width="300dp"
+                android:layout_height="300dp"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:background="@color/white"
+                android:contentDescription="@string/app_name"
+                android:scaleType="centerInside"
+                android:src="@drawable/ic_logo"
+                android:visibility="visible" />
+            <TextView
+                android:id="@+id/tip_text"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_below="@+id/qr_image_view"
+                android:gravity="center_vertical|center"
+                android:text="@string/tip_content"
+                android:textColor="@color/white" />
+        </RelativeLayout>
+    </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index 3189381..cff9bf0 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -2,7 +2,13 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="#ffffff">
+    android:background="#ffffff" >
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal" >
+        <include layout="@layout/title" />
+    </LinearLayout>
     <SurfaceView
         android:id="@+id/preview_view"
         android:layout_width="300dp"
@@ -18,14 +24,14 @@
         android:layout_gravity="center"
         android:orientation="vertical" >
         <TextView
-        android:id="@+id/copyright"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="14dp"
-        android:gravity="center_vertical|center"
-        android:text="@string/copyright_content"
-        android:textColor="#0074ea" />
+            android:id="@+id/copyright"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="14dp"
+            android:gravity="center_vertical|center"
+            android:text="@string/copyright_content"
+            android:textColor="#0074ea" />
     </RelativeLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/cell_body.xml b/res/layout/cell_body.xml
index 1416396..fde6095 100644
--- a/res/layout/cell_body.xml
+++ b/res/layout/cell_body.xml
@@ -29,7 +29,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
-            android:background="@color/lightgray"
+            android:background="@color/lightgrey"
             android:drawableLeft="@drawable/qrcode"
             android:focusable="false"
             android:height="60dp"
diff --git a/res/layout/title.xml b/res/layout/title.xml
index 6071e3f..516b011 100644
--- a/res/layout/title.xml
+++ b/res/layout/title.xml
@@ -1,17 +1,20 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
     android:id="@+id/title_layout"
-    android:layout_height="wrap_content" >
+    android:layout_width="fill_parent"
+    android:layout_height="50dp"
+    android:background="@color/gainsboro" >
     <Button
         android:id="@+id/button_first"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_centerInParent="true"
         android:background="@color/transparent"
-        android:gravity="center_vertical|left"
-        android:paddingLeft="10dp"
+        android:paddingLeft="6dp"
         android:text="@string/back_name"
         android:textColor="@color/title_button"
+        android:textSize="18sp"
         android:visibility="invisible" />
     <TextView
         android:id="@+id/title"
@@ -24,17 +27,19 @@
         android:shadowRadius="1"
         android:text="@string/app_name"
         android:textColor="@android:color/black"
-        android:textSize="20sp"
+        android:textSize="18sp"
         android:textStyle="bold" />
     <Button
         android:id="@+id/button_second"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
+        android:layout_centerInParent="true"
         android:background="@color/transparent"
-        android:gravity="center_vertical|right"
-        android:paddingRight="10dp"
+        android:paddingRight="6dp"
         android:text="@string/history_name"
         android:textColor="@color/title_button"
+        android:textSize="18sp"
         android:visibility="invisible" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
index 0539ba9..0ca8d89 100644
--- a/res/values-v11/styles.xml
+++ b/res/values-v11/styles.xml
@@ -1,6 +1,5 @@
 <resources>
     <style name="AppBaseTheme" parent="android:Theme.Holo.Light"> 
-        <item name="android:windowTitleSize">50dip</item>
         <item name="android:windowAnimationStyle">@style/activityAnimation</item>
     </style>
     <style name="activityAnimation" parent="AppTheme">
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
index bbad2b9..c463d57 100644
--- a/res/values-v14/styles.xml
+++ b/res/values-v14/styles.xml
@@ -1,6 +1,5 @@
 <resources>
     <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
-        <item name="android:windowTitleSize">50dip</item>
         <item name="android:windowAnimationStyle">@style/activityAnimation</item>
     </style>
     <style name="activityAnimation" parent="AppTheme">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index baac0ff..4f49c79 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -7,11 +7,152 @@
     <color name="viewfinder_laser">#ffff0000</color>
     <color name="viewfinder_mask">#10000000</color>
     <color name="dialog_background">#000000</color>
-    <color name="grey">#666666</color>
-    <color name="lightgrey">#888888</color>
-    <color name="white">#ffffff</color>
-    <color name="black">#000000</color>
-    <color name="lightgray">#aaaaaa</color>
     <color name="cell_header">#ededed</color>
     <color name="title_button">#0074ea</color>
+    <color name="pink">#ffc0cb</color> <!-- 粉红色 -->
+    <color name="lightpink">#ffb6c1</color> <!-- 亮粉红色 -->
+    <color name="white">#ffffff</color> <!-- 白色 -->
+    <color name="peachpuff">#ffdab9</color> <!-- 桃色 -->
+    <color name="gold">#ffd700</color> <!-- 金色 -->
+    <color name="ivory">#fffff0</color> <!-- 象牙色 -->
+    <color name="lightyellow">#ffffe0</color> <!-- 亮黄色 -->
+    <color name="yellow">#ffff00</color> <!-- 黄色 -->
+    <color name="snow">#fffafa</color> <!-- 雪白色 -->
+    <color name="floralwhite">#fffaf0</color> <!-- 花白色 -->
+    <color name="lemonchiffon">#fffacd</color> <!-- 柠檬绸色 -->
+    <color name="cornsilk">#fff8dc</color> <!-- 米绸色 -->
+    <color name="seaShell">#fff5ee</color> <!-- 海贝色 -->
+    <color name="lavenderblush">#fff0f5</color> <!-- 淡紫红 -->
+    <color name="papayawhip">#ffefd5</color> <!-- 番木色 -->
+    <color name="blanchedalmond">#ffebcd</color> <!-- 白杏色 -->
+    <color name="mistyrose">#ffe4e1</color> <!-- 浅玫瑰色 -->
+    <color name="bisque">#ffe4c4</color> <!-- 桔黄色 -->
+    <color name="moccasin">#ffe4b5</color> <!-- 鹿皮色 -->
+    <color name="navajowhite">#ffdead</color> <!-- 纳瓦白 -->
+    <color name="orange">#ffa500</color> <!-- 橙色 -->
+    <color name="lightsalmon">#ffa07a</color> <!-- 亮肉色 -->
+    <color name="darkorange">#ff8c00</color> <!-- 暗桔黄色 -->
+    <color name="coral">#ff7f50</color> <!-- 珊瑚色 -->
+    <color name="hotpink">#ff69b4</color> <!-- 热粉红色 -->
+    <color name="ghostwhite">#f8f8ff</color> <!-- 幽灵白 -->
+    <color name="mintcream">#f5fffa</color> <!-- 薄荷色 -->
+    <color name="whitesmoke">#f5f5f5</color> <!-- 烟白色 -->
+    <color name="beige">#f5f5dc</color> <!-- 米色 -->
+    <color name="wheat">#f5deb3</color> <!-- 浅黄色 -->
+    <color name="sandybrown">#f4a460</color> <!-- 沙褐色 -->
+    <color name="tomato">#ff6347</color> <!-- 西红柿色 -->
+    <color name="orangered">#ff4500</color> <!-- 红橙色 -->
+    <color name="deeppink">#ff1493</color> <!-- 深粉红色 -->
+    <color name="fuchsia">#ff00ff</color> <!-- 紫红色 -->
+    <color name="magenta">#ff00ff</color> <!-- 红紫色 -->
+    <color name="red">#ff0000</color> <!-- 红色 -->
+    <color name="oldlace">#fdf5e6</color> <!-- 老花色 -->
+    <color name="lightgoldenrodyellow">#fafad2</color> <!-- 亮金黄色 -->
+    <color name="linen">#faf0e6</color> <!-- 亚麻色 -->
+    <color name="antiquewhite">#faebd7</color> <!-- 古董白 -->
+    <color name="salmon">#fa8072</color> <!-- 鲜肉色 -->
+    <color name="azure">#f0ffff</color> <!-- 天蓝色 -->
+    <color name="palevioletred">#db7093</color> <!-- 苍紫罗兰色 -->
+    <color name="goldenrod">#daa520</color> <!-- 金麒麟色 -->
+    <color name="orchid">#da70d6</color> <!-- 淡紫色 -->
+    <color name="thistle">#d8bfd8</color> <!-- 蓟色 -->
+    <color name="lightgray">#d3d3d3</color> <!-- 亮灰色 -->
+    <color name="lightgrey">#d3d3d3</color> <!-- 亮灰色 -->
+    <color name="tan">#d2b48c</color> <!-- 茶色 -->
+    <color name="chocolate">#d2691e</color> <!-- 巧可力色 -->
+    <color name="peru">#cd853f</color> <!-- 秘鲁色 -->
+    <color name="indianred">#cd5c5c</color> <!-- 印第安红 -->
+    <color name="mediumvioletred">#c71585</color> <!-- 中紫罗兰色 -->
+    <color name="silver">#c0c0c0</color> <!-- 银色 -->
+    <color name="darkkhaki">#bdb76b</color> <!-- 暗黄褐色 -->
+    <color name="rosybrown">#bc8f8f</color> <!-- 褐玫瑰红 -->
+    <color name="mediumorchid">#ba55d3</color> <!-- 中粉紫色 -->
+    <color name="darkgoldenrod">#b8860b</color> <!-- 暗金黄色 -->
+    <color name="firebrick">#b22222</color> <!-- 火砖色 -->
+    <color name="powderblue">#b0e0e6</color> <!-- 粉蓝色 -->
+    <color name="lightsteelblue">#b0c4de</color> <!-- 亮钢兰色 -->
+    <color name="paleturquoise">#afeeee</color> <!-- 苍宝石绿 -->
+    <color name="greenyellow">#adff2f</color> <!-- 黄绿色 -->
+    <color name="lightblue">#add8e6</color> <!-- 亮蓝色 -->
+    <color name="darkgray">#a9a9a9</color> <!-- 暗灰色 -->
+    <color name="darkgrey">#a9a9a9</color> <!-- 暗灰色 -->
+    <color name="brown">#a52a2a</color> <!-- 褐色 -->
+    <color name="sienna">#a0522d</color> <!-- 赭色 -->
+    <color name="darkorchid">#9932cc</color> <!-- 暗紫色 -->
+    <color name="palegreen">#98fb98</color> <!-- 苍绿色 -->
+    <color name="darkviolet">#9400d3</color> <!-- 暗紫罗兰色 -->
+    <color name="mediumpurple">#9370db</color> <!-- 中紫色 -->
+    <color name="skyblue">#87ceeb</color> <!-- 天蓝色 -->
+    <color name="gray">#808080</color> <!-- 灰色 -->
+    <color name="grey">#808080</color> <!-- 灰色 -->
+    <color name="olive">#808000</color> <!-- 橄榄色 -->
+    <color name="purple">#800080</color> <!-- 紫色 -->
+    <color name="maroon">#800000</color> <!-- 粟色 -->
+    <color name="aquamarine">#7fffd4</color> <!-- 碧绿色 -->
+    <color name="chartreuse">#7fff00</color> <!-- 黄绿色 -->
+    <color name="lawngreen">#7cfc00</color> <!-- 草绿色 -->
+    <color name="mediumslateblue">#7b68ee</color> <!-- 中暗蓝色 -->
+    <color name="darkcyan">#008b8b</color> <!-- 暗青色 -->
+    <color name="teal">#008080</color> <!-- 水鸭色 -->
+    <color name="green">#008000</color> <!-- 绿色 -->
+    <color name="darkgreen">#006400</color> <!-- 暗绿色 -->
+    <color name="blue">#0000ff</color> <!-- 蓝色 -->
+    <color name="mediumblue">#0000cd</color> <!-- 中兰色 -->
+    <color name="darkblue">#00008b</color> <!-- 暗蓝色 -->
+    <color name="lightslategray">#778899</color> <!-- 亮蓝灰 -->
+    <color name="lightslategrey">#778899</color> <!-- 亮蓝灰 -->
+    <color name="slategray">#708090</color> <!-- 灰石色 -->
+    <color name="slategrey">#708090</color> <!-- 灰石色 -->
+    <color name="olivedrab">#6b8e23</color> <!-- 深绿褐色 -->
+    <color name="slateblue">#6a5acd</color> <!-- 石蓝色 -->
+    <color name="dimgray">#696969</color> <!-- 暗灰色 -->
+    <color name="dimgrey">#696969</color> <!-- 暗灰色 -->
+    <color name="mediumaquamarine">#66cdaa</color> <!-- 中绿色 -->
+    <color name="cornflowerblue">#6495ed</color> <!-- 菊兰色 -->
+    <color name="cadetblue">#5f9ea0</color> <!-- 军兰色 -->
+    <color name="darkolivegreen">#556b2f</color> <!-- 暗橄榄绿 -->
+    <color name="indigo">#4b0082</color> <!-- 靛青色 -->
+    <color name="mediumturquoise">#48d1cc</color> <!-- 中绿宝石 -->
+    <color name="darkslateblue">#483d8b</color> <!-- 暗灰蓝色 -->
+    <color name="steelblue">#4682b4</color> <!-- 钢兰色 -->
+    <color name="royalblue">#4169e1</color> <!-- 皇家蓝 -->
+    <color name="turquoise">#40e0d0</color> <!-- 青绿色 -->
+    <color name="mediumseagreen">#3cb371</color> <!-- 中海蓝 -->
+    <color name="limegreen">#32cd32</color> <!-- 橙绿色 -->
+    <color name="midnightblue">#191970</color> <!-- 中灰兰色 -->
+    <color name="aqua">#00ffff</color> <!-- 浅绿色 -->
+    <color name="cyan">#00ffff</color> <!-- 青色 -->
+    <color name="springgreen">#00ff7f</color> <!-- 春绿色 -->
+    <color name="lime">#00ff00</color> <!-- 酸橙色 -->
+    <color name="mediumspringgreen">#00fa9a</color> <!-- 中春绿色 -->
+    <color name="darkturquoise">#00ced1</color> <!-- 暗宝石绿 -->
+    <color name="deepskyblue">#00bfff</color> <!-- 深天蓝色 -->
+    <color name="navy">#000080</color> <!-- 海军色 -->
+    <color name="black">#000000</color> <!-- 黑色 -->
+    <color name="darkslategray">#2f4f4f</color> <!-- 暗瓦灰色 -->
+    <color name="darkslategrey">#2f4f4f</color> <!-- 暗瓦灰色 -->
+    <color name="seagreen">#2e8b57</color> <!-- 海绿色 -->
+    <color name="forestgreen">#228b22</color> <!-- 森林绿 -->
+    <color name="lightseagreen">#20b2aa</color> <!-- 亮海蓝色 -->
+    <color name="dodgerblue">#1e90ff</color> <!-- 闪兰色 -->
+    <color name="honeydew">#f0fff0</color> <!-- 蜜色 -->
+    <color name="aliceblue">#f0f8ff</color> <!-- 艾利斯兰 -->
+    <color name="khaki">#f0e68c</color> <!-- 黄褐色 -->
+    <color name="lightcoral">#f08080</color> <!-- 亮珊瑚色 -->
+    <color name="palegoldenrod">#eee8aa</color> <!-- 苍麒麟色 -->
+    <color name="violet">#ee82ee</color> <!-- 紫罗兰色 -->
+    <color name="darksalmon">#e9967a</color> <!-- 暗肉色 -->
+    <color name="lightgreen">#90ee90</color> <!-- 亮绿色 -->
+    <color name="darkseagreen">#8fbc8f</color> <!-- 暗海兰色 -->
+    <color name="saddlebrown">#8b4513</color> <!-- 重褐色 -->
+    <color name="darkmagenta">#8b008b</color> <!-- 暗洋红 -->
+    <color name="darkred">#8b0000</color> <!-- 暗红色 -->
+    <color name="blueviolet">#8a2be2</color> <!-- 紫罗兰蓝色 -->
+    <color name="lightskyblue">#87cefa</color> <!-- 亮天蓝色 -->
+    <color name="lavender">#e6e6fa</color> <!-- 淡紫色 -->
+    <color name="lightcyan">#e0ffff</color> <!-- 亮青色 -->
+    <color name="burlywood">#deb887</color> <!-- 实木色 -->
+    <color name="crimson">#dc143c</color> <!-- 暗深红色 -->
+    <color name="plum">#dda0dd</color> <!-- 洋李色 -->
+    <color name="gainsboro">#dcdcdc</color> <!-- 淡灰色 -->
 </resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7b23125..cf63796 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,8 +1,8 @@
 <resources>
     <style name="AppBaseTheme" parent="android:Theme.Light"></style>
     <style name="AppTheme" parent="AppBaseTheme">
+        <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionBar">false</item>
-        <item name="android:windowTitleSize">50dip</item>
         <item name="android:windowAnimationStyle">@style/activityAnimation</item>
     </style>
     <style name="activityAnimation" parent="AppTheme">
diff --git a/src/com/github/iscanner/iscanner_android/AboutActivity.java b/src/com/github/iscanner/iscanner_android/AboutActivity.java
index a2d9c91..bea6661 100644
--- a/src/com/github/iscanner/iscanner_android/AboutActivity.java
+++ b/src/com/github/iscanner/iscanner_android/AboutActivity.java
@@ -36,19 +36,18 @@
 import com.alibaba.fastjson.JSONObject;
 
 public class AboutActivity extends Activity implements OnClickListener {
+	private static final String API = "http://iscanner.github.io/api/latest.json";
 	private static final String TAG = "iscanner";
 	private Button leftButton;
+	private Button updateButton;
 	private TextView title;
 	private TextView copyright;
-	private Button updateButton;
-	private static final String API = "http://iscanner.github.io/api/latest.json";
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setContentView(R.layout.activity_about);
-		getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.title);
 		initView();
 		Log.i(TAG, "start loading...");
 	}
diff --git a/src/com/github/iscanner/iscanner_android/HistoryActivity.java b/src/com/github/iscanner/iscanner_android/HistoryActivity.java
index e047714..03400f1 100644
--- a/src/com/github/iscanner/iscanner_android/HistoryActivity.java
+++ b/src/com/github/iscanner/iscanner_android/HistoryActivity.java
@@ -52,9 +52,8 @@ public class HistoryActivity extends Activity implements OnClickListener {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setContentView(R.layout.activity_history);
-		getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.title);
 		getSharedPreferences("list");
 		initView();
 		Log.i(TAG, "start loading...");
@@ -137,6 +136,7 @@ public void clickCreateButton(View view, int position) {
 				imgImageView.setAnimation(animationAlpha);
 			}
 
+			@SuppressWarnings("deprecation")
 			@Override
 			public void clickCopyButton(View view, int position) {
 				ClipboardManager c = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
diff --git a/src/com/github/iscanner/iscanner_android/MainActivity.java b/src/com/github/iscanner/iscanner_android/MainActivity.java
index ad730d8..12b2113 100644
--- a/src/com/github/iscanner/iscanner_android/MainActivity.java
+++ b/src/com/github/iscanner/iscanner_android/MainActivity.java
@@ -64,9 +64,8 @@ public class MainActivity extends Activity implements Callback, OnClickListener
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setContentView(R.layout.activity_main);
-		getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.title);
 		initView();
 		Log.i(TAG, "start loading...");
 	}
@@ -83,6 +82,7 @@ public void initView() {
 		inactivityTimer = new InactivityTimer(this);
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	protected void onResume() {
 		super.onResume();
diff --git a/src/com/github/iscanner/iscanner_android/SwipeableCellAdapter.java b/src/com/github/iscanner/iscanner_android/SwipeableCellAdapter.java
index 158692e..331b589 100644
--- a/src/com/github/iscanner/iscanner_android/SwipeableCellAdapter.java
+++ b/src/com/github/iscanner/iscanner_android/SwipeableCellAdapter.java
@@ -59,8 +59,8 @@ public View getView(final int position, View convertView, ViewGroup parent) {
 			holder.needTouch = true;
 		}
 		if (!holder.needTouch) {
-			convertView = LayoutInflater.from(mContext).inflate(R.layout.cell_header,
-					parent, false);
+			convertView = LayoutInflater.from(mContext).inflate(
+					R.layout.cell_header, parent, false);
 			holder.cell_content = (RelativeLayout) convertView
 					.findViewById(R.id.cell_content);
 			holder.content = (TextView) convertView.findViewById(R.id.content);

From 41524c4c495d9ccbbb50a8e7a644409b80f669d1 Mon Sep 17 00:00:00 2001
From: xudafeng <xudafeng@126.com>
Date: Sun, 26 Jul 2015 17:41:02 +0800
Subject: [PATCH 2/3] fix camera

---
 res/layout/activity_about.xml                 |   2 +-
 res/layout/activity_history.xml               |  76 ++-
 res/layout/activity_main.xml                  |   4 +-
 .../camera/CameraConfigurationManager.java    | 484 +++++++++---------
 src/com/zxing/camera/CameraManager.java       |  41 +-
 .../camera/PlanarYUVLuminanceSource.java      | 215 ++++----
 .../decoding/CaptureActivityHandler.java      |   8 +-
 src/com/zxing/view/ViewfinderView.java        |  43 +-
 8 files changed, 449 insertions(+), 424 deletions(-)

diff --git a/res/layout/activity_about.xml b/res/layout/activity_about.xml
index b1353f4..29be8e8 100644
--- a/res/layout/activity_about.xml
+++ b/res/layout/activity_about.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.github.iscanner.iscanner_android.MainActivity" >
+    tools:context=".MainActivity" >
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
diff --git a/res/layout/activity_history.xml b/res/layout/activity_history.xml
index 2bdffdc..6280f7b 100644
--- a/res/layout/activity_history.xml
+++ b/res/layout/activity_history.xml
@@ -3,46 +3,44 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity" >
-    <LinearLayout
+    <include
+        android:id="@+id/title_layout"
+        layout="@layout/title" />
+    <com.github.iscanner.iscanner_android.SwipeableCell
+        android:id="@+id/historyListView"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:orientation="horizontal" >
-        <include layout="@layout/title" />
-        <com.github.iscanner.iscanner_android.SwipeableCell
-            android:id="@+id/historyListView"
+        android:layout_above="@+id/qr_dialog"
+        android:layout_below="@id/title_layout"
+        android:divider="#dddbdb"
+        android:dividerHeight="1dp" >
+    </com.github.iscanner.iscanner_android.SwipeableCell>
+    <RelativeLayout
+        android:id="@+id/qr_dialog"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/black"
+        android:visibility="gone" >
+        <ImageView
+            android:id="@+id/qr_image_view"
+            android:layout_width="300dp"
+            android:layout_height="300dp"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:background="@color/white"
+            android:contentDescription="@string/app_name"
+            android:scaleType="centerInside"
+            android:src="@drawable/ic_logo"
+            android:visibility="visible" />
+        <TextView
+            android:id="@+id/tip_text"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/qr_dialog"
-            android:divider="#dddbdb"
-            android:dividerHeight="1dp" >
-        </com.github.iscanner.iscanner_android.SwipeableCell>
-        <RelativeLayout
-            android:id="@+id/qr_dialog"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:background="@color/black"
-            android:visibility="gone" >
-            <ImageView
-                android:id="@+id/qr_image_view"
-                android:layout_width="300dp"
-                android:layout_height="300dp"
-                android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                android:background="@color/white"
-                android:contentDescription="@string/app_name"
-                android:scaleType="centerInside"
-                android:src="@drawable/ic_logo"
-                android:visibility="visible" />
-            <TextView
-                android:id="@+id/tip_text"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/qr_image_view"
-                android:gravity="center_vertical|center"
-                android:text="@string/tip_content"
-                android:textColor="@color/white" />
-        </RelativeLayout>
-    </LinearLayout>
+            android:layout_height="60dp"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_below="@+id/qr_image_view"
+            android:gravity="center_vertical|center"
+            android:text="@string/tip_content"
+            android:textColor="@color/white" />
+    </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index cff9bf0..5ec76bd 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -11,8 +11,8 @@
     </LinearLayout>
     <SurfaceView
         android:id="@+id/preview_view"
-        android:layout_width="300dp"
-        android:layout_height="300dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center" />
     <com.zxing.view.ViewfinderView
         android:id="@+id/viewfinder_view"
diff --git a/src/com/zxing/camera/CameraConfigurationManager.java b/src/com/zxing/camera/CameraConfigurationManager.java
index 1f2f9cd..a10415c 100644
--- a/src/com/zxing/camera/CameraConfigurationManager.java
+++ b/src/com/zxing/camera/CameraConfigurationManager.java
@@ -24,242 +24,266 @@
 import android.view.Display;
 import android.view.WindowManager;
 
+import java.util.List;
 import java.util.regex.Pattern;
 
 final class CameraConfigurationManager {
 
-  private static final String TAG = CameraConfigurationManager.class.getSimpleName();
-
-  private static final int TEN_DESIRED_ZOOM = 27;
-  private static final int DESIRED_SHARPNESS = 30;
-
-  private static final Pattern COMMA_PATTERN = Pattern.compile(",");
-
-  private final Context context;
-  private Point screenResolution;
-  private Point cameraResolution;
-  private int previewFormat;
-  private String previewFormatString;
-
-  CameraConfigurationManager(Context context) {
-    this.context = context;
-  }
-
-  /**
-   * Reads, one time, values from the camera that are needed by the app.
-   */
-  void initFromCameraParameters(Camera camera) {
-    Camera.Parameters parameters = camera.getParameters();
-    previewFormat = parameters.getPreviewFormat();
-    previewFormatString = parameters.get("preview-format");
-    Log.d(TAG, "Default preview format: " + previewFormat + '/' + previewFormatString);
-    WindowManager manager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-    Display display = manager.getDefaultDisplay();
-    screenResolution = new Point(display.getWidth(), display.getHeight());
-    Log.d(TAG, "Screen resolution: " + screenResolution);
-    cameraResolution = getCameraResolution(parameters, screenResolution);
-    Log.d(TAG, "Camera resolution: " + screenResolution);
-  }
-
-  /**
-   * Sets the camera up to take preview images which are used for both preview and decoding.
-   * We detect the preview format here so that buildLuminanceSource() can build an appropriate
-   * LuminanceSource subclass. In the future we may want to force YUV420SP as it's the smallest,
-   * and the planar Y can be used for barcode scanning without a copy in some cases.
-   */
-  void setDesiredCameraParameters(Camera camera) {
-    Camera.Parameters parameters = camera.getParameters();
-    Log.d(TAG, "Setting preview size: " + cameraResolution);
-    parameters.setPreviewSize(cameraResolution.x, cameraResolution.y);
-    setFlash(parameters);
-    setZoom(parameters);
-    //setSharpness(parameters);
-    camera.setDisplayOrientation(90);
-    camera.setParameters(parameters);
-  }
-
-  Point getCameraResolution() {
-    return cameraResolution;
-  }
-
-  Point getScreenResolution() {
-    return screenResolution;
-  }
-
-  int getPreviewFormat() {
-    return previewFormat;
-  }
-
-  String getPreviewFormatString() {
-    return previewFormatString;
-  }
-
-  private static Point getCameraResolution(Camera.Parameters parameters, Point screenResolution) {
-
-    String previewSizeValueString = parameters.get("preview-size-values");
-    // saw this on Xperia
-    if (previewSizeValueString == null) {
-      previewSizeValueString = parameters.get("preview-size-value");
-    }
-
-    Point cameraResolution = null;
-
-    if (previewSizeValueString != null) {
-      Log.d(TAG, "preview-size-values parameter: " + previewSizeValueString);
-      cameraResolution = findBestPreviewSizeValue(previewSizeValueString, screenResolution);
-    }
-
-    if (cameraResolution == null) {
-      // Ensure that the camera resolution is a multiple of 8, as the screen may not be.
-      cameraResolution = new Point(
-          (screenResolution.x >> 3) << 3,
-          (screenResolution.y >> 3) << 3);
-    }
-
-    return cameraResolution;
-  }
-
-  private static Point findBestPreviewSizeValue(CharSequence previewSizeValueString, Point screenResolution) {
-    int bestX = 0;
-    int bestY = 0;
-    int diff = Integer.MAX_VALUE;
-    for (String previewSize : COMMA_PATTERN.split(previewSizeValueString)) {
-
-      previewSize = previewSize.trim();
-      int dimPosition = previewSize.indexOf('x');
-      if (dimPosition < 0) {
-        Log.w(TAG, "Bad preview-size: " + previewSize);
-        continue;
-      }
-
-      int newX;
-      int newY;
-      try {
-        newX = Integer.parseInt(previewSize.substring(0, dimPosition));
-        newY = Integer.parseInt(previewSize.substring(dimPosition + 1));
-      } catch (NumberFormatException nfe) {
-        Log.w(TAG, "Bad preview-size: " + previewSize);
-        continue;
-      }
-
-      int newDiff = Math.abs(newX - screenResolution.x) + Math.abs(newY - screenResolution.y);
-      if (newDiff == 0) {
-        bestX = newX;
-        bestY = newY;
-        break;
-      } else if (newDiff < diff) {
-        bestX = newX;
-        bestY = newY;
-        diff = newDiff;
-      }
-
-    }
-
-    if (bestX > 0 && bestY > 0) {
-      return new Point(bestX, bestY);
-    }
-    return null;
-  }
-
-  private static int findBestMotZoomValue(CharSequence stringValues, int tenDesiredZoom) {
-    int tenBestValue = 0;
-    for (String stringValue : COMMA_PATTERN.split(stringValues)) {
-      stringValue = stringValue.trim();
-      double value;
-      try {
-        value = Double.parseDouble(stringValue);
-      } catch (NumberFormatException nfe) {
-        return tenDesiredZoom;
-      }
-      int tenValue = (int) (10.0 * value);
-      if (Math.abs(tenDesiredZoom - value) < Math.abs(tenDesiredZoom - tenBestValue)) {
-        tenBestValue = tenValue;
-      }
-    }
-    return tenBestValue;
-  }
-
-  private void setFlash(Camera.Parameters parameters) {
-    // FIXME: This is a hack to turn the flash off on the Samsung Galaxy.
-    // And this is a hack-hack to work around a different value on the Behold II
-    // Restrict Behold II check to Cupcake, per Samsung's advice
-    //if (Build.MODEL.contains("Behold II") &&
-    //    CameraManager.SDK_INT == Build.VERSION_CODES.CUPCAKE) {
-    if (Build.MODEL.contains("Behold II") && CameraManager.SDK_INT == 3) { // 3 = Cupcake
-      parameters.set("flash-value", 1);
-    } else {
-      parameters.set("flash-value", 2);
-    }
-    // This is the standard setting to turn the flash off that all devices should honor.
-    parameters.set("flash-mode", "off");
-  }
-
-  private void setZoom(Camera.Parameters parameters) {
-
-    String zoomSupportedString = parameters.get("zoom-supported");
-    if (zoomSupportedString != null && !Boolean.parseBoolean(zoomSupportedString)) {
-      return;
-    }
-
-    int tenDesiredZoom = TEN_DESIRED_ZOOM;
-
-    String maxZoomString = parameters.get("max-zoom");
-    if (maxZoomString != null) {
-      try {
-        int tenMaxZoom = (int) (10.0 * Double.parseDouble(maxZoomString));
-        if (tenDesiredZoom > tenMaxZoom) {
-          tenDesiredZoom = tenMaxZoom;
-        }
-      } catch (NumberFormatException nfe) {
-        Log.w(TAG, "Bad max-zoom: " + maxZoomString);
-      }
-    }
-
-    String takingPictureZoomMaxString = parameters.get("taking-picture-zoom-max");
-    if (takingPictureZoomMaxString != null) {
-      try {
-        int tenMaxZoom = Integer.parseInt(takingPictureZoomMaxString);
-        if (tenDesiredZoom > tenMaxZoom) {
-          tenDesiredZoom = tenMaxZoom;
-        }
-      } catch (NumberFormatException nfe) {
-        Log.w(TAG, "Bad taking-picture-zoom-max: " + takingPictureZoomMaxString);
-      }
-    }
-
-    String motZoomValuesString = parameters.get("mot-zoom-values");
-    if (motZoomValuesString != null) {
-      tenDesiredZoom = findBestMotZoomValue(motZoomValuesString, tenDesiredZoom);
-    }
-
-    String motZoomStepString = parameters.get("mot-zoom-step");
-    if (motZoomStepString != null) {
-      try {
-        double motZoomStep = Double.parseDouble(motZoomStepString.trim());
-        int tenZoomStep = (int) (10.0 * motZoomStep);
-        if (tenZoomStep > 1) {
-          tenDesiredZoom -= tenDesiredZoom % tenZoomStep;
-        }
-      } catch (NumberFormatException nfe) {
-        // continue
-      }
-    }
-
-    // Set zoom. This helps encourage the user to pull back.
-    // Some devices like the Behold have a zoom parameter
-    if (maxZoomString != null || motZoomValuesString != null) {
-      parameters.set("zoom", String.valueOf(tenDesiredZoom / 10.0));
-    }
-
-    // Most devices, like the Hero, appear to expose this zoom parameter.
-    // It takes on values like "27" which appears to mean 2.7x zoom
-    if (takingPictureZoomMaxString != null) {
-      parameters.set("taking-picture-zoom", tenDesiredZoom);
-    }
-  }
+	private static final String TAG = CameraConfigurationManager.class
+			.getSimpleName();
+
+	private static final int TEN_DESIRED_ZOOM = 27;
+	private static final int DESIRED_SHARPNESS = 30;
+
+	private static final Pattern COMMA_PATTERN = Pattern.compile(",");
+
+	private final Context context;
+	private Point screenResolution;
+	private Point cameraResolution;
+	private int previewFormat;
+	private String previewFormatString;
+
+	CameraConfigurationManager(Context context) {
+		this.context = context;
+	}
+
+	/**
+	 * Reads, one time, values from the camera that are needed by the app.
+	 */
+	void initFromCameraParameters(Camera camera) {
+		Camera.Parameters parameters = camera.getParameters();
+		previewFormat = parameters.getPreviewFormat();
+		previewFormatString = parameters.get("preview-format");
+		Log.d(TAG, "Default preview format: " + previewFormat + '/'
+				+ previewFormatString);
+		WindowManager manager = (WindowManager) context
+				.getSystemService(Context.WINDOW_SERVICE);
+		Display display = manager.getDefaultDisplay();
+		screenResolution = new Point(display.getWidth(), display.getHeight());
+		Log.d(TAG, "Screen resolution: " + screenResolution);
+		cameraResolution = getCameraResolution(parameters, screenResolution);
+		Log.d(TAG, "Camera resolution: " + screenResolution);
+	}
+
+	/**
+	 * Sets the camera up to take preview images which are used for both preview
+	 * and decoding. We detect the preview format here so that
+	 * buildLuminanceSource() can build an appropriate LuminanceSource subclass.
+	 * In the future we may want to force YUV420SP as it's the smallest, and the
+	 * planar Y can be used for barcode scanning without a copy in some cases.
+	 */
+	void setDesiredCameraParameters(Camera camera) {
+		Camera.Parameters parameters = camera.getParameters();
+		Log.d(TAG, "Setting preview size: " + cameraResolution);
+		parameters.setPreviewSize(cameraResolution.x, cameraResolution.y);
+		setFlash(parameters);
+		setZoom(parameters);
+		// setSharpness(parameters);
+		// modify here
+		camera.setDisplayOrientation(90);
+		camera.setParameters(parameters);
+	}
+
+	Point getCameraResolution() {
+		return cameraResolution;
+	}
+
+	Point getScreenResolution() {
+		return screenResolution;
+	}
+
+	int getPreviewFormat() {
+		return previewFormat;
+	}
+
+	String getPreviewFormatString() {
+		return previewFormatString;
+	}
+
+	private static Point getCameraResolution(Camera.Parameters parameters,
+			Point screenResolution) {
+
+		String previewSizeValueString = parameters.get("preview-size-values");
+		// saw this on Xperia
+		if (previewSizeValueString == null) {
+			previewSizeValueString = parameters.get("preview-size-value");
+		}
+
+		Point cameraResolution = null;
+
+		if (previewSizeValueString != null) {
+			Log.d(TAG, "preview-size-values parameter: "
+					+ previewSizeValueString);
+			cameraResolution = findBestPreviewSizeValue(previewSizeValueString,
+					screenResolution);
+		}
+
+		if (cameraResolution == null) {
+			// Ensure that the camera resolution is a multiple of 8, as the
+			// screen may not be.
+			cameraResolution = new Point((screenResolution.x >> 3) << 3,
+					(screenResolution.y >> 3) << 3);
+		}
+
+		return cameraResolution;
+	}
+
+	private static Point findBestPreviewSizeValue(
+			CharSequence previewSizeValueString, Point screenResolution) {
+		int bestX = 0;
+		int bestY = 0;
+		int diff = Integer.MAX_VALUE;
+		for (String previewSize : COMMA_PATTERN.split(previewSizeValueString)) {
+
+			previewSize = previewSize.trim();
+			int dimPosition = previewSize.indexOf('x');
+			if (dimPosition < 0) {
+				Log.w(TAG, "Bad preview-size: " + previewSize);
+				continue;
+			}
+
+			int newX;
+			int newY;
+			try {
+				newX = Integer.parseInt(previewSize.substring(0, dimPosition));
+				newY = Integer.parseInt(previewSize.substring(dimPosition + 1));
+			} catch (NumberFormatException nfe) {
+				Log.w(TAG, "Bad preview-size: " + previewSize);
+				continue;
+			}
+
+			int newDiff = Math.abs(newX - screenResolution.x)
+					+ Math.abs(newY - screenResolution.y);
+
+			if (newDiff == 0) {
+				bestX = newX;
+				bestY = newY;
+				break;
+			} else if (newDiff < diff) {
+				bestX = newX;
+				bestY = newY;
+				diff = newDiff;
+			}
+
+		}
+
+		if (bestX > 0 && bestY > 0) {
+			return new Point(bestX, bestY);
+		}
+		return null;
+	}
+
+	private static int findBestMotZoomValue(CharSequence stringValues,
+			int tenDesiredZoom) {
+		int tenBestValue = 0;
+		for (String stringValue : COMMA_PATTERN.split(stringValues)) {
+			stringValue = stringValue.trim();
+			double value;
+			try {
+				value = Double.parseDouble(stringValue);
+			} catch (NumberFormatException nfe) {
+				return tenDesiredZoom;
+			}
+			int tenValue = (int) (10.0 * value);
+			if (Math.abs(tenDesiredZoom - value) < Math.abs(tenDesiredZoom
+					- tenBestValue)) {
+				tenBestValue = tenValue;
+			}
+		}
+		return tenBestValue;
+	}
+
+	private void setFlash(Camera.Parameters parameters) {
+		// FIXME: This is a hack to turn the flash off on the Samsung Galaxy.
+		// And this is a hack-hack to work around a different value on the
+		// Behold II
+		// Restrict Behold II check to Cupcake, per Samsung's advice
+		// if (Build.MODEL.contains("Behold II") &&
+		// CameraManager.SDK_INT == Build.VERSION_CODES.CUPCAKE) {
+		if (Build.MODEL.contains("Behold II") && CameraManager.SDK_INT == 3) { // 3
+																				// =
+																				// Cupcake
+			parameters.set("flash-value", 1);
+		} else {
+			parameters.set("flash-value", 2);
+		}
+		// This is the standard setting to turn the flash off that all devices
+		// should honor.
+		parameters.set("flash-mode", "off");
+	}
+
+	private void setZoom(Camera.Parameters parameters) {
+
+		String zoomSupportedString = parameters.get("zoom-supported");
+		if (zoomSupportedString != null
+				&& !Boolean.parseBoolean(zoomSupportedString)) {
+			return;
+		}
+
+		int tenDesiredZoom = TEN_DESIRED_ZOOM;
+
+		String maxZoomString = parameters.get("max-zoom");
+		if (maxZoomString != null) {
+			try {
+				int tenMaxZoom = (int) (10.0 * Double
+						.parseDouble(maxZoomString));
+				if (tenDesiredZoom > tenMaxZoom) {
+					tenDesiredZoom = tenMaxZoom;
+				}
+			} catch (NumberFormatException nfe) {
+				Log.w(TAG, "Bad max-zoom: " + maxZoomString);
+			}
+		}
+
+		String takingPictureZoomMaxString = parameters
+				.get("taking-picture-zoom-max");
+		if (takingPictureZoomMaxString != null) {
+			try {
+				int tenMaxZoom = Integer.parseInt(takingPictureZoomMaxString);
+				if (tenDesiredZoom > tenMaxZoom) {
+					tenDesiredZoom = tenMaxZoom;
+				}
+			} catch (NumberFormatException nfe) {
+				Log.w(TAG, "Bad taking-picture-zoom-max: "
+						+ takingPictureZoomMaxString);
+			}
+		}
+
+		String motZoomValuesString = parameters.get("mot-zoom-values");
+		if (motZoomValuesString != null) {
+			tenDesiredZoom = findBestMotZoomValue(motZoomValuesString,
+					tenDesiredZoom);
+		}
+
+		String motZoomStepString = parameters.get("mot-zoom-step");
+		if (motZoomStepString != null) {
+			try {
+				double motZoomStep = Double.parseDouble(motZoomStepString
+						.trim());
+				int tenZoomStep = (int) (10.0 * motZoomStep);
+				if (tenZoomStep > 1) {
+					tenDesiredZoom -= tenDesiredZoom % tenZoomStep;
+				}
+			} catch (NumberFormatException nfe) {
+				// continue
+			}
+		}
+
+		// Set zoom. This helps encourage the user to pull back.
+		// Some devices like the Behold have a zoom parameter
+		if (maxZoomString != null || motZoomValuesString != null) {
+			parameters.set("zoom", String.valueOf(tenDesiredZoom / 10.0));
+		}
+
+		// Most devices, like the Hero, appear to expose this zoom parameter.
+		// It takes on values like "27" which appears to mean 2.7x zoom
+		if (takingPictureZoomMaxString != null) {
+			parameters.set("taking-picture-zoom", tenDesiredZoom);
+		}
+	}
 
 	public static int getDesiredSharpness() {
 		return DESIRED_SHARPNESS;
 	}
 
-}
+}
\ No newline at end of file
diff --git a/src/com/zxing/camera/CameraManager.java b/src/com/zxing/camera/CameraManager.java
index 822723e..d44496c 100644
--- a/src/com/zxing/camera/CameraManager.java
+++ b/src/com/zxing/camera/CameraManager.java
@@ -40,8 +40,8 @@ public final class CameraManager {
 
 	private static final int MIN_FRAME_WIDTH = 240;
 	private static final int MIN_FRAME_HEIGHT = 240;
-	private static final int MAX_FRAME_WIDTH = 260;
-	private static final int MAX_FRAME_HEIGHT = 260;
+	private static final int MAX_FRAME_WIDTH = 480;
+	private static final int MAX_FRAME_HEIGHT = 360;
 
 	private static CameraManager cameraManager;
 
@@ -145,13 +145,6 @@ public void openDriver(SurfaceHolder holder) throws IOException {
 			}
 			configManager.setDesiredCameraParameters(camera);
 
-			// FIXME
-			// SharedPreferences prefs =
-			// PreferenceManager.getDefaultSharedPreferences(context);
-			// if (prefs.getBoolean(PreferencesActivity.KEY_FRONT_LIGHT, false))
-			// {
-			// FlashlightManager.enableFlashlight();
-			// }
 			FlashlightManager.enableFlashlight();
 		}
 	}
@@ -256,7 +249,7 @@ public Rect getFramingRect() {
 				height = MAX_FRAME_HEIGHT;
 			}
 			int leftOffset = (screenResolution.x - width) / 2;
-			int topOffset = (screenResolution.y - height - 200) / 2;
+			int topOffset = (screenResolution.y - height) / 2;
 			framingRect = new Rect(leftOffset, topOffset, leftOffset + width,
 					topOffset + height);
 			Log.d(TAG, "Calculated framing rect: " + framingRect);
@@ -273,6 +266,13 @@ public Rect getFramingRectInPreview() {
 			Rect rect = new Rect(getFramingRect());
 			Point cameraResolution = configManager.getCameraResolution();
 			Point screenResolution = configManager.getScreenResolution();
+			// modify here
+			// rect.left = rect.left * cameraResolution.x / screenResolution.x;
+			// rect.right = rect.right * cameraResolution.x /
+			// screenResolution.x;
+			// rect.top = rect.top * cameraResolution.y / screenResolution.y;
+			// rect.bottom = rect.bottom * cameraResolution.y /
+			// screenResolution.y;
 			rect.left = rect.left * cameraResolution.y / screenResolution.x;
 			rect.right = rect.right * cameraResolution.y / screenResolution.x;
 			rect.top = rect.top * cameraResolution.x / screenResolution.y;
@@ -282,6 +282,25 @@ public Rect getFramingRectInPreview() {
 		return framingRectInPreview;
 	}
 
+	/**
+	 * Converts the result points from still resolution coordinates to screen
+	 * coordinates.
+	 *
+	 * @param points
+	 *            The points returned by the Reader subclass through
+	 *            Result.getResultPoints().
+	 * @return An array of Points scaled to the size of the framing rect and
+	 *         offset appropriately so they can be drawn in screen coordinates.
+	 */
+	/*
+	 * public Point[] convertResultPoints(ResultPoint[] points) { Rect frame =
+	 * getFramingRectInPreview(); int count = points.length; Point[] output =
+	 * new Point[count]; for (int x = 0; x < count; x++) { output[x] = new
+	 * Point(); output[x].x = frame.left + (int) (points[x].getX() + 0.5f);
+	 * output[x].y = frame.top + (int) (points[x].getY() + 0.5f); } return
+	 * output; }
+	 */
+
 	/**
 	 * A factory method to build the appropriate LuminanceSource object based on
 	 * the format of the preview buffers, as described by Camera.Parameters.
@@ -328,4 +347,4 @@ public Context getContext() {
 		return context;
 	}
 
-}
+}
\ No newline at end of file
diff --git a/src/com/zxing/camera/PlanarYUVLuminanceSource.java b/src/com/zxing/camera/PlanarYUVLuminanceSource.java
index 2da06e7..9b19f68 100644
--- a/src/com/zxing/camera/PlanarYUVLuminanceSource.java
+++ b/src/com/zxing/camera/PlanarYUVLuminanceSource.java
@@ -21,113 +21,120 @@
 import android.graphics.Bitmap;
 
 /**
- * This object extends LuminanceSource around an array of YUV data returned from the camera driver,
- * with the option to crop to a rectangle within the full data. This can be used to exclude
- * superfluous pixels around the perimeter and speed up decoding.
+ * This object extends LuminanceSource around an array of YUV data returned from
+ * the camera driver, with the option to crop to a rectangle within the full
+ * data. This can be used to exclude superfluous pixels around the perimeter and
+ * speed up decoding.
  *
- * It works for any pixel format where the Y channel is planar and appears first, including
- * YCbCr_420_SP and YCbCr_422_SP.
+ * It works for any pixel format where the Y channel is planar and appears
+ * first, including YCbCr_420_SP and YCbCr_422_SP.
  *
  * @author dswitkin@google.com (Daniel Switkin)
  */
 public final class PlanarYUVLuminanceSource extends LuminanceSource {
-  private final byte[] yuvData;
-  private final int dataWidth;
-  private final int dataHeight;
-  private final int left;
-  private final int top;
-
-  public PlanarYUVLuminanceSource(byte[] yuvData, int dataWidth, int dataHeight, int left, int top,
-      int width, int height) {
-    super(width, height);
-
-    if (left + width > dataWidth || top + height > dataHeight) {
-      throw new IllegalArgumentException("Crop rectangle does not fit within image data.");
-    }
-
-    this.yuvData = yuvData;
-    this.dataWidth = dataWidth;
-    this.dataHeight = dataHeight;
-    this.left = left;
-    this.top = top;
-  }
-
-  @Override
-  public byte[] getRow(int y, byte[] row) {
-    if (y < 0 || y >= getHeight()) {
-      throw new IllegalArgumentException("Requested row is outside the image: " + y);
-    }
-    int width = getWidth();
-    if (row == null || row.length < width) {
-      row = new byte[width];
-    }
-    int offset = (y + top) * dataWidth + left;
-    System.arraycopy(yuvData, offset, row, 0, width);
-    return row;
-  }
-
-  @Override
-  public byte[] getMatrix() {
-    int width = getWidth();
-    int height = getHeight();
-
-    // If the caller asks for the entire underlying image, save the copy and give them the
-    // original data. The docs specifically warn that result.length must be ignored.
-    if (width == dataWidth && height == dataHeight) {
-      return yuvData;
-    }
-
-    int area = width * height;
-    byte[] matrix = new byte[area];
-    int inputOffset = top * dataWidth + left;
-
-    // If the width matches the full width of the underlying data, perform a single copy.
-    if (width == dataWidth) {
-      System.arraycopy(yuvData, inputOffset, matrix, 0, area);
-      return matrix;
-    }
-
-    // Otherwise copy one cropped row at a time.
-    byte[] yuv = yuvData;
-    for (int y = 0; y < height; y++) {
-      int outputOffset = y * width;
-      System.arraycopy(yuv, inputOffset, matrix, outputOffset, width);
-      inputOffset += dataWidth;
-    }
-    return matrix;
-  }
-
-  @Override
-  public boolean isCropSupported() {
-    return true;
-  }
-
-  public int getDataWidth() {
-    return dataWidth;
-  }
-
-  public int getDataHeight() {
-    return dataHeight;
-  }
-
-  public Bitmap renderCroppedGreyscaleBitmap() {
-    int width = getWidth();
-    int height = getHeight();
-    int[] pixels = new int[width * height];
-    byte[] yuv = yuvData;
-    int inputOffset = top * dataWidth + left;
-
-    for (int y = 0; y < height; y++) {
-      int outputOffset = y * width;
-      for (int x = 0; x < width; x++) {
-        int grey = yuv[inputOffset + x] & 0xff;
-        pixels[outputOffset + x] = 0xFF000000 | (grey * 0x00010101);
-      }
-      inputOffset += dataWidth;
-    }
-
-    Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-    bitmap.setPixels(pixels, 0, width, 0, 0, width, height);
-    return bitmap;
-  }
+	private final byte[] yuvData;
+	private final int dataWidth;
+	private final int dataHeight;
+	private final int left;
+	private final int top;
+
+	public PlanarYUVLuminanceSource(byte[] yuvData, int dataWidth,
+			int dataHeight, int left, int top, int width, int height) {
+		super(width, height);
+
+		if (left + width > dataWidth || top + height > dataHeight) {
+			throw new IllegalArgumentException(
+					"Crop rectangle does not fit within image data.");
+		}
+
+		this.yuvData = yuvData;
+		this.dataWidth = dataWidth;
+		this.dataHeight = dataHeight;
+		this.left = left;
+		this.top = top;
+	}
+
+	@Override
+	public byte[] getRow(int y, byte[] row) {
+		if (y < 0 || y >= getHeight()) {
+			throw new IllegalArgumentException(
+					"Requested row is outside the image: " + y);
+		}
+		int width = getWidth();
+		if (row == null || row.length < width) {
+			row = new byte[width];
+		}
+		int offset = (y + top) * dataWidth + left;
+		System.arraycopy(yuvData, offset, row, 0, width);
+		return row;
+	}
+
+	@Override
+	public byte[] getMatrix() {
+		int width = getWidth();
+		int height = getHeight();
+
+		// If the caller asks for the entire underlying image, save the copy and
+		// give them the
+		// original data. The docs specifically warn that result.length must be
+		// ignored.
+		if (width == dataWidth && height == dataHeight) {
+			return yuvData;
+		}
+
+		int area = width * height;
+		byte[] matrix = new byte[area];
+		int inputOffset = top * dataWidth + left;
+
+		// If the width matches the full width of the underlying data, perform a
+		// single copy.
+		if (width == dataWidth) {
+			System.arraycopy(yuvData, inputOffset, matrix, 0, area);
+			return matrix;
+		}
+
+		// Otherwise copy one cropped row at a time.
+		byte[] yuv = yuvData;
+		for (int y = 0; y < height; y++) {
+			int outputOffset = y * width;
+			System.arraycopy(yuv, inputOffset, matrix, outputOffset, width);
+			inputOffset += dataWidth;
+		}
+		return matrix;
+	}
+
+	@Override
+	public boolean isCropSupported() {
+		return true;
+	}
+
+	public int getDataWidth() {
+		return dataWidth;
+	}
+
+	public int getDataHeight() {
+		return dataHeight;
+	}
+
+	public Bitmap renderCroppedGreyscaleBitmap() {
+		int width = getWidth();
+		int height = getHeight();
+		int[] pixels = new int[width * height];
+		byte[] yuv = yuvData;
+		int inputOffset = top * dataWidth + left;
+
+		for (int y = 0; y < height; y++) {
+			int outputOffset = y * width;
+			for (int x = 0; x < width; x++) {
+				int grey = yuv[inputOffset + x] & 0xff;
+				pixels[outputOffset + x] = 0xFF000000 | (grey * 0x00010101);
+			}
+			inputOffset += dataWidth;
+		}
+
+		Bitmap bitmap = Bitmap.createBitmap(width, height,
+				Bitmap.Config.ARGB_8888);
+		bitmap.setPixels(pixels, 0, width, 0, 0, width, height);
+		return bitmap;
+	}
 }
diff --git a/src/com/zxing/decoding/CaptureActivityHandler.java b/src/com/zxing/decoding/CaptureActivityHandler.java
index 923dd0b..81c7f92 100644
--- a/src/com/zxing/decoding/CaptureActivityHandler.java
+++ b/src/com/zxing/decoding/CaptureActivityHandler.java
@@ -82,13 +82,11 @@ public void handleMessage(Message message) {
         Log.d(TAG, "Got decode succeeded message");
         state = State.SUCCESS;
         Bundle bundle = message.getData();
-        
-        /***********************************************************************/
+
         Bitmap barcode = bundle == null ? null :
-            (Bitmap) bundle.getParcelable(DecodeThread.BARCODE_BITMAP);//���ñ����߳�
+            (Bitmap) bundle.getParcelable(DecodeThread.BARCODE_BITMAP);
         
-        activity.handleDecode((Result) message.obj, barcode);//���ؽ��
-        /***********************************************************************/
+        activity.handleDecode((Result) message.obj, barcode);
         break;
       case R.id.decode_failed:
         // We're decoding as fast as possible, so when one decode fails, start another.
diff --git a/src/com/zxing/view/ViewfinderView.java b/src/com/zxing/view/ViewfinderView.java
index 9d1761d..5f6990b 100644
--- a/src/com/zxing/view/ViewfinderView.java
+++ b/src/com/zxing/view/ViewfinderView.java
@@ -80,9 +80,7 @@ public void onDraw(Canvas canvas) {
 		}
 		int width = canvas.getWidth();
 		int height = canvas.getHeight();
-		int linewidht = 4;
-		int offsetX = 10;
-		int length = 20;
+
 		// Draw the exterior (i.e. outside the framing rect) darkened
 		paint.setColor(resultBitmap != null ? resultColor : maskColor);
 		canvas.drawRect(0, 0, width, frame.top, paint);
@@ -99,34 +97,15 @@ public void onDraw(Canvas canvas) {
 
 			// Draw a two pixel solid black border inside the framing rect
 			paint.setColor(frameColor);
-			canvas.drawRect(offsetX + frame.left, offsetX + frame.top, offsetX
-					+ (linewidht + frame.left), offsetX + (length + frame.top),
-					paint);
-			canvas.drawRect(offsetX + frame.left, offsetX + frame.top, offsetX
-					+ (length + frame.left), offsetX + (linewidht + frame.top),
-					paint);
-			canvas.drawRect(-offsetX + ((0 - linewidht) + frame.right), offsetX
-					+ frame.top, -offsetX + (1 + frame.right), offsetX
-					+ (length + frame.top), paint);
-			canvas.drawRect(-offsetX + (-length + frame.right), offsetX
-					+ frame.top, -offsetX + frame.right, offsetX
-					+ (linewidht + frame.top), paint);
-			canvas.drawRect(offsetX + frame.left, -offsetX
-					+ (1 - length + frame.bottom), offsetX
-					+ (linewidht + frame.left), -offsetX + (1 + frame.bottom),
-					paint);
-			canvas.drawRect(offsetX + frame.left, -offsetX
-					+ ((0 - linewidht) + frame.bottom), offsetX
-					+ (length + frame.left), -offsetX + (1 + frame.bottom),
-					paint);
-			canvas.drawRect(-offsetX + ((0 - linewidht) + frame.right),
-					-offsetX + (-19 + frame.bottom), -offsetX
-							+ (1 + frame.right), -offsetX + (1 + frame.bottom),
-					paint);
-			canvas.drawRect(-offsetX + (-length + frame.right), -offsetX
-					+ ((0 - linewidht) + frame.bottom), -offsetX + frame.right,
-					-offsetX + (linewidht - (linewidht - 1) + frame.bottom),
-					paint);
+			canvas.drawRect(frame.left, frame.top, frame.right + 1,
+					frame.top + 2, paint);
+			canvas.drawRect(frame.left, frame.top + 2, frame.left + 2,
+					frame.bottom - 1, paint);
+			canvas.drawRect(frame.right - 1, frame.top, frame.right + 1,
+					frame.bottom - 1, paint);
+			canvas.drawRect(frame.left, frame.bottom - 1, frame.right + 1,
+					frame.bottom + 1, paint);
+
 			// Draw a red "laser scanner" line through the middle to show
 			// decoding is active
 			paint.setColor(laserColor);
@@ -188,4 +167,4 @@ public void addPossibleResultPoint(ResultPoint point) {
 		possibleResultPoints.add(point);
 	}
 
-}
+}
\ No newline at end of file

From ea2a72ceb52123b9d6d90a493427d47c46d3e52b Mon Sep 17 00:00:00 2001
From: xudafeng <xudafeng@126.com>
Date: Sun, 26 Jul 2015 17:45:28 +0800
Subject: [PATCH 3/3] fix title

---
 res/layout/activity_main.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index 5ec76bd..0a2435a 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -3,12 +3,6 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="#ffffff" >
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="horizontal" >
-        <include layout="@layout/title" />
-    </LinearLayout>
     <SurfaceView
         android:id="@+id/preview_view"
         android:layout_width="wrap_content"
@@ -18,6 +12,7 @@
         android:id="@+id/viewfinder_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
+    <include layout="@layout/title" />
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"