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

Commit 0d5d1b7e authored by Adam Powell's avatar Adam Powell
Browse files

Tweak action bar metrics. 

Free up some more pixels in the action bar and better define how icons
within it resize.

Change-Id: I0768180e595ee7b23190a26607e8989fa1bac38f
parent b8a8c7a2

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

+37 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.ViewParent;

import android.view.Window;

import android.view.View.MeasureSpec;

import android.widget.AdapterView;

import android.widget.FrameLayout;

import android.widget.ImageView;
@@ -742,8 +743,14 @@ public class ActionBarView extends AbsActionBarView { 
        View homeLayout = mExpandedActionView != null ? mExpandedHomeLayout : mHomeLayout;



        if (homeLayout.getVisibility() != GONE) {

            homeLayout.measure(

                    MeasureSpec.makeMeasureSpec(availableWidth, MeasureSpec.AT_MOST),

            final LayoutParams lp = homeLayout.getLayoutParams();

            int homeWidthSpec;

            if (lp.width < 0) {

                homeWidthSpec = MeasureSpec.makeMeasureSpec(availableWidth, MeasureSpec.AT_MOST);

            } else {

                homeWidthSpec = MeasureSpec.makeMeasureSpec(lp.width, MeasureSpec.EXACTLY);

            }

            homeLayout.measure(homeWidthSpec,

                    MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));

            final int homeWidth = homeLayout.getMeasuredWidth();

            availableWidth = Math.max(0, availableWidth - homeWidth);
@@ -1120,6 +1127,34 @@ public class ActionBarView extends AbsActionBarView { 
            width += iconLp.leftMargin + mIconView.getMeasuredWidth() + iconLp.rightMargin;

            height = Math.max(height,

                    iconLp.topMargin + mIconView.getMeasuredHeight() + iconLp.bottomMargin);



            final int widthMode = MeasureSpec.getMode(widthMeasureSpec);

            final int heightMode = MeasureSpec.getMode(heightMeasureSpec);

            final int widthSize = MeasureSpec.getSize(widthMeasureSpec);

            final int heightSize = MeasureSpec.getSize(heightMeasureSpec);



            switch (widthMode) {

                case MeasureSpec.AT_MOST:

                    width = Math.min(width, widthSize);

                    break;

                case MeasureSpec.EXACTLY:

                    width = widthSize;

                    break;

                case MeasureSpec.UNSPECIFIED:

                default:

                    break;

            }

            switch (heightMode) {

                case MeasureSpec.AT_MOST:

                    height = Math.min(height, heightSize);

                    break;

                case MeasureSpec.EXACTLY:

                    height = heightSize;

                    break;

                case MeasureSpec.UNSPECIFIED:

                default:

                    break;

            }

            setMeasuredDimension(width, height);

        }

core/res/res/layout/action_bar_home.xml

+2 −3
Original line number Diff line number Diff line
@@ -25,12 +25,11 @@ 
               android:visibility="gone"

               android:layout_width="wrap_content"

               android:layout_height="wrap_content"

               android:layout_marginRight="-4dip" />

               android:layout_marginRight="-8dip" />

    <ImageView android:id="@android:id/home"

               android:layout_width="wrap_content"

               android:layout_height="wrap_content"

               android:paddingLeft="8dip"

               android:paddingRight="8dip"

               android:layout_marginRight="8dip"

               android:paddingTop="@dimen/action_bar_icon_vertical_padding"

               android:paddingBottom="@dimen/action_bar_icon_vertical_padding"

               android:layout_gravity="center"

core/res/res/values-land/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 


    <!-- Default height of an action bar. -->

    <dimen name="action_bar_default_height">40dip</dimen>

    <!-- Vertical padding around action bar icons. -->

    <dimen name="action_bar_icon_vertical_padding">4dip</dimen>



    <!-- Size of clock font in LockScreen on Unsecure unlock screen. -->

    <dimen name="keyguard_lockscreen_clock_font_size">80sp</dimen>

core/res/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ 
    <!-- Default height of an action bar. -->

    <dimen name="action_bar_default_height">48dip</dimen>

    <!-- Vertical padding around action bar icons. -->

    <dimen name="action_bar_icon_vertical_padding">4dip</dimen>

    <dimen name="action_bar_icon_vertical_padding">8dip</dimen>



    <!-- Size of clock font in LockScreen on Unsecure unlock screen. -->

    <dimen name="keyguard_lockscreen_clock_font_size">80sp</dimen>

core/res/res/values/styles.xml

+6 −10
Original line number Diff line number Diff line
@@ -1118,9 +1118,9 @@ 


    <style name="Widget.ActionButton">

        <item name="android:background">?android:attr/selectableItemBackground</item>

        <item name="android:paddingLeft">16dip</item>

        <item name="android:paddingRight">16dip</item>

        <item name="android:minWidth">64dip</item>

        <item name="android:paddingLeft">12dip</item>

        <item name="android:paddingRight">12dip</item>

        <item name="android:minWidth">56dip</item>

        <item name="android:minHeight">?android:attr/actionBarSize</item>

    </style>
@@ -1788,18 +1788,16 @@ 
    </style>



    <style name="Widget.Holo.ActionButton" parent="Widget.ActionButton">

        <item name="android:minWidth">64dip</item>

        <item name="android:minWidth">56dip</item>

        <item name="android:gravity">center</item>

        <item name="android:paddingLeft">16dip</item>

        <item name="android:paddingRight">16dip</item>

        <item name="android:paddingLeft">12dip</item>

        <item name="android:paddingRight">12dip</item>

        <item name="android:scaleType">center</item>

    </style>



    <style name="Widget.Holo.ActionButton.Overflow">

        <item name="android:src">@android:drawable/ic_menu_moreoverflow_holo_dark</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>

        <item name="android:paddingLeft">16dip</item>

        <item name="android:paddingRight">16dip</item>

        <item name="android:contentDescription">@string/action_menu_overflow_description</item>

    </style>
@@ -2142,8 +2140,6 @@ 


    <style name="Widget.Holo.Light.ActionButton.Overflow">

        <item name="android:src">@android:drawable/ic_menu_moreoverflow_holo_light</item>

        <item name="android:paddingLeft">16dip</item>

        <item name="android:paddingRight">16dip</item>

        <item name="android:contentDescription">@string/action_menu_overflow_description</item>

    </style>