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

Merge change 21837 into eclair

Browse Source 
* changes:
  Fix possible NPE on touch mode change in TabHost.
This commit is contained in:
Android (Google) Code Review
2009-08-18 17:41:22 -07:00
parent 41f31b62e5 7237c56fae
commit 66575d45d1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/widget/TabHost.java
View File

@@ -68,7 +68,7 @@ public class TabHost extends FrameLayout implements ViewTreeObserver.OnTouchMode
initTabHost(); initTabHost();
} }
private final void initTabHost() { private void initTabHost() {
setFocusableInTouchMode(true); setFocusableInTouchMode(true);
setDescendantFocusability(FOCUS_AFTER_DESCENDANTS); setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);
@@ -134,7 +134,8 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1");
mTabContent = (FrameLayout) findViewById(com.android.internal.R.id.tabcontent); mTabContent = (FrameLayout) findViewById(com.android.internal.R.id.tabcontent);
if (mTabContent == null) { if (mTabContent == null) {
throw new RuntimeException( throw new RuntimeException(
"Your TabHost must have a FrameLayout whose id attribute is 'android.R.id.tabcontent'"); "Your TabHost must have a FrameLayout whose id attribute is "
+ "'android.R.id.tabcontent'");
} }
} }
@@ -176,7 +177,7 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1");
if (!isInTouchMode) { if (!isInTouchMode) {
// leaving touch mode.. if nothing has focus, let's give it to // leaving touch mode.. if nothing has focus, let's give it to
// the indicator of the current tab // the indicator of the current tab
if (!mCurrentView.hasFocus() || mCurrentView.isFocused()) { if (mCurrentView != null && (!mCurrentView.hasFocus() || mCurrentView.isFocused())) {
mTabWidget.getChildTabViewAt(mCurrentTab).requestFocus(); mTabWidget.getChildTabViewAt(mCurrentTab).requestFocus();
} }
} }