UI update : 3-states checkboxes + filter app user/system/both

res/drawable/bg_button.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_focused="true"><shape>
+            <solid android:color="#6633b5e5" />
+
+            <stroke android:width="2dp" android:color="#880099cc" />
+
+            <corners android:radius="2dp" />
+        </shape></item>
+    <item android:state_pressed="true"><shape>
+            <solid android:color="#880099cc" />
+
+            <corners android:radius="2dp" />
+        </shape></item>
+
+</selector>

res/drawable/bg_checkbox_dark.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_focused="true"><shape>
+            <solid android:color="#6633b5e5" />
+
+            <stroke android:width="2dp" android:color="#880099cc" />
+
+            <corners android:radius="2dp" />
+        </shape></item>
+    <item android:state_pressed="true"><shape>
+            <solid android:color="#880099cc" />
+
+            <corners android:radius="2dp" />
+        </shape></item>
+
+    <item android:drawable="@drawable/bg_checkbox_holo_dark" />
+
+</selector>

res/drawable/bg_checkbox_light.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_focused="true"><shape>
+            <solid android:color="#6633b5e5" />
+
+            <stroke android:width="2dp" android:color="#880099cc" />
+
+            <corners android:radius="2dp" />
+        </shape></item>
+    <item android:state_pressed="true"><shape>
+            <solid android:color="#880099cc" />
+
+            <corners android:radius="2dp" />
+        </shape></item>
+
+    <item android:drawable="@drawable/bg_checkbox_holo_light" />
+
+</selector>

res/layout/helpmain.xml

@@ -13,18 +13,99 @@
             android:id="@+id/tvEditMsg"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/activity_vertical_margin"
-            android:paddingRight="@dimen/activity_vertical_margin"
-            android:paddingTop="@dimen/activity_horizontal_margin"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingTop="@dimen/activity_vertical_margin"
             android:text="@string/msg_edit"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <View
             android:layout_width="fill_parent"
             android:layout_height="1dp"
-            android:layout_marginLeft="@dimen/activity_vertical_margin"
-            android:layout_marginRight="@dimen/activity_vertical_margin"
-            android:layout_marginTop="@dimen/activity_horizontal_margin"
+            android:layout_marginBottom="6dp"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:background="@android:color/darker_gray" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin" >
+
+            <ImageView
+                android:id="@+id/imgAppUser"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:contentDescription="@string/filter_app_sys"
+                android:src="?attr/icon_system" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="48dip"
+                android:layout_marginLeft="6dp"
+                android:gravity="center_vertical"
+                android:text="@string/filter_app_sys"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textIsSelectable="false" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin" >
+
+            <ImageView
+                android:id="@+id/imgAppSys"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:contentDescription="@string/filter_app_user"
+                android:src="?attr/icon_user" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="48dip"
+                android:layout_marginLeft="6dp"
+                android:gravity="center_vertical"
+                android:text="@string/filter_app_user"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textIsSelectable="false" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin" >
+
+            <ImageView
+                android:id="@+id/imageView1"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:contentDescription="@string/filter_app_both"
+                android:src="?attr/icon_user_system" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="48dip"
+                android:layout_marginLeft="6dp"
+                android:gravity="center_vertical"
+                android:text="@string/filter_app_both"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textIsSelectable="false" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dp"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="6dp"
             android:background="@android:color/darker_gray" />
 
         <include

res/layout/mainentry.xml

@@ -54,13 +54,34 @@
             android:src="?attr/icon_frozen" />
     </LinearLayout>
 
-    <CheckedTextView
-        android:id="@+id/ctvName"
+    <RelativeLayout
+        android:id="@+id/rlName"
         android:layout_width="match_parent"
         android:layout_height="?android:attr/listPreferredItemHeightSmall"
-        android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-        android:gravity="center_vertical"
-        android:paddingLeft="6dip"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
+        android:clickable="true"
+        android:focusable="true"
+        android:paddingLeft="6dip" >
+
+        <ImageView
+            android:id="@+id/imgCBName"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="3dp"
+            android:layout_marginRight="6dp"
+            android:background="?attr/drawable_checkbox_bg"
+            android:contentDescription="@string/menu_all"
+            android:duplicateParentState="true" />
+
+        <TextView
+            android:id="@+id/tvName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/imgCBName"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
 
 </LinearLayout>