From: drizea <danielrizea27@gmail.com>
Date: Mon, 23 Jul 2012 21:32:05 +0000 (+0300)
Subject: modified search to reseamble the mockup ui search
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=178b10932b9773d23f1760c0e73b5283324f7491;p=working%2FEvergreen.git

modified search to reseamble the mockup ui search
---

diff --git a/Open-ILS/src/Android/AndroidManifest.xml b/Open-ILS/src/Android/AndroidManifest.xml
index 940c6f7614..0e15105c20 100644
--- a/Open-ILS/src/Android/AndroidManifest.xml
+++ b/Open-ILS/src/Android/AndroidManifest.xml
@@ -10,7 +10,7 @@
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" 
-        android:theme="@style/AppTheme"
+        android:theme="@style/EvergreenTheme"
         >
 
         <activity
@@ -36,9 +36,8 @@
             ></activity>
         <activity
             android:name=".searchCatalog.SearchCatalogListView"
-            android:label="@string/app_name" 
-            android:theme="@android:style/Theme.Light.NoTitleBar"
-            >
+            android:label="@string/app_name">
+           	
         </activity>
         <activity android:name="org.evergreen.android.views.ApplicationPreferences"></activity>
         
diff --git a/Open-ILS/src/Android/res/drawable-hdpi/ic_action_settings.png b/Open-ILS/src/Android/res/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 0000000000..cc32e2d1d2
Binary files /dev/null and b/Open-ILS/src/Android/res/drawable-hdpi/ic_action_settings.png differ
diff --git a/Open-ILS/src/Android/res/drawable-hdpi/settings_small.png b/Open-ILS/src/Android/res/drawable-hdpi/settings_small.png
new file mode 100644
index 0000000000..1b95b273c2
Binary files /dev/null and b/Open-ILS/src/Android/res/drawable-hdpi/settings_small.png differ
diff --git a/Open-ILS/src/Android/res/drawable-mdpi/ic_action_settings.png b/Open-ILS/src/Android/res/drawable-mdpi/ic_action_settings.png
new file mode 100644
index 0000000000..dc66d914e8
Binary files /dev/null and b/Open-ILS/src/Android/res/drawable-mdpi/ic_action_settings.png differ
diff --git a/Open-ILS/src/Android/res/drawable/actionbar_button.xml b/Open-ILS/src/Android/res/drawable/actionbar_button.xml
new file mode 100644
index 0000000000..8f94012bd3
--- /dev/null
+++ b/Open-ILS/src/Android/res/drawable/actionbar_button.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <gradient android:startColor="@color/pres1"
+                android:endColor="@color/pres2" android:angle="270" />
+            <stroke android:width="5dp" android:color="@color/stro3" />
+           	<corners android:radius="10dp"/>
+            <padding android:left="5dp" android:top="0dp"
+                android:right="5dp" android:bottom="0dp" />
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape>
+            <gradient android:endColor="@color/focu1"
+                android:startColor="@color/focu2" android:angle="270" />
+            <stroke android:width="5dp" android:color="@color/stro2" />
+			<corners android:radius="10dp"/>
+            <padding android:left="5dp" android:top="0dp"
+                android:right="5dp" android:bottom="0dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient android:endColor="@color/norm1"
+                android:startColor="@color/norm2" android:angle="270" />
+            <corners android:radius="10dp"/>
+            <padding android:left="5dp" android:top="0dp"
+                android:right="5dp" android:bottom="0dp" />
+        </shape>
+    </item>
+
+</selector>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/drawable/actionbar_compat_item.xml b/Open-ILS/src/Android/res/drawable/actionbar_compat_item.xml
deleted file mode 100644
index 4b3960cf46..0000000000
--- a/Open-ILS/src/Android/res/drawable/actionbar_compat_item.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-  Copyright 2011 The Android Open Source Project
-
-  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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/actionbar_compat_item_pressed"
-        android:state_pressed="true" />
-    <item android:drawable="@drawable/actionbar_compat_item_focused"
-        android:state_focused="true" />
-    <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/Open-ILS/src/Android/res/drawable/actionbar_compat_item_focused.xml b/Open-ILS/src/Android/res/drawable/actionbar_compat_item_focused.xml
deleted file mode 100644
index 04811d3340..0000000000
--- a/Open-ILS/src/Android/res/drawable/actionbar_compat_item_focused.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-  Copyright 2011 The Android Open Source Project
-
-  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.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#ef7000" />
-</shape>
diff --git a/Open-ILS/src/Android/res/drawable/actionbar_compat_item_pressed.xml b/Open-ILS/src/Android/res/drawable/actionbar_compat_item_pressed.xml
deleted file mode 100644
index 72ff4b4f96..0000000000
--- a/Open-ILS/src/Android/res/drawable/actionbar_compat_item_pressed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-  Copyright 2011 The Android Open Source Project
-
-  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.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#eda700" />
-</shape>
diff --git a/Open-ILS/src/Android/res/drawable/header_rounded_corners.xml b/Open-ILS/src/Android/res/drawable/header_rounded_corners.xml
new file mode 100644
index 0000000000..ff1ab2eadc
--- /dev/null
+++ b/Open-ILS/src/Android/res/drawable/header_rounded_corners.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<shape xmlns:android="http://schemas.android.com/apk/res/android" 
+     android:shape="rectangle"> 
+     <gradient android:startColor="@color/header_gradient_start" android:endColor="@color/header_gradient_stop" 
+            android:angle="270"/> 
+
+    <corners android:bottomRightRadius="8dp" android:bottomLeftRadius="8dp" /> 
+</shape> 
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/drawable/menu_button.xml b/Open-ILS/src/Android/res/drawable/menu_button.xml
new file mode 100644
index 0000000000..fade6a4ace
--- /dev/null
+++ b/Open-ILS/src/Android/res/drawable/menu_button.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <gradient android:startColor="@color/pres1"
+                android:endColor="@color/pres2" android:angle="270" />
+            <stroke android:width="5dp" android:color="@color/stro3" />
+           	<corners android:radius="10dp" android:topRightRadius="80dp" android:bottomLeftRadius="80dp" />
+            <padding android:left="10dp" android:top="0dp"
+                android:right="10dp" android:bottom="0dp" />
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape>
+            <gradient android:endColor="@color/focu1"
+                android:startColor="@color/focu2" android:angle="270" />
+            <stroke android:width="5dp" android:color="@color/stro2" />
+			<corners android:radius="10dp" android:topRightRadius="80dp" android:bottomLeftRadius="80dp" />
+            <padding android:left="10dp" android:top="0dp"
+                android:right="10dp" android:bottom="0dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient android:endColor="@color/norm1"
+                android:startColor="@color/norm2" android:angle="270" />
+            <corners android:radius="10dp" android:topRightRadius="80dp" android:bottomLeftRadius="80dp" />
+            <padding android:left="10dp" android:top="0dp"
+                android:right="10dp" android:bottom="0dp" />
+        </shape>
+    </item>
+
+</selector>
diff --git a/Open-ILS/src/Android/res/drawable/rounded_buttom_corners.xml b/Open-ILS/src/Android/res/drawable/rounded_buttom_corners.xml
new file mode 100644
index 0000000000..dc348173af
--- /dev/null
+++ b/Open-ILS/src/Android/res/drawable/rounded_buttom_corners.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<shape xmlns:android="http://schemas.android.com/apk/res/android" 
+     android:shape="rectangle"> 
+    <gradient android:startColor="#eee" android:endColor="#aaa" 
+            android:angle="270"/> 
+
+    <corners android:bottomRightRadius="8dip" android:bottomLeftRadius="8dip" /> 
+</shape> 
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/layout/actionbar_compat.xml b/Open-ILS/src/Android/res/layout/actionbar_compat.xml
deleted file mode 100644
index 73cbd03997..0000000000
--- a/Open-ILS/src/Android/res/layout/actionbar_compat.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  Copyright 2011 The Android Open Source Project
-
-  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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/actionbar_compat"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="horizontal" />
diff --git a/Open-ILS/src/Android/res/layout/actionbar_indeterminate_progress.xml b/Open-ILS/src/Android/res/layout/actionbar_indeterminate_progress.xml
deleted file mode 100644
index c05750e00a..0000000000
--- a/Open-ILS/src/Android/res/layout/actionbar_indeterminate_progress.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-  Copyright 2011 The Android Open Source Project
-
-  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.
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:gravity="center">
-    <ProgressBar android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
-        android:layout_gravity="center"
-        style="?android:attr/indeterminateProgressStyle" />
-</FrameLayout>
diff --git a/Open-ILS/src/Android/res/layout/advanced_search_dialog.xml b/Open-ILS/src/Android/res/layout/advanced_search_dialog.xml
new file mode 100644
index 0000000000..3fd28b94c7
--- /dev/null
+++ b/Open-ILS/src/Android/res/layout/advanced_search_dialog.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+
+        <Spinner 
+        android:id="@+id/advanced_spinner_index"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:entries="@array/advanced_search_index"
+        />
+            
+        <Spinner 
+        android:id="@+id/advanced_spinner_option"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:entries="@array/advanced_search_options"
+        android:layout_toRightOf="@id/advanced_spinner_index" 
+        />
+        
+        <LinearLayout 
+            android:id="@+id/advanced_search_filter_container"
+            android:layout_below="@id/advanced_spinner_index"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            >
+            
+        	<EditText 
+        	android:id="@+id/advanced_search_text"
+        	android:layout_width="0dip"
+        	android:layout_height="wrap_content"
+        	android:layout_weight="1"
+        	android:hint="@string/advanced_search_hint"
+        	android:singleLine="true"
+        	/>
+
+        
+        	<Button 
+            android:id="@+id/advanced_search_add_filter_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/advanced_search_add_filter_button"
+            />  
+            
+            
+        </LinearLayout>
+        
+        <ScrollView
+            android:id="@+id/advanced_search_scrollview"
+            android:layout_width="fill_parent"
+            android:layout_height="100dip"
+            android:layout_below="@id/advanced_search_filter_container"
+            >
+            
+            <LinearLayout 
+                android:id="@+id/advanced_search_filters"
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:background="@color/white"
+                >
+				
+				<TextView 
+			    android:layout_height="wrap_content"
+			    android:layout_width="wrap_content"
+			    android:text="@string/advanced_search_filter_text"
+			    />
+			 
+            </LinearLayout>
+        </ScrollView>
+        
+
+        <Button 
+            android:id="@+id/advanced_search_cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/advanced_search_scrollview"
+            android:text="cancel"
+            />
+        
+        
+        <Button
+            android:id="@+id/advanced_search_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/advanced_search_scrollview"
+            android:layout_toRightOf="@id/advanced_search_cancel"
+            android:text="search"
+            
+            />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/layout/main.xml b/Open-ILS/src/Android/res/layout/main.xml
deleted file mode 100644
index bc12cd8231..0000000000
--- a/Open-ILS/src/Android/res/layout/main.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/hello" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/layout/search_result_list.xml b/Open-ILS/src/Android/res/layout/search_result_list.xml
index c8969f1a6c..22219e56b4 100644
--- a/Open-ILS/src/Android/res/layout/search_result_list.xml
+++ b/Open-ILS/src/Android/res/layout/search_result_list.xml
@@ -1,23 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:layout_height="fill_parent">
 
-     <LinearLayout
+    <RelativeLayout
+        android:id="@+id/header"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="@drawable/header_rounded_corners"
+        android:paddingTop="3dip"
+        >
+        
+        <Button 
+            android:id="@+id/library_logo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/library_text_logo"
+            style="@style/LibraryLogoText"
+            android:layout_alignParentLeft="true"
+            android:padding="10dip"
+            />
+
+        <Button
+            android:id="@+id/my_acount_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/my_account_button_text"
+            android:layout_alignParentRight="true"
+            android:padding="10dip"
+            />
+
+
+        <LinearLayout
             android:orientation="horizontal"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:padding="4dp"
-            android:background="@android:color/white">
+            android:id="@+id/search_text_container"
+            android:layout_below="@id/library_logo">
 
             <EditText
                     android:id="@+id/searchText"
-                    android:layout_width="fill_parent"
+                    android:layout_width="0dip"
                     android:layout_height="wrap_content"
+                    android:hint="@string/search_hint"
+                    android:singleLine="true"
                     android:layout_weight="1"/>
 
-            <ImageButton
+        </LinearLayout>
+        
+        <LinearLayout 
+            android:id="@+id/search_functions"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/search_text_container">
+            
+                <Spinner 
+	 			android:id="@+id/chose_organisation"   
+	 			android:layout_width="fill_parent"
+	 			android:layout_height="wrap_content"
+	 			android:layout_gravity="center_horizontal"
+				android:layout_weight="1"/>
+            	
+                <ImageButton
                     android:id="@+id/searchButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -26,14 +72,57 @@
                     android:paddingLeft="10dp"
                     android:paddingRight="10dp"
                     android:paddingTop="5dp"
-                    android:paddingBottom="5dp"
-                    android:background="@color/green"/>
+                    android:paddingBottom="5dp"/> 
 
         </LinearLayout>
-    
-    
-     <LinearLayout android:layout_width="fill_parent"
-         android:layout_height="wrap_content">
+
+    </RelativeLayout>
+
+
+     
+     <LinearLayout 
+         android:id="@+id/search_preference_options"
+         android:layout_width="250dip"
+         android:layout_height="wrap_content"
+         android:orientation="vertical"
+         android:gravity="center"
+         android:layout_below="@id/header"
+         android:layout_centerHorizontal="true"
+         >
+         
+         
+         	<Button 
+         	 android:id="@+id/menu_advanced_search_button"
+             android:layout_width="fill_parent"
+             android:layout_height="wrap_content"
+             android:text="@string/menu_button_advanced_search"
+             android:drawableLeft="@drawable/settings_small"
+             style="@style/MenuListButton"
+             />
+         
+            <Button 
+             android:layout_width="fill_parent"
+             android:layout_height="wrap_content"
+             android:text="@string/menu_button_library_hours"
+             android:drawableLeft="@drawable/settings_small"
+             style="@style/MenuListButton"
+             />
+                  
+            
+            <Button 
+             android:layout_width="fill_parent"
+             android:layout_height="wrap_content"
+             android:text="@string/menu_button_application_preferences"
+             android:drawableLeft="@drawable/settings_small"
+             style="@style/MenuListButton"
+             />
+            
+     </LinearLayout>
+          <LinearLayout android:layout_width="fill_parent"
+         android:layout_height="wrap_content"
+         android:id="@+id/search_text"
+         android:layout_below="@id/search_preference_options"
+         >
          <TextView 
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
@@ -48,23 +137,11 @@
              />
          
      </LinearLayout>
+     
 	<ListView 
 	  android:id="@+id/search_results_list"
 	  android:layout_width="fill_parent"
-	  android:layout_height="wrap_content"  
+	  android:layout_height="fill_parent"
+	  android:layout_below="@id/search_text"  
 	  ></ListView>
-	
-	<!-- filler -->
-	<TextView android:layout_height="0dip" 
-          android:layout_width="fill_parent"
-          android:layout_weight="1" />
-	
-	
-	<Spinner 
-	 android:id="@+id/chose_organisation"   
-	 android:layout_width="fill_parent"
-	 android:layout_height="wrap_content"
-	 android:layout_gravity="center_horizontal"
-	    />
-
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/menu/checkout_menu.xml b/Open-ILS/src/Android/res/menu/checkout_menu.xml
index 36f930e8ec..cbf72fa35c 100644
--- a/Open-ILS/src/Android/res/menu/checkout_menu.xml
+++ b/Open-ILS/src/Android/res/menu/checkout_menu.xml
@@ -11,11 +11,5 @@
         android:icon="@drawable/ic_launcher"
         android:orderInCategory="0"
         android:showAsAction="always" />
-
-    <item android:id="@+id/menu_share"
-        android:title="share"
-        android:icon="@drawable/ic_menu_share"
-        android:orderInCategory="1"
-        android:showAsAction="never" />
 </menu>
 
diff --git a/Open-ILS/src/Android/res/menu/search_menu.xml b/Open-ILS/src/Android/res/menu/search_menu.xml
new file mode 100644
index 0000000000..c5fd140420
--- /dev/null
+++ b/Open-ILS/src/Android/res/menu/search_menu.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/menu_advanced_settings"
+        android:title="advanced"
+        android:icon="@drawable/ic_action_settings"
+        android:orderInCategory="1"
+        android:showAsAction="always" />
+
+
+</menu>
diff --git a/Open-ILS/src/Android/res/values/colors.xml b/Open-ILS/src/Android/res/values/colors.xml
index 4fa2bb5d7a..7068f13a65 100644
--- a/Open-ILS/src/Android/res/values/colors.xml
+++ b/Open-ILS/src/Android/res/values/colors.xml
@@ -36,6 +36,21 @@
     <color name="blue">#1e90ff</color>
     <color name="red">#ff0000</color>
     
-    <color name="actionbar_title_color">#224894</color>
+    
+    
+    <!-- Menu Buttons -->
+    <color name="pres1">#de9d00</color>
+    <color name="pres2">#de4400</color>
+    <color name="stro3">#eee</color>
+    <color name="focu1">#000</color>
+    <color name="focu2">#000</color>
+    <color name="stro2">#fff</color>
+    <color name="norm1">#0068de</color>
+    <color name="norm2">#00ccde</color>
+    
+	<!-- Header portion -->
+    <color name="header_gradient_start">#a10000</color>
+    <color name="header_gradient_stop">#aA0000</color>
+    <color name="library_logo_text_coor">#ffffff</color>
     
 </resources>
diff --git a/Open-ILS/src/Android/res/values/dimens.xml b/Open-ILS/src/Android/res/values/dimens.xml
index 707fabdd2f..75bdd5d524 100644
--- a/Open-ILS/src/Android/res/values/dimens.xml
+++ b/Open-ILS/src/Android/res/values/dimens.xml
@@ -19,9 +19,7 @@
     <dimen name="text_size_small">14sp</dimen>
     <dimen name="text_size_medium">18sp</dimen>
     <dimen name="text_size_large">22sp</dimen>
+
     
-    <dimen name="actionbar_compat_height">48dp</dimen>
-    <dimen name="actionbar_compat_button_width">48dp</dimen>
-    <dimen name="actionbar_compat_button_home_width">56dp</dimen>
-    
+    <dimen name="library_logo_text_size">18sp</dimen>
 </resources>
diff --git a/Open-ILS/src/Android/res/values/resources.xml b/Open-ILS/src/Android/res/values/resources.xml
new file mode 100644
index 0000000000..edba3c1082
--- /dev/null
+++ b/Open-ILS/src/Android/res/values/resources.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="advanced_search_index">
+		<item>Keyword</item>
+		<item>Title</item>
+		<item>Author</item>
+		<item>Subject</item>
+		<item>Series</item>
+    </string-array>
+    
+    <string-array name="advanced_search_options">
+		<item>Contains</item>
+		<item>Does not contain</item>
+		<item>Matches exactly</item>
+    </string-array>
+    
+</resources>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/values/strings.xml b/Open-ILS/src/Android/res/values/strings.xml
index 0775dfde50..b467ac885c 100644
--- a/Open-ILS/src/Android/res/values/strings.xml
+++ b/Open-ILS/src/Android/res/values/strings.xml
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <!-- Header portion  -->
+    <string name="library_text_logo"> Evergreen </string>
+    <string name="my_account_button_text">My Account</string>
+    <string name="options_button_text">Options</string>
+    
+    <string name="search_hint">What are you looking for?</string>
+    <string name="advanced_search_hint">Enter text here</string>
+    <string name="advanced_search_add_filter_button">Add filter</string>
+    <string name="advanced_search_filter_text">Added filters:</string>
+    
+    <string name="menu_button_advanced_search">Advanced search</string>
+    <string name="menu_button_library_hours">Library hours</string>
+    <string name="menu_button_application_preferences">Preferences</string>
+    
+    
     <string name="hello">Hello World, EvergreenAppActivity!</string>
     <string name="app_name">EvergreenApp</string>
 
diff --git a/Open-ILS/src/Android/res/values/styles.xml b/Open-ILS/src/Android/res/values/styles.xml
index d827306fbb..63ed6f8e1d 100644
--- a/Open-ILS/src/Android/res/values/styles.xml
+++ b/Open-ILS/src/Android/res/values/styles.xml
@@ -129,54 +129,20 @@
     </style>
     
     
-    <!--  Action bar compatibility start  -->
-    
-    <style name="AppTheme" parent="android:Theme.Black">
-        <item name="android:windowTitleSize">@dimen/actionbar_compat_height</item>
-        <item name="android:windowTitleBackgroundStyle">@style/ActionBarCompat</item>
-        <item name="android:windowContentOverlay">@drawable/actionbar_shadow</item>
-
-        <!-- for programmatic instantiation -->
-        <item name="actionbarCompatTitleStyle">@style/ActionBarCompatTitle</item>
-        <item name="actionbarCompatItemStyle">@style/ActionBarCompatItem</item>
-        <item name="actionbarCompatItemHomeStyle">@style/ActionBarCompatHomeItem</item>
-        <item name="actionbarCompatProgressIndicatorStyle">@style/ActionBarCompatProgressIndicator</item>
-    </style>
-
-    <style name="ActionBarCompat">
-        <item name="android:background">#eee</item>
-    </style>
-
-    <style name="ActionBarCompatItemBase">
-        <!-- layout_width/height must be set in code -->
-        <item name="android:scaleType">center</item>
-        <item name="android:background">@drawable/actionbar_compat_item</item>
-    </style>
-
-    <style name="ActionBarCompatProgressIndicator" parent="android:style/Widget.ProgressBar.Large">
-        <item name="android:indeterminate">true</item>
-    </style>
-
-    <style name="ActionBarCompatTitleBase">
-        <item name="android:id">@id/actionbar_compat_title</item>
-        <!-- layout_width/height/weight must be set in code -->
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:textSize">18sp</item>
-        <item name="android:paddingLeft">6dp</item>
-        <item name="android:paddingRight">6dp</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">marquee</item>
-    </style>
-
-    <style name="ActionBarCompatTitle" parent="style/ActionBarCompatTitleBase">
-        <item name="android:textColor">@color/actionbar_title_color</item>
-    </style>
-
-    <style name="ActionBarCompatItem" parent="style/ActionBarCompatItemBase">
-    </style>
-
-    <style name="ActionBarCompatHomeItem" parent="style/ActionBarCompatItemBase">
+    <!--  Menu List Buttons -->
+   <style name="MenuListButton">
+		<item name="android:background">@drawable/menu_button</item>
+		<item name="android:layout_marginTop">10dip</item>
     </style>
     
-    <!--  Action bar compatibility end -->
+    
+	<!-- Header portion start -->
+	
+	<style name="LibraryLogoText">
+        <item name="android:textColor">@color/library_logo_text_coor</item>
+        <item name="android:textSize">@dimen/library_logo_text_size</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+	
+	<!-- Header portion end -->
 </resources>
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java
index 346a8fa0cd..42d5c71a03 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java
@@ -10,7 +10,6 @@ import org.evergreen.android.accountAccess.SessionNotFoundException;
 import org.evergreen.android.globals.NoAccessToServer;
 import org.evergreen.android.globals.NoNetworkAccessException;
 import org.evergreen.android.globals.Utils;
-import org.evergreen.android.utils.ui.actionbar.ActionBarActivity;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
@@ -29,7 +28,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-public class ItemsCheckOutListView extends ActionBarActivity{
+public class ItemsCheckOutListView extends Activity{
 
 	private String TAG = "ItemsCheckOutListView";
 	
@@ -128,31 +127,7 @@ public class ItemsCheckOutListView extends ActionBarActivity{
 	
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		 switch (item.getItemId()) {
-         case android.R.id.home:
-             Toast.makeText(this, "Tapped home", Toast.LENGTH_SHORT).show();
-             break;
-
-         case R.id.menu_refresh:
-             Toast.makeText(this, "Fake refreshing...", Toast.LENGTH_SHORT).show();
-             getActionBarHelper().setRefreshActionItemState(true);
-             getWindow().getDecorView().postDelayed(
-                     new Runnable() {
-                         @Override
-                         public void run() {
-                             getActionBarHelper().setRefreshActionItemState(false);
-                         }
-                     }, 1000);
-             break;
-
-         case R.id.menu_search:
-             Toast.makeText(this, "Tapped search", Toast.LENGTH_SHORT).show();
-             break;
-
-         case R.id.menu_share:
-             Toast.makeText(this, "Tapped share", Toast.LENGTH_SHORT).show();
-             break;
-     }
+		
 		return super.onOptionsItemSelected(item);
 	}
 	
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
index 3219e55d19..75ba139c63 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
@@ -15,6 +15,7 @@ import org.evergreen.android.globals.Utils;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
@@ -23,12 +24,16 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.View.OnKeyListener;
 import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemSelectedListener;
@@ -37,6 +42,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -82,18 +88,86 @@ public class SearchCatalogListView extends Activity{
 	
 	private final ImageDownloader imageDownloader = new ImageDownloader();
 	
+	private Runnable searchForResultsRunnable = null;
+	
+	private View searchOptionsMenu = null;
+	
+	private Button advancedSearchButton = null;
+	
+	private Button homeButton = null;
+	
+	private String advancedSearchString = null;
+	
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.search_result_list);
+        setTitle("Browse catalog");
+        
+        
+        homeButton = (Button) findViewById(R.id.library_logo);
+        
+        homeButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				searchOptionsMenu.setVisibility(View.VISIBLE);	
+			}
+		});
+        
+        advancedSearchButton = (Button) findViewById(R.id.menu_advanced_search_button);
+        
+        advancedSearchButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				//show advanced view dialog
+				
+				final Dialog dialog = new Dialog(context);
+                dialog.setContentView(R.layout.advanced_search_dialog);
+                dialog.setTitle("Advanced search");
+             
+                final LinearLayout layout = (LinearLayout) dialog.findViewById(R.id.advanced_search_filters);
 
+                Button addFilter = (Button) dialog.findViewById(R.id.advanced_search_add_filter_button);
+                
+                final Spinner search_index = (Spinner) dialog.findViewById(R.id.advanced_spinner_index);
+                final Spinner search_option = (Spinner) dialog.findViewById(R.id.advanced_spinner_option);
+                final EditText search_filter_text = (EditText) dialog.findViewById(R.id.advanced_search_text);
+      
+                addFilter.setOnClickListener(new OnClickListener() {
+					@Override
+					public void onClick(View v) {
+		                TextView text = new TextView(context);
+		                text.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
+		                text.setText(search_index.getSelectedItem().toString() + " " + search_option.getSelectedItem().toString() + " " + search_filter_text.getText().toString());
+		                layout.addView(text);
+
+					}
+				});
+
+                
+                Button cancel = (Button) dialog.findViewById(R.id.advanced_search_cancel);
+                
+                cancel.setOnClickListener(new OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						dialog.dismiss();
+					}
+				});
+                
+                
+                
+                dialog.setCancelable(true);
+                dialog.show();
+			}
+		});
+        
         //singleton initialize necessary IDL and Org data
         globalConfigs = GlobalConfigs.getGlobalConfigs(this);
         
         context = this;
         search = SearchCatalog.getInstance((ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE));
                 
-        recordList= new ArrayList<RecordInfo>();
+        recordList = new ArrayList<RecordInfo>();
 
         // Create a customized ArrayAdapter
         adapter = new SearchArrayAdapter(
@@ -104,6 +178,7 @@ public class SearchCatalogListView extends Activity{
     	// Get reference to ListView holder
     	lv = (ListView) this.findViewById(R.id.search_results_list);
     	
+    	searchOptionsMenu = findViewById(R.id.search_preference_options);
     	 
     	// Creating a button - Load More
     	Button btnLoadMore = new Button(this);
@@ -128,6 +203,71 @@ public class SearchCatalogListView extends Activity{
     	
     	registerForContextMenu(lv);
     	
+    	searchForResultsRunnable = new Runnable() {
+			
+			@Override
+			public void run() {
+				
+				final String text = searchText.getText().toString();	
+				
+				if(text.length()<1)
+					return;
+				
+				runOnUiThread(new Runnable() {
+					@Override
+					public void run() {
+						
+						searchOptionsMenu.setVisibility(View.GONE);
+						progressDialog = new ProgressDialog(context);
+						
+						progressDialog.setMessage("Fetching data");
+						progressDialog.show();
+					}
+				});
+				
+				try {
+					searchResults = search.getSearchResults(text,0);
+				} catch (NoNetworkAccessException e) {	
+					System.out.println("no network access in search");
+					SearchCatalogListView.this.runOnUiThread(Utils.showNetworkNotAvailableDialog(context));
+					
+				} catch (NoAccessToServer e) {
+					SearchCatalogListView.this.runOnUiThread(Utils.showServerNotAvailableDialog(context));								
+				}
+					
+				runOnUiThread(new Runnable() {
+					
+					@Override
+					public void run() {
+
+						recordList.clear();
+						
+						if(searchResults.size()>0){
+							
+							for(int j=0;j<searchResults.size();j++)
+								recordList.add(searchResults.get(j));
+							
+						//add extra record to display more option button
+						if(search.visible > recordList.size()){
+							recordList.add(new RecordInfo());
+							searchResultsNumber.setText(recordList.size()-1 +" out of "+search.visible);
+							}
+						else
+							searchResultsNumber.setText(recordList.size() +" out of "+search.visible);
+						}
+						else
+							searchResultsNumber.setText(recordList.size() +" out of "+search.visible);
+						
+						adapter.notifyDataSetChanged();
+						progressDialog.dismiss();
+						
+						
+					}
+				});
+				
+			}
+		};
+    	
     	lv.setOnItemClickListener(new OnItemClickListener() {
     		
     		@Override
@@ -214,6 +354,21 @@ public class SearchCatalogListView extends Activity{
         
         searchText = (EditText) findViewById(R.id.searchText);
  
+        
+        searchText.setOnKeyListener(new OnKeyListener() {
+			
+			@Override
+			public boolean onKey(View v, int keyCode, KeyEvent event) {
+			
+				if(keyCode == KeyEvent.KEYCODE_ENTER){
+					Thread searchThread = new Thread(searchForResultsRunnable);
+					
+					searchThread.start();
+				}
+				return false;
+			}
+		});
+        
         choseOrganisation = (Spinner) findViewById(R.id.chose_organisation);
         
         searchButton = (ImageButton) findViewById(R.id.searchButton);
@@ -222,69 +377,9 @@ public class SearchCatalogListView extends Activity{
 	
         
 			@Override
-			public void onClick(View v) {
-				
-				final String text = searchText.getText().toString();				
-				progressDialog = new ProgressDialog(context);
-				
-				progressDialog.setMessage("Fetching data");
-				progressDialog.show();
-				
-				if(text.length()>0){
-					
-					Thread searchThread = new Thread(new Runnable() {
-						
-						@Override
-						public void run() {
-							
-							searchResults.clear();
-							
-							try {
-								searchResults = search.getSearchResults(text,0);
-							} catch (NoNetworkAccessException e) {	
-								System.out.println("no network access in search");
-								SearchCatalogListView.this.runOnUiThread(Utils.showNetworkNotAvailableDialog(context));
-								
-							} catch (NoAccessToServer e) {
-								SearchCatalogListView.this.runOnUiThread(Utils.showServerNotAvailableDialog(context));								
-							}
-								
-							runOnUiThread(new Runnable() {
-								
-								@Override
-								public void run() {
-
-									recordList.clear();
-									
-									if(searchResults.size()>0){
-										
-										for(int j=0;j<searchResults.size();j++)
-											recordList.add(searchResults.get(j));
-										
-									//add extra record to display more option button
-									if(search.visible > recordList.size()){
-										recordList.add(new RecordInfo());
-										searchResultsNumber.setText(recordList.size()-1 +" out of "+search.visible);
-										}
-									else
-										searchResultsNumber.setText(recordList.size() +" out of "+search.visible);
-									}
-									else
-										searchResultsNumber.setText(recordList.size() +" out of "+search.visible);
-									
-									adapter.notifyDataSetChanged();
-									progressDialog.dismiss();
-									
-									
-								}
-							});
-							
-						}
-					});
-					
+			public void onClick(View v) {	
+					Thread searchThread = new Thread(searchForResultsRunnable);				
 					searchThread.start();
-
-				}
 			}
 		});
 
@@ -369,6 +464,23 @@ public class SearchCatalogListView extends Activity{
         
         
     }
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+		MenuInflater menuInflater = getMenuInflater();
+	    menuInflater.inflate(R.menu.search_menu, menu);
+    	return super.onCreateOptionsMenu(menu);
+    }
+    
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+    	 switch (item.getItemId()) {
+         case android.R.id.home:
+             Toast.makeText(this, "Tapped home", Toast.LENGTH_SHORT).show();
+             break;
+             
+     }
+    	return super.onOptionsItemSelected(item);
+    }
     
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v,
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarActivity.java b/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarActivity.java
deleted file mode 100644
index 7c8239734b..0000000000
--- a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarActivity.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * 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.evergreen.android.utils.ui.actionbar;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-
-/**
- * A base activity that defers common functionality across app activities to an {@link
- * ActionBarHelper}.
- *
- * NOTE: dynamically marking menu items as invisible/visible is not currently supported.
- *
- * NOTE: this may used with the Android Compatibility Package by extending
- * android.support.v4.app.FragmentActivity instead of {@link Activity}.
- */
-public abstract class ActionBarActivity extends Activity {
-    final ActionBarHelper mActionBarHelper = ActionBarHelper.createInstance(this);
-
-    /**
-     * Returns the {@link ActionBarHelper} for this activity.
-     */
-    protected ActionBarHelper getActionBarHelper() {
-        return mActionBarHelper;
-    }
-
-    /**{@inheritDoc}*/
-    @Override
-    public MenuInflater getMenuInflater() {
-        return mActionBarHelper.getMenuInflater(super.getMenuInflater());
-    }
-
-    /**{@inheritDoc}*/
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mActionBarHelper.onCreate(savedInstanceState);
-    }
-
-    /**{@inheritDoc}*/
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        mActionBarHelper.onPostCreate(savedInstanceState);
-    }
-
-    /**
-     * Base action bar-aware implementation for
-     * {@link Activity#onCreateOptionsMenu(android.view.Menu)}.
-     *
-     * Note: marking menu items as invisible/visible is not currently supported.
-     */
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        boolean retValue = false;
-        retValue |= mActionBarHelper.onCreateOptionsMenu(menu);
-        retValue |= super.onCreateOptionsMenu(menu);
-        return retValue;
-    }
-
-    /**{@inheritDoc}*/
-    @Override
-    protected void onTitleChanged(CharSequence title, int color) {
-        mActionBarHelper.onTitleChanged(title, color);
-        super.onTitleChanged(title, color);
-    }
-}
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelper.java b/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelper.java
deleted file mode 100644
index df08423753..0000000000
--- a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelper.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * 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.evergreen.android.utils.ui.actionbar;
-
-import android.app.Activity;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-
-/**
- * An abstract class that handles some common action bar-related functionality in the app. This
- * class provides functionality useful for both phones and tablets, and does not require any Android
- * 3.0-specific features, although it uses them if available.
- *
- * Two implementations of this class are {@link ActionBarHelperBase} for a pre-Honeycomb version of
- * the action bar, and {@link ActionBarHelperHoneycomb}, which uses the built-in ActionBar features
- * in Android 3.0 and later.
- */
-public abstract class ActionBarHelper {
-    protected Activity mActivity;
-
-    /**
-     * Factory method for creating {@link ActionBarHelper} objects for a
-     * given activity. Depending on which device the app is running, either a basic helper or
-     * Honeycomb-specific helper will be returned.
-     */
-    public static ActionBarHelper createInstance(Activity activity) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            return new ActionBarHelperICS(activity);
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            return new ActionBarHelperHoneycomb(activity);
-        } else {
-            return new ActionBarHelperBase(activity);
-        }
-    }
-
-    protected ActionBarHelper(Activity activity) {
-        mActivity = activity;
-    }
-
-    /**
-     * Action bar helper code to be run in {@link Activity#onCreate(android.os.Bundle)}.
-     */
-    public void onCreate(Bundle savedInstanceState) {
-    }
-
-    /**
-     * Action bar helper code to be run in {@link Activity#onPostCreate(android.os.Bundle)}.
-     */
-    public void onPostCreate(Bundle savedInstanceState) {
-    }
-
-    /**
-     * Action bar helper code to be run in {@link Activity#onCreateOptionsMenu(android.view.Menu)}.
-     *
-     * NOTE: Setting the visibility of menu items in <em>menu</em> is not currently supported.
-     */
-    public boolean onCreateOptionsMenu(Menu menu) {
-        return true;
-    }
-
-    /**
-     * Action bar helper code to be run in {@link Activity#onTitleChanged(CharSequence, int)}.
-     */
-    protected void onTitleChanged(CharSequence title, int color) {
-    }
-
-    /**
-     * Sets the indeterminate loading state of the item with ID {@link R.id.menu_refresh}.
-     * (where the item ID was menu_refresh).
-     */
-    public abstract void setRefreshActionItemState(boolean refreshing);
-
-    /**
-     * Returns a {@link MenuInflater} for use when inflating menus. The implementation of this
-     * method in {@link ActionBarHelperBase} returns a wrapped menu inflater that can read
-     * action bar metadata from a menu resource pre-Honeycomb.
-     */
-    public MenuInflater getMenuInflater(MenuInflater superMenuInflater) {
-        return superMenuInflater;
-    }
-}
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelperBase.java b/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelperBase.java
deleted file mode 100644
index e17439d3e9..0000000000
--- a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelperBase.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * 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.evergreen.android.utils.ui.actionbar;
-
-import org.evergreen.android.R;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.XmlResourceParser;
-import android.os.Bundle;
-import android.view.InflateException;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * A class that implements the action bar pattern for pre-Honeycomb devices.
- */
-public class ActionBarHelperBase extends ActionBarHelper {
-    private static final String MENU_RES_NAMESPACE = "http://schemas.android.com/apk/res/android";
-    private static final String MENU_ATTR_ID = "id";
-    private static final String MENU_ATTR_SHOW_AS_ACTION = "showAsAction";
-
-    protected Set<Integer> mActionItemIds = new HashSet<Integer>();
-
-    protected ActionBarHelperBase(Activity activity) {
-        super(activity);
-    }
-
-    /**{@inheritDoc}*/
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        mActivity.requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
-    }
-
-    /**{@inheritDoc}*/
-    @Override
-    public void onPostCreate(Bundle savedInstanceState) {
-        mActivity.getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE,
-                R.layout.actionbar_compat);
-        setupActionBar();
-
-        SimpleMenu menu = new SimpleMenu(mActivity);
-        mActivity.onCreatePanelMenu(Window.FEATURE_OPTIONS_PANEL, menu);
-        mActivity.onPrepareOptionsMenu(menu);
-        for (int i = 0; i < menu.size(); i++) {
-            MenuItem item = menu.getItem(i);
-            if (mActionItemIds.contains(item.getItemId())) {
-                addActionItemCompatFromMenuItem(item);
-            }
-        }
-    }
-
-    /**
-     * Sets up the compatibility action bar with the given title.
-     */
-    private void setupActionBar() {
-        final ViewGroup actionBarCompat = getActionBarCompat();
-        if (actionBarCompat == null) {
-            return;
-        }
-
-        LinearLayout.LayoutParams springLayoutParams = new LinearLayout.LayoutParams(
-                0, ViewGroup.LayoutParams.FILL_PARENT);
-        springLayoutParams.weight = 1;
-
-        // Add Home button
-        SimpleMenu tempMenu = new SimpleMenu(mActivity);
-        SimpleMenuItem homeItem = new SimpleMenuItem(
-                tempMenu, android.R.id.home, 0, mActivity.getString(R.string.app_name));
-        homeItem.setIcon(R.drawable.ic_home);
-        addActionItemCompatFromMenuItem(homeItem);
-
-        // Add title text
-        TextView titleText = new TextView(mActivity, null, R.attr.actionbarCompatTitleStyle);
-        titleText.setLayoutParams(springLayoutParams);
-        titleText.setText(mActivity.getTitle());
-        actionBarCompat.addView(titleText);
-    }
-
-    /**{@inheritDoc}*/
-    @Override
-    public void setRefreshActionItemState(boolean refreshing) {
-        View refreshButton = mActivity.findViewById(R.id.actionbar_compat_item_refresh);
-        View refreshIndicator = mActivity.findViewById(
-                R.id.actionbar_compat_item_refresh_progress);
-
-        if (refreshButton != null) {
-            refreshButton.setVisibility(refreshing ? View.GONE : View.VISIBLE);
-        }
-        if (refreshIndicator != null) {
-            refreshIndicator.setVisibility(refreshing ? View.VISIBLE : View.GONE);
-        }
-    }
-
-    /**
-     * Action bar helper code to be run in {@link Activity#onCreateOptionsMenu(android.view.Menu)}.
-     *
-     * NOTE: This code will mark on-screen menu items as invisible.
-     */
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Hides on-screen action items from the options menu.
-        for (Integer id : mActionItemIds) {
-            menu.findItem(id).setVisible(false);
-        }
-        return true;
-    }
-
-    /**{@inheritDoc}*/
-    @Override
-    protected void onTitleChanged(CharSequence title, int color) {
-        TextView titleView = (TextView) mActivity.findViewById(R.id.actionbar_compat_title);
-        if (titleView != null) {
-            titleView.setText(title);
-        }
-    }
-
-    /**
-     * Returns a {@link android.view.MenuInflater} that can read action bar metadata on
-     * pre-Honeycomb devices.
-     */
-    public MenuInflater getMenuInflater(MenuInflater superMenuInflater) {
-        return new WrappedMenuInflater(mActivity, superMenuInflater);
-    }
-
-    /**
-     * Returns the {@link android.view.ViewGroup} for the action bar on phones (compatibility action
-     * bar). Can return null, and will return null on Honeycomb.
-     */
-    private ViewGroup getActionBarCompat() {
-        return (ViewGroup) mActivity.findViewById(R.id.actionbar_compat);
-    }
-
-    /**
-     * Adds an action button to the compatibility action bar, using menu information from a {@link
-     * android.view.MenuItem}. If the menu item ID is <code>menu_refresh</code>, the menu item's
-     * state can be changed to show a loading spinner using
-     * {@link com.example.android.actionbarcompat.ActionBarHelperBase#setRefreshActionItemState(boolean)}.
-     */
-    private View addActionItemCompatFromMenuItem(final MenuItem item) {
-        final int itemId = item.getItemId();
-
-        final ViewGroup actionBar = getActionBarCompat();
-        if (actionBar == null) {
-            return null;
-        }
-
-        // Create the button
-        ImageButton actionButton = new ImageButton(mActivity, null,
-                itemId == android.R.id.home
-                        ? R.attr.actionbarCompatItemHomeStyle
-                        : R.attr.actionbarCompatItemStyle);
-        actionButton.setLayoutParams(new ViewGroup.LayoutParams(
-                (int) mActivity.getResources().getDimension(
-                        itemId == android.R.id.home
-                                ? R.dimen.actionbar_compat_button_home_width
-                                : R.dimen.actionbar_compat_button_width),
-                ViewGroup.LayoutParams.FILL_PARENT));
-        if (itemId == R.id.menu_refresh) {
-            actionButton.setId(R.id.actionbar_compat_item_refresh);
-        }
-        actionButton.setImageDrawable(item.getIcon());
-        actionButton.setScaleType(ImageView.ScaleType.CENTER);
-        actionButton.setContentDescription(item.getTitle());
-        actionButton.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View view) {
-                mActivity.onMenuItemSelected(Window.FEATURE_OPTIONS_PANEL, item);
-            }
-        });
-
-        actionBar.addView(actionButton);
-
-        if (item.getItemId() == R.id.menu_refresh) {
-            // Refresh buttons should be stateful, and allow for indeterminate progress indicators,
-            // so add those.
-            ProgressBar indicator = new ProgressBar(mActivity, null,
-                    R.attr.actionbarCompatProgressIndicatorStyle);
-
-            final int buttonWidth = mActivity.getResources().getDimensionPixelSize(
-                    R.dimen.actionbar_compat_button_width);
-            final int buttonHeight = mActivity.getResources().getDimensionPixelSize(
-                    R.dimen.actionbar_compat_height);
-            final int progressIndicatorWidth = buttonWidth / 2;
-
-            LinearLayout.LayoutParams indicatorLayoutParams = new LinearLayout.LayoutParams(
-                    progressIndicatorWidth, progressIndicatorWidth);
-            indicatorLayoutParams.setMargins(
-                    (buttonWidth - progressIndicatorWidth) / 2,
-                    (buttonHeight - progressIndicatorWidth) / 2,
-                    (buttonWidth - progressIndicatorWidth) / 2,
-                    0);
-            indicator.setLayoutParams(indicatorLayoutParams);
-            indicator.setVisibility(View.GONE);
-            indicator.setId(R.id.actionbar_compat_item_refresh_progress);
-            actionBar.addView(indicator);
-        }
-
-        return actionButton;
-    }
-
-    /**
-     * A {@link android.view.MenuInflater} that reads action bar metadata.
-     */
-    private class WrappedMenuInflater extends MenuInflater {
-        MenuInflater mInflater;
-
-        public WrappedMenuInflater(Context context, MenuInflater inflater) {
-            super(context);
-            mInflater = inflater;
-        }
-
-        @Override
-        public void inflate(int menuRes, Menu menu) {
-            loadActionBarMetadata(menuRes);
-            mInflater.inflate(menuRes, menu);
-        }
-
-        /**
-         * Loads action bar metadata from a menu resource, storing a list of menu item IDs that
-         * should be shown on-screen (i.e. those with showAsAction set to always or ifRoom).
-         * @param menuResId
-         */
-        private void loadActionBarMetadata(int menuResId) {
-            XmlResourceParser parser = null;
-            try {
-                parser = mActivity.getResources().getXml(menuResId);
-
-                int eventType = parser.getEventType();
-                int itemId;
-                int showAsAction;
-
-                boolean eof = false;
-                while (!eof) {
-                    switch (eventType) {
-                        case XmlPullParser.START_TAG:
-                            if (!parser.getName().equals("item")) {
-                                break;
-                            }
-
-                            itemId = parser.getAttributeResourceValue(MENU_RES_NAMESPACE,
-                                    MENU_ATTR_ID, 0);
-                            if (itemId == 0) {
-                                break;
-                            }
-
-                            showAsAction = parser.getAttributeIntValue(MENU_RES_NAMESPACE,
-                                    MENU_ATTR_SHOW_AS_ACTION, -1);
-                            if (showAsAction == MenuItem.SHOW_AS_ACTION_ALWAYS ||
-                                    showAsAction == MenuItem.SHOW_AS_ACTION_IF_ROOM) {
-                                mActionItemIds.add(itemId);
-                            }
-                            break;
-
-                        case XmlPullParser.END_DOCUMENT:
-                            eof = true;
-                            break;
-                    }
-
-                    eventType = parser.next();
-                }
-            } catch (XmlPullParserException e) {
-                throw new InflateException("Error inflating menu XML", e);
-            } catch (IOException e) {
-                throw new InflateException("Error inflating menu XML", e);
-            } finally {
-                if (parser != null) {
-                    parser.close();
-                }
-            }
-        }
-
-    }
-}
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelperHoneycomb.java b/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelperHoneycomb.java
deleted file mode 100644
index 442c0c536c..0000000000
--- a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelperHoneycomb.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * 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.evergreen.android.utils.ui.actionbar;
-
-import org.evergreen.android.R;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-
-/**
- * An extension of {@link ActionBarHelper} that provides Android 3.0-specific functionality for
- * Honeycomb tablets. It thus requires API level 11.
- */
-public class ActionBarHelperHoneycomb extends ActionBarHelper {
-    private Menu mOptionsMenu;
-    private View mRefreshIndeterminateProgressView = null;
-
-    protected ActionBarHelperHoneycomb(Activity activity) {
-        super(activity);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        mOptionsMenu = menu;
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public void setRefreshActionItemState(boolean refreshing) {
-        // On Honeycomb, we can set the state of the refresh button by giving it a custom
-        // action view.
-        if (mOptionsMenu == null) {
-            return;
-        }
-        
-        final MenuItem refreshItem = mOptionsMenu.findItem(R.id.menu_refresh);
-        if (refreshItem != null) {
-            if (refreshing) {
-                if (mRefreshIndeterminateProgressView == null) {
-                    LayoutInflater inflater = (LayoutInflater)
-                            getActionBarThemedContext().getSystemService(
-                                    Context.LAYOUT_INFLATER_SERVICE);
-                    mRefreshIndeterminateProgressView = inflater.inflate(
-                            R.layout.actionbar_indeterminate_progress, null);
-                }
-
-                refreshItem.setActionView(mRefreshIndeterminateProgressView);
-            } else {
-                refreshItem.setActionView(null);
-            }
-        }
-    }
-
-    /**
-     * Returns a {@link Context} suitable for inflating layouts for the action bar. The
-     * implementation for this method in {@link ActionBarHelperICS} asks the action bar for a
-     * themed context.
-     */
-    protected Context getActionBarThemedContext() {
-        return mActivity;
-    }
-}
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelperICS.java b/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelperICS.java
deleted file mode 100644
index efe9d18bea..0000000000
--- a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelperICS.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * 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.evergreen.android.utils.ui.actionbar;
-
-import android.app.Activity;
-import android.content.Context;
-import android.view.Menu;
-import android.view.MenuItem;
-
-/**
- * An extension of {@link com.example.android.actionbarcompat.ActionBarHelper} that provides Android
- * 4.0-specific functionality for IceCreamSandwich devices. It thus requires API level 14.
- */
-public class ActionBarHelperICS extends ActionBarHelperHoneycomb {
-    protected ActionBarHelperICS(Activity activity) {
-        super(activity);
-    }
-
-    @Override
-    protected Context getActionBarThemedContext() {
-        return mActivity.getActionBar().getThemedContext();
-    }
-}
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/SimpleMenu.java b/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/SimpleMenu.java
deleted file mode 100644
index b8fd6629fe..0000000000
--- a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/SimpleMenu.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * 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.evergreen.android.utils.ui.actionbar;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.SubMenu;
-
-import java.util.ArrayList;
-
-/**
- * A <em>really</em> dumb implementation of the {@link android.view.Menu} interface, that's only
- * useful for our actionbar-compat purposes. See
- * <code>com.android.internal.view.menu.MenuBuilder</code> in AOSP for a more complete
- * implementation.
- */
-public class SimpleMenu implements Menu {
-
-    private Context mContext;
-    private Resources mResources;
-
-    private ArrayList<SimpleMenuItem> mItems;
-
-    public SimpleMenu(Context context) {
-        mContext = context;
-        mResources = context.getResources();
-        mItems = new ArrayList<SimpleMenuItem>();
-    }
-
-    public Context getContext() {
-        return mContext;
-    }
-
-    public Resources getResources() {
-        return mResources;
-    }
-
-    public MenuItem add(CharSequence title) {
-        return addInternal(0, 0, title);
-    }
-
-    public MenuItem add(int titleRes) {
-        return addInternal(0, 0, mResources.getString(titleRes));
-    }
-
-    public MenuItem add(int groupId, int itemId, int order, CharSequence title) {
-        return addInternal(itemId, order, title);
-    }
-
-    public MenuItem add(int groupId, int itemId, int order, int titleRes) {
-        return addInternal(itemId, order, mResources.getString(titleRes));
-    }
-
-    /**
-     * Adds an item to the menu.  The other add methods funnel to this.
-     */
-    private MenuItem addInternal(int itemId, int order, CharSequence title) {
-        final SimpleMenuItem item = new SimpleMenuItem(this, itemId, order, title);
-        mItems.add(findInsertIndex(mItems, order), item);
-        return item;
-    }
-
-    private static int findInsertIndex(ArrayList<? extends MenuItem> items, int order) {
-        for (int i = items.size() - 1; i >= 0; i--) {
-            MenuItem item = items.get(i);
-            if (item.getOrder() <= order) {
-                return i + 1;
-            }
-        }
-
-        return 0;
-    }
-
-    public int findItemIndex(int id) {
-        final int size = size();
-
-        for (int i = 0; i < size; i++) {
-            SimpleMenuItem item = mItems.get(i);
-            if (item.getItemId() == id) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    public void removeItem(int itemId) {
-        removeItemAtInt(findItemIndex(itemId));
-    }
-
-    private void removeItemAtInt(int index) {
-        if ((index < 0) || (index >= mItems.size())) {
-            return;
-        }
-        mItems.remove(index);
-    }
-
-    public void clear() {
-        mItems.clear();
-    }
-
-    public MenuItem findItem(int id) {
-        final int size = size();
-        for (int i = 0; i < size; i++) {
-            SimpleMenuItem item = mItems.get(i);
-            if (item.getItemId() == id) {
-                return item;
-            }
-        }
-
-        return null;
-    }
-
-    public int size() {
-        return mItems.size();
-    }
-
-    public MenuItem getItem(int index) {
-        return mItems.get(index);
-    }
-
-    // Unsupported operations.
-
-    public SubMenu addSubMenu(CharSequence charSequence) {
-        throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
-    }
-
-    public SubMenu addSubMenu(int titleRes) {
-        throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
-    }
-
-    public SubMenu addSubMenu(int groupId, int itemId, int order, CharSequence title) {
-        throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
-    }
-
-    public SubMenu addSubMenu(int groupId, int itemId, int order, int titleRes) {
-        throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
-    }
-
-    public int addIntentOptions(int i, int i1, int i2, ComponentName componentName,
-            Intent[] intents, Intent intent, int i3, MenuItem[] menuItems) {
-        throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
-    }
-
-    public void removeGroup(int i) {
-        throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
-    }
-
-    public void setGroupCheckable(int i, boolean b, boolean b1) {
-        throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
-    }
-
-    public void setGroupVisible(int i, boolean b) {
-        throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
-    }
-
-    public void setGroupEnabled(int i, boolean b) {
-        throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
-    }
-
-    public boolean hasVisibleItems() {
-        throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
-    }
-
-    public void close() {
-        throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
-    }
-
-    public boolean performShortcut(int i, KeyEvent keyEvent, int i1) {
-        throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
-    }
-
-    public boolean isShortcutKey(int i, KeyEvent keyEvent) {
-        throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
-    }
-
-    public boolean performIdentifierAction(int i, int i1) {
-        throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
-    }
-
-    public void setQwertyMode(boolean b) {
-        throw new UnsupportedOperationException("This operation is not supported for SimpleMenu");
-    }
-}
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/SimpleMenuItem.java b/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/SimpleMenuItem.java
deleted file mode 100644
index 378cdb4925..0000000000
--- a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/SimpleMenuItem.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * 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.evergreen.android.utils.ui.actionbar;
-
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.view.ActionProvider;
-import android.view.ContextMenu;
-import android.view.MenuItem;
-import android.view.SubMenu;
-import android.view.View;
-
-/**
- * A <em>really</em> dumb implementation of the {@link android.view.MenuItem} interface, that's only
- * useful for our actionbar-compat purposes. See
- * <code>com.android.internal.view.menu.MenuItemImpl</code> in AOSP for a more complete
- * implementation.
- */
-public class SimpleMenuItem implements MenuItem {
-
-    private SimpleMenu mMenu;
-
-    private final int mId;
-    private final int mOrder;
-    private CharSequence mTitle;
-    private CharSequence mTitleCondensed;
-    private Drawable mIconDrawable;
-    private int mIconResId = 0;
-    private boolean mEnabled = true;
-
-    public SimpleMenuItem(SimpleMenu menu, int id, int order, CharSequence title) {
-        mMenu = menu;
-        mId = id;
-        mOrder = order;
-        mTitle = title;
-    }
-
-    public int getItemId() {
-        return mId;
-    }
-
-    public int getOrder() {
-        return mOrder;
-    }
-
-    public MenuItem setTitle(CharSequence title) {
-        mTitle = title;
-        return this;
-    }
-
-    public MenuItem setTitle(int titleRes) {
-        return setTitle(mMenu.getContext().getString(titleRes));
-    }
-
-    public CharSequence getTitle() {
-        return mTitle;
-    }
-
-    public MenuItem setTitleCondensed(CharSequence title) {
-        mTitleCondensed = title;
-        return this;
-    }
-
-    public CharSequence getTitleCondensed() {
-        return mTitleCondensed != null ? mTitleCondensed : mTitle;
-    }
-
-    public MenuItem setIcon(Drawable icon) {
-        mIconResId = 0;
-        mIconDrawable = icon;
-        return this;
-    }
-
-    public MenuItem setIcon(int iconResId) {
-        mIconDrawable = null;
-        mIconResId = iconResId;
-        return this;
-    }
-
-    public Drawable getIcon() {
-        if (mIconDrawable != null) {
-            return mIconDrawable;
-        }
-
-        if (mIconResId != 0) {
-            return mMenu.getResources().getDrawable(mIconResId);
-        }
-
-        return null;
-    }
-
-    public MenuItem setEnabled(boolean enabled) {
-        mEnabled = enabled;
-        return this;
-    }
-
-    public boolean isEnabled() {
-        return mEnabled;
-    }
-
-    // No-op operations. We use no-ops to allow inflation from menu XML.
-
-    public int getGroupId() {
-        // Noop
-        return 0;
-    }
-
-    public View getActionView() {
-        // Noop
-        return null;
-    }
-
-    public MenuItem setActionProvider(ActionProvider actionProvider) {
-        // Noop
-        return this;
-    }
-
-    public ActionProvider getActionProvider() {
-        // Noop
-        return null;
-    }
-
-    public boolean expandActionView() {
-        // Noop
-        return false;
-    }
-
-    public boolean collapseActionView() {
-        // Noop
-        return false;
-    }
-
-    public boolean isActionViewExpanded() {
-        // Noop
-        return false;
-    }
-
-    @Override
-    public MenuItem setOnActionExpandListener(OnActionExpandListener onActionExpandListener) {
-        // Noop
-        return this;
-    }
-
-    public MenuItem setIntent(Intent intent) {
-        // Noop
-        return this;
-    }
-
-    public Intent getIntent() {
-        // Noop
-        return null;
-    }
-
-    public MenuItem setShortcut(char c, char c1) {
-        // Noop
-        return this;
-    }
-
-    public MenuItem setNumericShortcut(char c) {
-        // Noop
-        return this;
-    }
-
-    public char getNumericShortcut() {
-        // Noop
-        return 0;
-    }
-
-    public MenuItem setAlphabeticShortcut(char c) {
-        // Noop
-        return this;
-    }
-
-    public char getAlphabeticShortcut() {
-        // Noop
-        return 0;
-    }
-
-    public MenuItem setCheckable(boolean b) {
-        // Noop
-        return this;
-    }
-
-    public boolean isCheckable() {
-        // Noop
-        return false;
-    }
-
-    public MenuItem setChecked(boolean b) {
-        // Noop
-        return this;
-    }
-
-    public boolean isChecked() {
-        // Noop
-        return false;
-    }
-
-    public MenuItem setVisible(boolean b) {
-        // Noop
-        return this;
-    }
-
-    public boolean isVisible() {
-        // Noop
-        return true;
-    }
-
-    public boolean hasSubMenu() {
-        // Noop
-        return false;
-    }
-
-    public SubMenu getSubMenu() {
-        // Noop
-        return null;
-    }
-
-    public MenuItem setOnMenuItemClickListener(OnMenuItemClickListener onMenuItemClickListener) {
-        // Noop
-        return this;
-    }
-
-    public ContextMenu.ContextMenuInfo getMenuInfo() {
-        // Noop
-        return null;
-    }
-
-    public void setShowAsAction(int i) {
-        // Noop
-    }
-
-    public MenuItem setShowAsActionFlags(int i) {
-        // Noop
-        return null;
-    }
-
-    public MenuItem setActionView(View view) {
-        // Noop
-        return this;
-    }
-
-    public MenuItem setActionView(int i) {
-        // Noop
-        return this;
-    }
-}