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

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

Merge "Fix bug 5220390 - action bar title metrics"

parents 2a62b43e 07a047fd

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

+11 −0
Original line number Diff line number Diff line
@@ -266,6 +266,17 @@ public class ActionBarView extends AbsActionBarView { 
        if (mActionMenuPresenter != null) {

            mActionMenuPresenter.onConfigurationChanged(newConfig);

        }



        mTitleView = null;

        mSubtitleView = null;

        mTitleUpView = null;

        if (mTitleLayout != null && mTitleLayout.getParent() == this) {

            removeView(mTitleLayout);

        }

        mTitleLayout = null;

        if ((mDisplayOptions & ActionBar.DISPLAY_SHOW_TITLE) != 0) {

            initTitle();

        }

    }



    @Override

core/res/res/layout/action_bar_title_item.xml

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

              android:layout_width="wrap_content"

              android:layout_height="match_parent"

              android:layout_height="wrap_content"

              android:orientation="horizontal"

              android:paddingRight="16dip"

              android:background="?android:attr/actionBarItemBackground"
@@ -41,6 +41,8 @@ 
        <TextView android:id="@+id/action_bar_subtitle"

                  android:layout_width="wrap_content"

                  android:layout_height="wrap_content"

                  android:layout_marginTop="@dimen/action_bar_subtitle_top_margin"

                  android:layout_marginBottom="@dimen/action_bar_subtitle_bottom_margin"

                  android:singleLine="true"

                  android:ellipsize="end"

                  android:visibility="gone" />

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

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ 
    <dimen name="action_bar_title_text_size">16dp</dimen>

    <!-- Text size for action bar subtitles -->

    <dimen name="action_bar_subtitle_text_size">12dp</dimen>

    <!-- Top margin for action bar subtitles -->

    <dimen name="action_bar_subtitle_top_margin">-2dp</dimen>

    <!-- Bottom margin for action bar subtitles -->

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



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

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

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

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ 
    <dimen name="action_bar_title_text_size">18dp</dimen>

    <!-- Text size for action bar subtitles -->

    <dimen name="action_bar_subtitle_text_size">14dp</dimen>

    <!-- Top margin for action bar subtitles -->

    <dimen name="action_bar_subtitle_top_margin">-3dp</dimen>

    <!-- Bottom margin for action bar subtitles -->

    <dimen name="action_bar_subtitle_bottom_margin">9dip</dimen>



    <!-- Size of clock font in LockScreen. -->

    <dimen name="keyguard_pattern_unlock_clock_font_size">98sp</dimen>

core/res/res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -146,6 +146,10 @@ 
    <dimen name="action_bar_title_text_size">18dp</dimen>

    <!-- Text size for action bar subtitles -->

    <dimen name="action_bar_subtitle_text_size">14dp</dimen>

    <!-- Top margin for action bar subtitles -->

    <dimen name="action_bar_subtitle_top_margin">-3dp</dimen>

    <!-- Bottom margin for action bar subtitles -->

    <dimen name="action_bar_subtitle_bottom_margin">5dip</dimen>



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

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