From 178b10932b9773d23f1760c0e73b5283324f7491 Mon Sep 17 00:00:00 2001
From: drizea <danielrizea27@gmail.com>
Date: Tue, 24 Jul 2012 00:32:05 +0300
Subject: [PATCH] modified search to reseamble the mockup ui search

---
 Open-ILS/src/Android/AndroidManifest.xml           |   7 +-
 .../res/drawable-hdpi/ic_action_settings.png       | Bin 0 -> 1505 bytes
 .../Android/res/drawable-hdpi/settings_small.png   | Bin 0 -> 9041 bytes
 .../res/drawable-mdpi/ic_action_settings.png       | Bin 0 -> 1358 bytes
 .../src/Android/res/drawable/actionbar_button.xml  |  33 +++
 .../Android/res/drawable/actionbar_compat_item.xml |  23 --
 .../res/drawable/actionbar_compat_item_focused.xml |  19 --
 .../res/drawable/actionbar_compat_item_pressed.xml |  19 --
 .../res/drawable/header_rounded_corners.xml        |   8 +
 Open-ILS/src/Android/res/drawable/menu_button.xml  |  33 +++
 .../res/drawable/rounded_buttom_corners.xml        |   8 +
 .../src/Android/res/layout/actionbar_compat.xml    |  21 --
 .../layout/actionbar_indeterminate_progress.xml    |  27 --
 .../Android/res/layout/advanced_search_dialog.xml  |  95 +++++++
 Open-ILS/src/Android/res/layout/main.xml           |  12 -
 .../src/Android/res/layout/search_result_list.xml  | 135 +++++++--
 Open-ILS/src/Android/res/menu/checkout_menu.xml    |   6 -
 Open-ILS/src/Android/res/menu/search_menu.xml      |  10 +
 Open-ILS/src/Android/res/values/colors.xml         |  17 +-
 Open-ILS/src/Android/res/values/dimens.xml         |   6 +-
 Open-ILS/src/Android/res/values/resources.xml      |  17 ++
 Open-ILS/src/Android/res/values/strings.xml        |  15 +
 Open-ILS/src/Android/res/values/styles.xml         |  62 +----
 .../checkout/ItemsCheckOutListView.java            |  29 +-
 .../searchCatalog/SearchCatalogListView.java       | 238 +++++++++++-----
 .../utils/ui/actionbar/ActionBarActivity.java      |  83 ------
 .../utils/ui/actionbar/ActionBarHelper.java        |  97 -------
 .../utils/ui/actionbar/ActionBarHelperBase.java    | 302 ---------------------
 .../ui/actionbar/ActionBarHelperHoneycomb.java     |  82 ------
 .../utils/ui/actionbar/ActionBarHelperICS.java     |  37 ---
 .../android/utils/ui/actionbar/SimpleMenu.java     | 203 --------------
 .../android/utils/ui/actionbar/SimpleMenuItem.java | 261 ------------------
 32 files changed, 537 insertions(+), 1368 deletions(-)
 create mode 100644 Open-ILS/src/Android/res/drawable-hdpi/ic_action_settings.png
 create mode 100644 Open-ILS/src/Android/res/drawable-hdpi/settings_small.png
 create mode 100644 Open-ILS/src/Android/res/drawable-mdpi/ic_action_settings.png
 create mode 100644 Open-ILS/src/Android/res/drawable/actionbar_button.xml
 delete mode 100644 Open-ILS/src/Android/res/drawable/actionbar_compat_item.xml
 delete mode 100644 Open-ILS/src/Android/res/drawable/actionbar_compat_item_focused.xml
 delete mode 100644 Open-ILS/src/Android/res/drawable/actionbar_compat_item_pressed.xml
 create mode 100644 Open-ILS/src/Android/res/drawable/header_rounded_corners.xml
 create mode 100644 Open-ILS/src/Android/res/drawable/menu_button.xml
 create mode 100644 Open-ILS/src/Android/res/drawable/rounded_buttom_corners.xml
 delete mode 100644 Open-ILS/src/Android/res/layout/actionbar_compat.xml
 delete mode 100644 Open-ILS/src/Android/res/layout/actionbar_indeterminate_progress.xml
 create mode 100644 Open-ILS/src/Android/res/layout/advanced_search_dialog.xml
 delete mode 100644 Open-ILS/src/Android/res/layout/main.xml
 create mode 100644 Open-ILS/src/Android/res/menu/search_menu.xml
 create mode 100644 Open-ILS/src/Android/res/values/resources.xml
 delete mode 100644 Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarActivity.java
 delete mode 100644 Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelper.java
 delete mode 100644 Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelperBase.java
 delete mode 100644 Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelperHoneycomb.java
 delete mode 100644 Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/ActionBarHelperICS.java
 delete mode 100644 Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/SimpleMenu.java
 delete mode 100644 Open-ILS/src/Android/src/org/evergreen/android/utils/ui/actionbar/SimpleMenuItem.java

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 0000000000000000000000000000000000000000..cc32e2d1d2f1838fd2ce1c35dbdeff740957c5a3
GIT binary patch
literal 1505
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVip(89^o)XdP-$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1OnfUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dR<{^f
zm>U^7<1`PdHwCv_3~=hz2RcR{6tzfE4HE*U9}p9saDg0n(of9;ruQOX!amqpu$F;=
zDcIA+F{I+wo2b)XhaE(GFR^Rcz3>uW`j<s~n%<GR_6OlR3YT`jWBsVja-Fr_QRl7G
z{sT=5VyE5;^3Ile|3H_gP;IAg+9jT6hZYJL&8$v)cV>>|m2WoZjVxtOe>lOB!jj|`
z_hm!a>X+}z<pbEKFfcnvU*ONa^0Fj@MabiyOaP<K1};Aaa}l9TjfKh%q6Ta}AGY@x
zCmoSG@$kgwhe?)_dpm4XyCssiH?VIIRsZ4V@x{Sl!<w@K-hD0)1Pa(RxRzPJ@;T2C
z-jILNnp<Z*_W{0XqW8b?eeh5{U}tt*GQc&#PiL~_p|4wG*91A`9Im|>@I0Qe)@nvc
zaL}&Jp&UDI%<SWc4i644SG3N`Rg+z};J%C(SL*E*X12^1Sxr8ed@FcTeZ$U>Ny)aD
zXNT&97murbf<y}1U%Fj%EabRi_|x$Fnl4XUfm`1@-)BZMtLDxBChy`FlM(co<q5M$
za^R#NQyg-Fo!1#3T;t8TLHp)Pe{RDd<pZe=dlIbD#r=b?TD_9{@WuY!5yq$!lVx1~
ze77r{Rx)KmnQlt)BHgRIC(NBD)a8|+aO1P=MZJydOa;Vpw>X`eGv&oXl?7fCw|aHj
z{jvx=awo|BW70auD}i2DHD0d~JuEI&cwWmwV(pS^4$rt>errvM@;JKGPUm88gLkct
z?h>c-CY<{Mf*)~nZVi}lG|*v%(gQ*M1F8G_*00^{#c9hNr~CEVqX`eVW21|*C;B8L
zan_t@c{92HjJVNB@hJ92y;sX}Utd3#zCYjdw^L!#OK#VTf%UKTey?_PQ&3JQ`@><t
YFmvmIU-Qd-zJUr|Pgg&ebxsLQ0Gu%+Qvd(}

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..1b95b273c23060089fa58a74606289980057d10b
GIT binary patch
literal 9041
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
V%m<(;RD(egq$sN@Qz2y<@;}*=5E%df

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..dc66d914e83151fd6c6e3a7cd5505c5634e8f1e7
GIT binary patch
literal 1358
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVip(89^o)Xdb>$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1OzjUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnqfY
zG!Lpb1-DyFaO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zPEq=|fq{YXfTxRN
zNX4x;)AxEYI|>|sU-VI1d<)0Eh6QuQq*xA~`o2M6%a=%zH7*Bl-8y&3?cn+uN-Iqs
zNJmHrnI5b7$NulorZ<yrSKMPQeBfR-J<-_O+SvNJd*G8)O-udclXn{SSZPi_ZGTsv
zg<Iyj<LM<KD?`q(sVGDz%zPZZVe&K46ED*baA!0}26$a&@LWF6=zq`V{dKI}3A{ap
z%{v<ZaP=K*-=ue}r#aW)<W@cl=Fr)UvAfn=H!v=GFTLkdkj=+)d)LaXnC!TOfhkq)
z!x8t)qYdjNCv-nPI>)(X{e%mPl*7M!_;;LRt|;O?Wbw0>xlFgJ{lT2a)z7^$1W!J-
zoOdC8UHhEZN{r>xzeF#%pW1(M?w{xbR{OZzEc2U!*B&@g!L_ED^LWWrlRXSuAJ*_@
zM*2q2Hhc2j_=f*#`3u=q2`ei0XEi)2YMvOMux`8VF4qk%U7kx9o?zS&wC<$ZY{S>B
zn;9qFpU(H!;mEDPSK++v>*QyIziN10T$8jy{8D(1#@_?wvMX-$NG#Njm7dhFf8xVd
z9WBP259=dr144ICW&G8+XWF{_g!lemm<wIrvrBn?W1i={cSqQ*-T(4_|F<}Mt3jWU
ZjUjYPR)Mv`jq9Ki&ePS;Wt~$(69A6*^F9Co

literal 0
HcmV?d00001

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;
-    }
-}
-- 
2.11.0