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

Commit 68c5f17c authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5116434 - Bookmark label is not highlighted."

parents 98d29b44 faa6ffa4

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

+0 −9
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ public class ActionBarImpl extends ActionBar { 


    private int mContextDisplayMode;

    private boolean mHasEmbeddedTabs;

    private int mContentHeight;



    final Handler mHandler = new Handler();

    Runnable mTabSelector;
@@ -163,8 +162,6 @@ public class ActionBarImpl extends ActionBar { 
        mContextDisplayMode = mActionView.isSplitActionBar() ?

                CONTEXT_DISPLAY_SPLIT : CONTEXT_DISPLAY_NORMAL;



        mContentHeight = mActionView.getContentHeight();



        // Older apps get the home button interaction enabled by default.

        // Newer apps need to enable it explicitly.

        setHomeButtonEnabled(mContext.getApplicationInfo().targetSdkVersion <
@@ -188,12 +185,6 @@ public class ActionBarImpl extends ActionBar { 
        }

        mActionView.setCollapsable(!mHasEmbeddedTabs &&

                getNavigationMode() == NAVIGATION_MODE_TABS);



        mContentHeight = mActionView.getContentHeight();



        if (mTabScrollView != null) {

            mTabScrollView.setContentHeight(mContentHeight);

        }

    }



    private void ensureTabsExist() {

core/java/com/android/internal/widget/ScrollingTabContainerView.java

+16 −0
Original line number Diff line number Diff line
@@ -15,11 +15,15 @@ 
 */

package com.android.internal.widget;



import com.android.internal.R;



import android.animation.Animator;

import android.animation.ObjectAnimator;

import android.animation.TimeInterpolator;

import android.app.ActionBar;

import android.content.Context;

import android.content.res.Configuration;

import android.content.res.TypedArray;

import android.graphics.drawable.Drawable;

import android.text.TextUtils.TruncateAt;

import android.view.Gravity;
@@ -92,6 +96,18 @@ public class ScrollingTabContainerView extends HorizontalScrollView { 
        requestLayout();

    }



    @Override

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);



        // Action bar can change size on configuration changes.

        // Reread the desired height from the theme-specified style.

        TypedArray a = getContext().obtainStyledAttributes(null, R.styleable.ActionBar,

                com.android.internal.R.attr.actionBarStyle, 0);

        setContentHeight(a.getLayoutDimension(R.styleable.ActionBar_height, 0));

        a.recycle();

    }



    public void animateToVisibility(int visibility) {

        if (mVisibilityAnim != null) {

            mVisibilityAnim.cancel();