Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29dfa243 authored by Bjorn Bringert's avatar Bjorn Bringert Committed by Android Git Automerger
Browse files

am acd29577: am a8eaaa10: Merge change If90ee7e2 into eclair-mr2 

Merge commit 'acd29577'

* commit 'acd29577':
  Fix TabHost NPE when there are no tabs
parents a1cc0310 acd29577

core/java/android/widget/TabHost.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -279,6 +279,7 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1"); 
        if (!handled

        if (!handled

                && (event.getAction() == KeyEvent.ACTION_DOWN)

                && (event.getAction() == KeyEvent.ACTION_DOWN)

                && (event.getKeyCode() == KeyEvent.KEYCODE_DPAD_UP)

                && (event.getKeyCode() == KeyEvent.KEYCODE_DPAD_UP)

                && (mCurrentView != null)

                && (mCurrentView.isRootNamespace())

                && (mCurrentView.isRootNamespace())

                && (mCurrentView.hasFocus())

                && (mCurrentView.hasFocus())

                && (mCurrentView.findFocus().focusSearch(View.FOCUS_UP) == null)) {

                && (mCurrentView.findFocus().focusSearch(View.FOCUS_UP) == null)) {
@@ -292,8 +293,10 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1"); 




    @Override

    @Override

    public void dispatchWindowFocusChanged(boolean hasFocus) {

    public void dispatchWindowFocusChanged(boolean hasFocus) {

        if (mCurrentView != null){

            mCurrentView.dispatchWindowFocusChanged(hasFocus);

            mCurrentView.dispatchWindowFocusChanged(hasFocus);

        }

        }

    }





    public void setCurrentTab(int index) {

    public void setCurrentTab(int index) {

        if (index < 0 || index >= mTabSpecs.size()) {

        if (index < 0 || index >= mTabSpecs.size()) {

core/java/android/widget/TabWidget.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -183,7 +183,7 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { 




    @Override

    @Override

    public void childDrawableStateChanged(View child) {

    public void childDrawableStateChanged(View child) {

        if (child == getChildTabViewAt(mSelectedTab)) {

        if (getTabCount() > 0 && child == getChildTabViewAt(mSelectedTab)) {

            // To make sure that the bottom strip is redrawn

            // To make sure that the bottom strip is redrawn

            invalidate();

            invalidate();

        }

        }
@@ -194,6 +194,9 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { 
    public void dispatchDraw(Canvas canvas) {

    public void dispatchDraw(Canvas canvas) {

        super.dispatchDraw(canvas);

        super.dispatchDraw(canvas);





        // Do nothing if there are no tabs.

        if (getTabCount() == 0) return;



        // If the user specified a custom view for the tab indicators, then

        // If the user specified a custom view for the tab indicators, then

        // do not draw the bottom strips.

        // do not draw the bottom strips.

        if (!mDrawBottomStrips) {

        if (!mDrawBottomStrips) {
@@ -347,7 +350,7 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { 
    }

    }





    public void onFocusChange(View v, boolean hasFocus) {

    public void onFocusChange(View v, boolean hasFocus) {

        if (v == this && hasFocus) {

        if (v == this && hasFocus && getTabCount() > 0) {

            getChildTabViewAt(mSelectedTab).requestFocus();

            getChildTabViewAt(mSelectedTab).requestFocus();

            return;

            return;

        }

        }