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

Commit b3f079bc authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am a6ce0819: Merge "Fix bug 3381275 - Too much padding on the left of a custom... 

am a6ce0819: Merge "Fix bug 3381275 - Too much padding on the left of a custom nav bar" into honeycomb

* commit 'a6ce0819':
  Fix bug 3381275 - Too much padding on the left of a custom nav bar
parents faf083ef a6ce0819

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

+7 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.PackageManager.NameNotFoundException;

import android.content.res.TypedArray;

import android.graphics.drawable.Drawable;

import android.text.TextUtils;

import android.text.TextUtils.TruncateAt;

import android.util.AttributeSet;

import android.util.Log;
@@ -351,6 +352,8 @@ public class ActionBarView extends ViewGroup { 
        mTitle = title;

        if (mTitleView != null) {

            mTitleView.setText(title);

            mTitleLayout.setVisibility(TextUtils.isEmpty(mTitle) && TextUtils.isEmpty(mSubtitle) ?

                    GONE : VISIBLE);

        }

        if (mLogoNavItem != null) {

            mLogoNavItem.setTitle(title);
@@ -366,6 +369,8 @@ public class ActionBarView extends ViewGroup { 
        if (mSubtitleView != null) {

            mSubtitleView.setText(subtitle);

            mSubtitleView.setVisibility(subtitle != null ? VISIBLE : GONE);

            mTitleLayout.setVisibility(TextUtils.isEmpty(mTitle) && TextUtils.isEmpty(mSubtitle) ?

                    GONE : VISIBLE);

        }

    }
@@ -636,7 +641,7 @@ public class ActionBarView extends ViewGroup { 
            rightOfCenter -= mMenuView.getMeasuredWidth();

        }



        boolean showTitle = mTitleLayout != null &&

        boolean showTitle = mTitleLayout != null && mTitleLayout.getVisibility() != GONE &&

                (mDisplayOptions & ActionBar.DISPLAY_SHOW_TITLE) != 0;

        if (showTitle) {

            availableWidth = measureChildView(mTitleLayout, availableWidth, childSpecHeight, 0);
@@ -768,7 +773,7 @@ public class ActionBarView extends ViewGroup { 
            x += positionChild(mHomeLayout, x, y, contentHeight);

        }

        

        final boolean showTitle = mTitleLayout != null &&

        final boolean showTitle = mTitleLayout != null && mTitleLayout.getVisibility() != GONE &&

                (mDisplayOptions & ActionBar.DISPLAY_SHOW_TITLE) != 0;

        if (showTitle) {

            x += positionChild(mTitleLayout, x, y, contentHeight);