am 21bf4657: am a688af9c: Merge "TabHost key handling corrected" (f1b995f9) · Commits · e / os / android_frameworks_base

core/java/android/widget/TabHost.java

+63 −8

Original line number	Diff line number	Diff line
		@@ -48,6 +48,10 @@ import java.util.List;
		*/
		public class TabHost extends FrameLayout implements ViewTreeObserver.OnTouchModeChangeListener {

		private static final int TABWIDGET_LOCATION_LEFT = 0;
		private static final int TABWIDGET_LOCATION_TOP = 1;
		private static final int TABWIDGET_LOCATION_RIGHT = 2;
		private static final int TABWIDGET_LOCATION_BOTTOM = 3;
		private TabWidget mTabWidget;
		private FrameLayout mTabContent;
		private List<TabSpec> mTabSpecs = new ArrayList<TabSpec>(2);
		@@ -293,23 +297,74 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1");
		return mTabContent;
		}

		/**
		* Get the location of the TabWidget.
		*
		* @return The TabWidget location.
		*/
		private int getTabWidgetLocation() {
		int location = TABWIDGET_LOCATION_TOP;

		switch (mTabWidget.getOrientation()) {
		case LinearLayout.VERTICAL:
		location = (mTabContent.getLeft() < mTabWidget.getLeft()) ? TABWIDGET_LOCATION_RIGHT
		: TABWIDGET_LOCATION_LEFT;
		break;
		case LinearLayout.HORIZONTAL:
		default:
		location = (mTabContent.getTop() < mTabWidget.getTop()) ? TABWIDGET_LOCATION_BOTTOM
		: TABWIDGET_LOCATION_TOP;
		break;
		}
		return location;
		}

		@Override
		public boolean dispatchKeyEvent(KeyEvent event) {
		final boolean handled = super.dispatchKeyEvent(event);

		// unhandled key ups change focus to tab indicator for embedded activities
		// when there is nothing that will take focus from default focus searching
		// unhandled key events change focus to tab indicator for embedded
		// activities when there is nothing that will take focus from default
		// focus searching
		if (!handled
		&& (event.getAction() == KeyEvent.ACTION_DOWN)
		&& (event.getKeyCode() == KeyEvent.KEYCODE_DPAD_UP)
		&& (mCurrentView != null)
		&& (mCurrentView.isRootNamespace())
		&& (mCurrentView.hasFocus())
		&& (mCurrentView.findFocus().focusSearch(View.FOCUS_UP) == null)) {
		&& (mCurrentView.hasFocus())) {
		int keyCodeShouldChangeFocus = KeyEvent.KEYCODE_DPAD_UP;
		int directionShouldChangeFocus = View.FOCUS_UP;
		int soundEffect = SoundEffectConstants.NAVIGATION_UP;

		switch (getTabWidgetLocation()) {
		case TABWIDGET_LOCATION_LEFT:
		keyCodeShouldChangeFocus = KeyEvent.KEYCODE_DPAD_LEFT;
		directionShouldChangeFocus = View.FOCUS_LEFT;
		soundEffect = SoundEffectConstants.NAVIGATION_LEFT;
		break;
		case TABWIDGET_LOCATION_RIGHT:
		keyCodeShouldChangeFocus = KeyEvent.KEYCODE_DPAD_RIGHT;
		directionShouldChangeFocus = View.FOCUS_RIGHT;
		soundEffect = SoundEffectConstants.NAVIGATION_RIGHT;
		break;
		case TABWIDGET_LOCATION_BOTTOM:
		keyCodeShouldChangeFocus = KeyEvent.KEYCODE_DPAD_DOWN;
		directionShouldChangeFocus = View.FOCUS_DOWN;
		soundEffect = SoundEffectConstants.NAVIGATION_DOWN;
		break;
		case TABWIDGET_LOCATION_TOP:
		default:
		keyCodeShouldChangeFocus = KeyEvent.KEYCODE_DPAD_UP;
		directionShouldChangeFocus = View.FOCUS_UP;
		soundEffect = SoundEffectConstants.NAVIGATION_UP;
		break;
		}
		if (event.getKeyCode() == keyCodeShouldChangeFocus
		&& mCurrentView.findFocus().focusSearch(directionShouldChangeFocus) == null) {
		mTabWidget.getChildTabViewAt(mCurrentTab).requestFocus();
		playSoundEffect(SoundEffectConstants.NAVIGATION_UP);
		playSoundEffect(soundEffect);
		return true;
		}
		}
		return handled;
		}