From 7d5fe42d5b404c396b84ae64c5e42a726eb27d6e Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Sat, 27 Apr 2013 15:50:33 +0800
Subject: [PATCH] tested on 4.2.2 and 2.3.3 with Tablet UI and Fallback UI

---
 res/layout/layout_apps_item.xml             | 23 +++++++++++----------
 src/com/github/shadowsocks/AppManager.java  |  3 ++-
 src/com/github/shadowsocks/Shadowsocks.java |  2 ++
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/res/layout/layout_apps_item.xml b/res/layout/layout_apps_item.xml
index bef7f510..8527da20 100644
--- a/res/layout/layout_apps_item.xml
+++ b/res/layout/layout_apps_item.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="fill_parent"
-	android:stretchColumns="1">
-	<TableRow>
-		<ImageView android:id="@+id/itemicon" android:layout_width="48sp"
-			android:layout_height="48sp" android:scaleType="fitCenter"
-			android:padding="3dip"></ImageView>
+             android:layout_width="fill_parent" android:layout_height="fill_parent"
+             android:stretchColumns="1">
+    <TableRow>
+        <ImageView android:id="@+id/itemicon" android:layout_width="48dp"
+                   android:layout_height="48dp" android:scaleType="fitCenter"
+                   android:padding="3dp"></ImageView>
 
-		<TextView android:layout_height="wrap_content" android:id="@+id/itemtext"
-			android:text="uid:packages" android:maxLength="25" android:textSize="18sp" android:padding="3dip"></TextView>
+        <TextView android:layout_height="wrap_content" android:id="@+id/itemtext"
+                  android:text="uid:packages" android:maxLength="25" android:textSize="18sp"
+                  android:padding="3dp"></TextView>
 
-		<CheckBox android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:id="@+id/itemcheck"></CheckBox>
-	</TableRow>
+        <CheckBox android:layout_width="wrap_content" android:layout_marginRight="6dp"
+                  android:layout_height="fill_parent" android:id="@+id/itemcheck"></CheckBox>
+    </TableRow>
 </TableLayout>
diff --git a/src/com/github/shadowsocks/AppManager.java b/src/com/github/shadowsocks/AppManager.java
index e11b69ac..43d16122 100755
--- a/src/com/github/shadowsocks/AppManager.java
+++ b/src/com/github/shadowsocks/AppManager.java
@@ -24,10 +24,11 @@ import android.view.WindowManager;
 import android.widget.*;
 import android.widget.AbsListView.OnScrollListener;
 import android.widget.CompoundButton.OnCheckedChangeListener;
+import com.actionbarsherlock.app.SherlockActivity;
 
 import java.util.*;
 
-public class AppManager extends Activity implements OnCheckedChangeListener,
+public class AppManager extends SherlockActivity implements OnCheckedChangeListener,
         OnClickListener {
 
     public final static String PREFS_KEY_PROXYED = "Proxyed";
diff --git a/src/com/github/shadowsocks/Shadowsocks.java b/src/com/github/shadowsocks/Shadowsocks.java
index 04c2e4f5..39f2ea0c 100755
--- a/src/com/github/shadowsocks/Shadowsocks.java
+++ b/src/com/github/shadowsocks/Shadowsocks.java
@@ -552,6 +552,7 @@ public class Shadowsocks extends UnifiedSherlockPreferenceActivity
 
         @Override
         public void onPause() {
+            super.onPause();
             // Unregister the listener whenever a key changes
             getPreferenceScreen().getSharedPreferences()
                     .unregisterOnSharedPreferenceChangeListener(this);
@@ -601,6 +602,7 @@ public class Shadowsocks extends UnifiedSherlockPreferenceActivity
 
         @Override
         public void onPause() {
+            super.onPause();
             // Unregister the listener whenever a key changes
             getPreferenceScreen().getSharedPreferences()
                     .unregisterOnSharedPreferenceChangeListener(this);