From cfaaaf5341c8001566b0a5c109a9f1b35b755dde Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Tue, 9 Sep 2014 21:28:19 +0800
Subject: [PATCH] update with new cipher rc4-md5

---
 jni/shadowsocks                       |  2 +-
 src/main/res/values/arrays.xml        |  2 ++
 src/main/res/values/styles_shadow.xml | 14 +++++++-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/jni/shadowsocks b/jni/shadowsocks
index 0017b7c198..d37f8d3025 160000
--- a/jni/shadowsocks
+++ b/jni/shadowsocks
@@ -1 +1 @@
-Subproject commit 0017b7c1988c30c4b4850714908399248aa73a8e
+Subproject commit d37f8d302532a8d442233d9b752324ffff99bbd0
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 8743cf3fe3..b573a77c9c 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -5,6 +5,7 @@
   <string-array name="enc_method_entry">
     <item>TABLE</item>
     <item>RC4</item>
+    <item>RC4-MD5</item>
     <item>AES-128-CFB</item>
     <item>AES-192-CFB</item>
     <item>AES-256-CFB</item>
@@ -22,6 +23,7 @@
   <string-array name="enc_method_value">
     <item>table</item>
     <item>rc4</item>
+    <item>rc4-md5</item>
     <item>aes-128-cfb</item>
     <item>aes-192-cfb</item>
     <item>aes-256-cfb</item>
diff --git a/src/main/res/values/styles_shadow.xml b/src/main/res/values/styles_shadow.xml
index 870da93d7e..3c845499bf 100755
--- a/src/main/res/values/styles_shadow.xml
+++ b/src/main/res/values/styles_shadow.xml
@@ -29,16 +29,16 @@
         <item name="android:actionModeBackground">@drawable/cab_background_top_shadow</item>
         <item name="android:actionModeSplitBackground">@drawable/cab_background_bottom_shadow</item>
         <item name="android:actionModeCloseButtonStyle">@style/ActionButton.CloseMode.Shadow</item>
-
-        <!-- Light.DarkActionBar specific -->
+        
+                <!-- Light.DarkActionBar specific -->
         <item name="android:actionBarWidgetTheme">@style/Theme.Shadow.Widget</item>
 
     </style>
 
     <style name="ActionBar.Solid.Shadow" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
-        <item name="android:background">@drawable/ab_solid_shadow</item>
+        <item name="android:background">@drawable/ab_background_textured_shadow</item>
         <item name="android:backgroundStacked">@drawable/ab_stacked_solid_shadow</item>
-        <item name="android:backgroundSplit">@drawable/ab_bottom_solid_shadow</item>
+        <item name="android:backgroundSplit">@drawable/ab_background_textured_shadow</item>
         <item name="android:progressBarStyle">@style/ProgressBar.Shadow</item>
     </style>
 
@@ -48,7 +48,7 @@
     </style>
 
     <style name="PopupMenu.Shadow" parent="@android:style/Widget.Holo.ListPopupWindow">
-        <item name="android:popupBackground">@drawable/menu_dropdown_panel_shadow</item>
+        <item name="android:popupBackground">@drawable/menu_dropdown_panel_shadow</item>	
     </style>
 
     <style name="DropDownListView.Shadow" parent="@android:style/Widget.Holo.ListView.DropDown">
@@ -64,11 +64,11 @@
         <item name="android:popupBackground">@drawable/menu_dropdown_panel_shadow</item>
         <item name="android:dropDownSelector">@drawable/selectable_background_shadow</item>
     </style>
-
+    
     <style name="ProgressBar.Shadow" parent="@android:style/Widget.Holo.ProgressBar.Horizontal">
         <item name="android:progressDrawable">@drawable/progress_horizontal_shadow</item>
     </style>
-
+    
     <style name="ActionButton.CloseMode.Shadow" parent="@android:style/Widget.Holo.ActionButton.CloseMode">
         <item name="android:background">@drawable/btn_cab_done_shadow</item>
     </style>