Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug 5220390 - action bar title metrics"

Browse Source
This commit is contained in:
Adam Powell
2011-08-31 11:42:02 -07:00
committed by Android (Google) Code Review
parent 2a62b43e67 07a047fdd6
commit ac73e4bb42
5 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/com/android/internal/widget/ActionBarView.java
View File

@@ -266,6 +266,17 @@ public class ActionBarView extends AbsActionBarView {
if (mActionMenuPresenter != null) { if (mActionMenuPresenter != null) {
mActionMenuPresenter.onConfigurationChanged(newConfig); 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 @Override

4
core/res/res/layout/action_bar_title_item.xml
View File

@@ -16,7 +16,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingRight="16dip" android:paddingRight="16dip"
android:background="?android:attr/actionBarItemBackground" android:background="?android:attr/actionBarItemBackground"
@@ -41,6 +41,8 @@
<TextView android:id="@+id/action_bar_subtitle" <TextView android:id="@+id/action_bar_subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:visibility="gone" /> android:visibility="gone" />

4
core/res/res/values-land/dimens.xml
View File

@@ -35,6 +35,10 @@
<dimen name="action_bar_title_text_size">16dp</dimen> <dimen name="action_bar_title_text_size">16dp</dimen>
<!-- Text size for action bar subtitles --> <!-- Text size for action bar subtitles -->
<dimen name="action_bar_subtitle_text_size">12dp</dimen> <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. --> <!-- Size of clock font in LockScreen on Unsecure unlock screen. -->
<dimen name="keyguard_lockscreen_clock_font_size">70sp</dimen> <dimen name="keyguard_lockscreen_clock_font_size">70sp</dimen>

4
core/res/res/values-sw600dp/dimens.xml
View File

@@ -37,6 +37,10 @@
<dimen name="action_bar_title_text_size">18dp</dimen> <dimen name="action_bar_title_text_size">18dp</dimen>
<!-- Text size for action bar subtitles --> <!-- Text size for action bar subtitles -->
<dimen name="action_bar_subtitle_text_size">14dp</dimen> <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. --> <!-- Size of clock font in LockScreen. -->
<dimen name="keyguard_pattern_unlock_clock_font_size">98sp</dimen> <dimen name="keyguard_pattern_unlock_clock_font_size">98sp</dimen>

4
core/res/res/values/dimens.xml
View File

@@ -146,6 +146,10 @@
<dimen name="action_bar_title_text_size">18dp</dimen> <dimen name="action_bar_title_text_size">18dp</dimen>
<!-- Text size for action bar subtitles --> <!-- Text size for action bar subtitles -->
<dimen name="action_bar_subtitle_text_size">14dp</dimen> <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. --> <!-- Size of clock font in LockScreen on Unsecure unlock screen. -->
<dimen name="keyguard_lockscreen_clock_font_size">80sp</dimen> <dimen name="keyguard_lockscreen_clock_font_size">80sp</dimen>