Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 07cf971e: Fix re-enabled state of up after action view collapse

Browse Source 
# Via Adam Powell
* commit '07cf971e58aecab76f2b5b575cfe62120005c6e4':
  Fix re-enabled state of up after action view collapse
This commit is contained in:
Adam Powell
2013-02-05 16:51:01 -08:00
committed by Android Git Automerger
parent dfa8d02861 07cf971e58
commit cef582ab03
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/com/android/internal/widget/ActionBarView.java
View File

@@ -559,6 +559,21 @@ public class ActionBarView extends AbsActionBarView {
}
public void setHomeButtonEnabled(boolean enable) {
setHomeButtonEnabled(enable, true);
}
private void setHomeButtonEnabled(boolean enable, boolean recordState) {
if (recordState) {
mWasHomeEnabled = enable;
}
if (mExpandedActionView != null) {
// There's an action view currently showing and we want to keep the state
// configured for the action view at the moment. If we needed to record the
// new state for later we will have done so above.
return;
}
mUpGoerFive.setEnabled(enable);
mUpGoerFive.setFocusable(enable);
// Make sure the home button has an accurate content description for accessibility.
@@ -1539,8 +1554,7 @@ public class ActionBarView extends AbsActionBarView {
if (mTabScrollView != null) mTabScrollView.setVisibility(GONE);
if (mSpinner != null) mSpinner.setVisibility(GONE);
if (mCustomNavView != null) mCustomNavView.setVisibility(GONE);
mWasHomeEnabled = mUpGoerFive.isEnabled();
setHomeButtonEnabled(false);
setHomeButtonEnabled(false, false);
requestLayout();
item.setActionViewExpanded(true);