Fixed action bar in Place Hold activity to return to Search Details (back,

not up).  Fixed action bar in Search Details to return to Search (back,
not up).

diff --git a/Open-ILS/src/Android/core/res/layout/place_hold.xml b/Open-ILS/src/Android/core/res/layout/place_hold.xml
index e5f54bf..9ba1d4a 100644 (file)
--- a/Open-ILS/src/Android/core/res/layout/place_hold.xml
+++ b/Open-ILS/src/Android/core/res/layout/place_hold.xml
@@ -4,11 +4,7 @@
     android:layout_height="match_parent"
     android:background="@drawable/background_grey_image"
      >
-  
-    
-       <include android:id="@+id/header_actionbar" layout="@layout/simple_actionbar"/>
-   
-        
+
        <LinearLayout
            android:id="@+id/action_bar"
                android:layout_width="wrap_content" 
@@ -32,7 +28,7 @@
                    android:id="@+id/place_hold"
                    android:layout_width="100dip"
                    android:layout_height="wrap_content"
-                   android:text="@string/place_hold"
+                   android:text="@string/button_place_hold"
                    style="@style/ApplicationButton"
                    android:layout_margin="5dip"
                    />   
@@ -43,7 +39,6 @@
         android:layout_height="wrap_content"
         android:fillViewport="true"
         android:layout_above="@id/action_bar"
-        android:layout_below="@id/header_actionbar"
         android:padding="5dip"
         >
        <LinearLayout 

diff --git a/Open-ILS/src/Android/core/res/values/strings.xml b/Open-ILS/src/Android/core/res/values/strings.xml
index a4c6afc..4438234 100644 (file)
--- a/Open-ILS/src/Android/core/res/values/strings.xml
+++ b/Open-ILS/src/Android/core/res/values/strings.xml
@@ -78,7 +78,6 @@
     <string name="pickup_location">Pickup location</string>
     <string name="expiration_date">Expiration Date</string>
     <string name="suspend_hold">Suspend Hold</string>
-    <string name="place_hold">Place hold</string>
     <string name="cancel">Cancel</string>
     <string name="cancel_hold">Delete</string>
     <string name="back">Back</string>

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java
index 8c1ce74..c94ef65 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java
@@ -23,7 +23,10 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
+import android.view.MenuItem;
 import org.evergreen_ils.R;
 import org.evergreen_ils.accountAccess.AccountAccess;
 import org.evergreen_ils.accountAccess.SessionNotFoundException;
@@ -56,7 +59,7 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
-public class PlaceHold extends Activity {
+public class PlaceHold extends ActionBarActivity {
 
     private final String TAG = PlaceHold.class.getName();
 
@@ -123,31 +126,16 @@ public class PlaceHold extends Activity {
         }
 
         setContentView(R.layout.place_hold);
+
+        // set up action bar
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setSubtitle(AccountAccess.userName);
+        actionBar.setDisplayHomeAsUpEnabled(true);
+
         globalConfigs = GlobalConfigs.getGlobalConfigs(this);
         RecordInfo record = (RecordInfo) getIntent().getSerializableExtra(
                 "recordInfo");
 
-        myAccountButton = (Button) findViewById(R.id.my_account_button);
-        myAccountButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getApplicationContext(),
-                        AccountScreenDashboard.class);
-                startActivity(intent);
-            }
-        });
-
-        homeButton = (Button) findViewById(R.id.action_bar_home_button);
-        homeButton.setText(R.string.hold_place_title);
-        homeButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getApplicationContext(),
-                        SearchCatalogListView.class);
-                startActivity(intent);
-            }
-        });
-
         context = this;
 
         accountAccess = AccountAccess.getAccountAccess();
@@ -374,6 +362,16 @@ public class PlaceHold extends Activity {
         });
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        if (id == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     public void disableView(View view) {
 
         // view.setFocusable(false);

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SampleUnderlinesNoFade.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SampleUnderlinesNoFade.java
index 3161cac..c89f7f9 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SampleUnderlinesNoFade.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SampleUnderlinesNoFade.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
+import android.view.MenuItem;
 import org.evergreen_ils.R;
 import org.evergreen_ils.accountAccess.AccountAccess;
 import org.evergreen_ils.utils.ui.*;
@@ -155,7 +156,16 @@ public class SampleUnderlinesNoFade extends BaseSampleActivity {
         return super.onKeyDown(keyCode, event);
     }
 
-    
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        if (id == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     class SearchFragmentAdapter extends TestFragmentAdapter {
         public SearchFragmentAdapter(FragmentManager fm) {
             super(fm);

diff --git a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
index 72fc22a..7afafff 100644 (file)
--- a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
@@ -69,11 +69,7 @@
 
         <activity
                 android:name="org.evergreen_ils.searchCatalog.SampleUnderlinesNoFade"
-                android:label="@string/search_details_title"
-                android:parentActivityName="org.evergreen_ils.searchCatalog.SearchCatalogListView">
-            <meta-data
-                    android:name="android.support.PARENT_ACTIVITY"
-                    android:value="org.evergreen_ils.searchCatalog.SearchCatalogListView"/>
+                android:label="@string/search_details_title">
         </activity>
         <activity android:name="org.evergreen_ils.searchCatalog.MoreCopyInformation" >
         </activity>
@@ -113,7 +109,9 @@
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value="org.evergreen_ils.views.MainActivity"/>
         </activity>
-        <activity android:name="org.evergreen_ils.accountAccess.holds.PlaceHold" >
+        <activity
+                android:name="org.evergreen_ils.accountAccess.holds.PlaceHold"
+                android:label="@string/hold_place_title">
         </activity>
         <activity android:name="org.evergreen_ils.accountAccess.holds.HoldDetails" >
         </activity>