Merge "Not blocking focus on action bar on tab" (48b3ffc5) · Commits · e / os / android_frameworks_base

core/java/android/app/ActionBar.java

+11 −11

Original line number	Diff line number	Diff line
		@@ -1494,17 +1494,16 @@ 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);
		}
		}
		}

		@Override
		public void run() {
		final View focused = mFocusRoot.findFocus();
		if (focused != null) {
		focused.setOnFocusChangeListener(this);
		} else {
		if (mContainer != null) {
		mContainer.setTouchscreenBlocksFocus(true);
		}
		@@ -1514,3 +1513,4 @@ public abstract class ActionBar {
		}
		}
		}
		}