Merge "Unify code paths for collapsing action views in action bars" into lmp-dev (75f99187) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/WindowDecorActionBar.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -925,6 +925,15 @@ public class WindowDecorActionBar extends ActionBar implements
		public void onContentScrollStopped() {
		}

		@Override
		public boolean collapseActionView() {
		if (mDecorToolbar != null && mDecorToolbar.hasExpandedActionView()) {
		mDecorToolbar.collapseActionView();
		return true;
		}
		return false;
		}

		/**
		* @hide
		*/

+0 −23

Original line number	Diff line number	Diff line
		@@ -184,8 +184,6 @@ public class ActionBarOverlayLayout extends ViewGroup implements DecorContentPar
		Build.VERSION_CODES.KITKAT;

		mFlingEstimator = new OverScroller(context);

		setFocusableInTouchMode(true);
		}

		@Override
		@@ -660,27 +658,6 @@ public class ActionBarOverlayLayout extends ViewGroup implements DecorContentPar
		return finalY > mActionBarTop.getHeight();
		}

		@Override
		public boolean dispatchKeyEvent(KeyEvent event) {
		if (super.dispatchKeyEvent(event)) {
		return true;
		}

		if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
		final int action = event.getAction();

		// Collapse any expanded action views.
		if (mDecorToolbar != null && mDecorToolbar.hasExpandedActionView()) {
		if (action == KeyEvent.ACTION_UP) {
		mDecorToolbar.collapseActionView();
		}
		return true;
		}
		}

		return false;
		}

		@Override
		public void setWindowCallback(Window.Callback cb) {
		pullChildren();