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

Merge "Not blocking focus on action bar on tab"

Browse Source
This commit is contained in:
TreeHugger Robot
2016-11-10 20:45:23 +00:00
committed by Android (Google) Code Review
parent 9e90a426c2 16bb2c75d0
commit 48b3ffc557
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/app/ActionBar.java
View File

@@ -1494,22 +1494,22 @@ public abstract class ActionBar {
public void onFocusChange(View v, boolean hasFocus) {
if (!hasFocus) {
v.setOnFocusChangeListener(null);
final View focused = mFocusRoot.findFocus();
if (focused != null) {
focused.setOnFocusChangeListener(this);
} else {
mFocusRoot.post(this);
}
mFocusRoot.post(this);
}
}
@Override
public void run() {
if (mContainer != null) {
mContainer.setTouchscreenBlocksFocus(true);
}
if (mToolbar != null) {
mToolbar.setTouchscreenBlocksFocus(true);
final View focused = mFocusRoot.findFocus();
if (focused != null) {
focused.setOnFocusChangeListener(this);
} else {
if (mContainer != null) {
mContainer.setTouchscreenBlocksFocus(true);
}
if (mToolbar != null) {
mToolbar.setTouchscreenBlocksFocus(true);
}
}
}
}