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

Commit db9c3f2e authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 27188 into eclair 

* changes:
  Fix 2146581: Make tabs work for donut apps Use different tab assets with the original coloring scheme for apps that are not Eclair-aware.
parents 23976407 76097642

core/java/android/os/Build.java

+3 −0
Original line number Diff line number Diff line
@@ -146,6 +146,9 @@ public class Build { 
         * <li> The {@link android.app.Activity} class will now execute back

         * key presses on the key up instead of key down, to be able to detect

         * canceled presses from virtual keys.

         * <li> The {@link android.widget.TabWidget} class will use a new color scheme

         * for tabs. In the new scheme, the foreground tab has a medium gray background

         * the background tabs have a dark gray background.

         * </ul>

         */

        public static final int ECLAIR = CUR_DEVELOPMENT;

core/java/android/widget/TabHost.java

+19 −7
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.LocalActivityManager; 
import android.content.Context;

import android.content.Intent;

import android.graphics.drawable.Drawable;

import android.os.Build;

import android.util.AttributeSet;

import android.view.KeyEvent;

import android.view.LayoutInflater;
@@ -28,11 +29,12 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.ViewTreeObserver;

import android.view.Window;

import com.android.internal.R;



import java.util.ArrayList;

import java.util.List;



import com.android.internal.R;



/**

 * Container for a tabbed window view. This object holds two children: a set of tab labels that the

 * user clicks to select a specific tab, and a FrameLayout object that displays the contents of that
@@ -497,17 +499,22 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1"); 
        }



        public View createIndicatorView() {

            final Context context = getContext();

            LayoutInflater inflater =

                    (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);

                    (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);

            View tabIndicator = inflater.inflate(R.layout.tab_indicator,

                    mTabWidget, // tab widget is the parent

                    false); // no inflate params

            // TODO: Move this to xml when bug 2068024 is resolved.

            tabIndicator.getBackground().setDither(true);



            final TextView tv = (TextView) tabIndicator.findViewById(R.id.title);

            tv.setText(mLabel);



            if (context.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.DONUT) {

                // Donut apps get old color scheme

                tabIndicator.setBackgroundResource(R.drawable.tab_indicator_v4);

                tv.setTextColor(context.getResources().getColorStateList(R.color.tab_indicator_text_v4));

            }

            

            return tabIndicator;

        }

    }
@@ -526,13 +533,12 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1"); 
        }



        public View createIndicatorView() {

            final Context context = getContext();

            LayoutInflater inflater =

                    (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);

                    (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);

            View tabIndicator = inflater.inflate(R.layout.tab_indicator,

                    mTabWidget, // tab widget is the parent

                    false); // no inflate params

            // TODO: Move this to xml when bug 2068024 is resolved.

            tabIndicator.getBackground().setDither(true);



            final TextView tv = (TextView) tabIndicator.findViewById(R.id.title);

            tv.setText(mLabel);
@@ -540,6 +546,12 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1"); 
            final ImageView iconView = (ImageView) tabIndicator.findViewById(R.id.icon);

            iconView.setImageDrawable(mIcon);



            if (context.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.DONUT) {

                // Donut apps get old color scheme

                tabIndicator.setBackgroundResource(R.drawable.tab_indicator_v4);

                tv.setTextColor(context.getResources().getColorStateList(R.color.tab_indicator_text_v4));

            }

            

            return tabIndicator;

        }

    }

core/java/android/widget/TabWidget.java

+22 −4
Original line number Diff line number Diff line
@@ -16,11 +16,15 @@ 


package android.widget;



import com.android.internal.R;



import android.content.Context;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.graphics.Canvas;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.os.Build;

import android.util.AttributeSet;

import android.util.Log;

import android.view.View;
@@ -94,10 +98,24 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { 
        setOrientation(LinearLayout.HORIZONTAL);

        mGroupFlags |= FLAG_USE_CHILD_DRAWING_ORDER;



        mBottomLeftStrip = mContext.getResources().getDrawable(

        final Context context = mContext;

        final Resources resources = context.getResources();

        

        if (context.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.DONUT) {

            // Donut apps get old color scheme

            mBottomLeftStrip = resources.getDrawable(

                    com.android.internal.R.drawable.tab_bottom_left_v4);

            mBottomRightStrip = resources.getDrawable(

                    com.android.internal.R.drawable.tab_bottom_right_v4); 

        } else {

            // Use modern color scheme for Eclair and beyond

            mBottomLeftStrip = resources.getDrawable(

                    com.android.internal.R.drawable.tab_bottom_left);

        mBottomRightStrip = mContext.getResources().getDrawable(

            mBottomRightStrip = resources.getDrawable(

                    com.android.internal.R.drawable.tab_bottom_right); 

        }





        // Deal with focus, as we don't want the focus to go by default

        // to a tab other than the current tab

        setFocusable(true);

core/res/res/color/tab_indicator_text_v4.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at

  

          http://www.apache.org/licenses/LICENSE-2.0

  

     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_selected="true" android:color="#808080"/>

    <item android:color="#FFFFFF"/> <!-- not selected -->

</selector>

core/res/res/drawable-hdpi/tab_selected_bar_left_v4.9.png

0 → 100644
+2.75 KiB
Loading image diff...