commit 67389e0acec6877528c4cdaed99bf0a295bf74b9
author Adam Powell <adamp@google.com> Mon Feb 04 21:43:15 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 04 21:43:18 2013 +0000
tree 34d21d828c3b451c080a06551eb7e8fedd6f693c
parent 98ffd11c25cb620872a0dd4421332c41309ac475
parent 62f33030b9fb6be893e20b563e3ba1800e3e63e8

Merge "Fix regression in expanded action view up" into jb-mr1.1-dev

core/java/com/android/internal/widget/ActionBarView.java

diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
index 4d28abc..d11b3b3 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -122,6 +122,7 @@
     private boolean mIncludeTabs;
     private boolean mIsCollapsable;
     private boolean mIsCollapsed;
+    private boolean mWasHomeEnabled; // Was it enabled before action view expansion?
 
     private MenuBuilder mOptionsMenu;
     
@@ -227,6 +228,15 @@
         mExpandedHomeLayout.setContentDescription(getResources().getText(
                 R.string.action_bar_up_description));
         
+        // This needs to highlight/be focusable on its own.
+        // TODO: Clean up the handoff between expanded/normal.
+        final Drawable upBackground = mUpGoerFive.getBackground();
+        if (upBackground != null) {
+            mExpandedHomeLayout.setBackground(upBackground.getConstantState().newDrawable());
+        }
+        mExpandedHomeLayout.setEnabled(true);
+        mExpandedHomeLayout.setFocusable(true);
+
         mTitleStyleRes = a.getResourceId(R.styleable.ActionBar_titleTextStyle, 0);
         mSubtitleStyleRes = a.getResourceId(R.styleable.ActionBar_subtitleTextStyle, 0);
         mProgressStyle = a.getResourceId(R.styleable.ActionBar_progressBarStyle, 0);
@@ -1529,6 +1539,8 @@
             if (mTabScrollView != null) mTabScrollView.setVisibility(GONE);
             if (mSpinner != null) mSpinner.setVisibility(GONE);
             if (mCustomNavView != null) mCustomNavView.setVisibility(GONE);
+            mWasHomeEnabled = mUpGoerFive.isEnabled();
+            setHomeButtonEnabled(false);
             requestLayout();
             item.setActionViewExpanded(true);
 
@@ -1571,6 +1583,7 @@
             }
             mExpandedHomeLayout.setIcon(null);
             mCurrentExpandedItem = null;
+            setHomeButtonEnabled(mWasHomeEnabled); // Set by expandItemActionView above
             requestLayout();
             item.setActionViewExpanded(false);