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

am e1201e87: Merge "Lighten action bar on light theme, use secondary color for subtitle" into lmp-mr1-dev

Browse Source 
* commit 'e1201e87f4eb83783d8f9f3e46699cc18abb03f6':
  Lighten action bar on light theme, use secondary color for subtitle
This commit is contained in:
Alan Viverette
2014-10-23 07:55:39 +00:00
committed by Android Git Automerger
parent 2abc8aa032 e1201e87f4
commit eb09aaa5ac
3 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,8 +19,6 @@ package com.android.internal.widget;
import android.animation.LayoutTransition;
import android.app.ActionBar;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
@@ -29,9 +27,7 @@ import android.os.Parcelable;
import android.text.Layout;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.CollapsibleActionView;
import android.view.ContextThemeWrapper;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -111,10 +107,10 @@ public class ActionBarView extends AbsActionBarView implements DecorToolbar {
private int mProgressBarPadding;
private int mItemPadding;
private int mTitleStyleRes;
private int mSubtitleStyleRes;
private int mProgressStyle;
private int mIndeterminateProgressStyle;
private final int mTitleStyleRes;
private final int mSubtitleStyleRes;
private final int mProgressStyle;
private final int mIndeterminateProgressStyle;
private boolean mUserTitle;
private boolean mIncludeTabs;

2
core/res/res/values/colors_material.xml
View File

@@ -22,7 +22,7 @@
<color name="background_floating_material_light">#ffeeeeee</color>
<color name="primary_material_dark">#ff212121</color>
<color name="primary_material_light">#ffbdbdbd</color>
<color name="primary_material_light">#ffe0e0e0</color>
<color name="primary_dark_material_dark">#ff000000</color>
<color name="primary_dark_material_light">#ff757575</color>

42
core/res/res/values/styles_material.xml
View File

@@ -320,49 +320,47 @@ please see styles_device_defaults.xml.
<item name="textColor">?attr/textColorPrimaryDisableOnly</item>
</style>
<style name="TextAppearance.Material.Widget.ActionMode"/>
<style name="TextAppearance.Material.Widget.ActionMode.Title"
parent="TextAppearance.Material.Title">
<item name="textSize">@dimen/text_size_title_material_toolbar</item>
</style>
<style name="TextAppearance.Material.Widget.ActionMode.Title.Inverse"
parent="TextAppearance.Material.Title.Inverse">
<item name="textSize">@dimen/text_size_title_material_toolbar</item>
</style>
<style name="TextAppearance.Material.Widget.ActionMode.Subtitle"
parent="TextAppearance.Material.Subhead">
<item name="textSize">@dimen/text_size_subtitle_material_toolbar</item>
</style>
<style name="TextAppearance.Material.Widget.ActionMode.Subtitle.Inverse"
parent="TextAppearance.Material.Subhead.Inverse">
<item name="textSize">@dimen/text_size_subtitle_material_toolbar</item>
</style>
<style name="TextAppearance.Material.Widget.ActionBar.Title"
parent="TextAppearance.Material.Title">
<item name="textSize">@dimen/text_size_title_material_toolbar</item>
<item name="textColor">?attr/textColorPrimary</item>
</style>
<style name="TextAppearance.Material.Widget.ActionBar.Title.Inverse"
parent="TextAppearance.Material.Title.Inverse">
<item name="textSize">@dimen/text_size_title_material_toolbar</item>
<item name="textColor">?attr/textColorPrimaryInverse</item>
</style>
<style name="TextAppearance.Material.Widget.ActionBar.Subtitle"
parent="TextAppearance.Material.Subhead">
<item name="textSize">@dimen/text_size_subtitle_material_toolbar</item>
<item name="textColor">?attr/textColorSecondary</item>
</style>
<style name="TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse"
parent="TextAppearance.Material.Subhead.Inverse">
<item name="textSize">@dimen/text_size_subtitle_material_toolbar</item>
<item name="textColor">?attr/textColorSecondaryInverse</item>
</style>
<style name="TextAppearance.Material.Widget.ActionBar.Menu" parent="TextAppearance.Material.Menu">
<style name="TextAppearance.Material.Widget.ActionBar.Menu"
parent="TextAppearance.Material.Menu">
<item name="textColor">?attr/actionMenuTextColor</item>
<item name="textAllCaps">@bool/config_actionMenuItemAllCaps</item>
</style>
<style name="TextAppearance.Material.Widget.ActionBar.Menu.Inverse"
parent="TextAppearance.Material.Menu.Inverse">
<item name="textColor">?attr/actionMenuTextColor</item>
<item name="textAllCaps">@bool/config_actionMenuItemAllCaps</item>
</style>
<style name="TextAppearance.Material.Widget.ActionBar.Menu.Inverse" parent="TextAppearance.Material.Menu.Inverse">
<item name="textColor">?attr/actionMenuTextColor</item>
<item name="textAllCaps">@bool/config_actionMenuItemAllCaps</item>
</style>
<style name="TextAppearance.Material.Widget.ActionMode"/>
<style name="TextAppearance.Material.Widget.ActionMode.Title"
parent="TextAppearance.Material.Widget.ActionBar.Title" />
<style name="TextAppearance.Material.Widget.ActionMode.Title.Inverse"
parent="TextAppearance.Material.Widget.ActionBar.Title.Inverse" />
<style name="TextAppearance.Material.Widget.ActionMode.Subtitle"
parent="TextAppearance.Material.Widget.ActionBar.Subtitle" />
<style name="TextAppearance.Material.Widget.ActionMode.Subtitle.Inverse"
parent="TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse" />
<style name="TextAppearance.Material.Widget.Toolbar.Title"
parent="TextAppearance.Material.Widget.ActionBar.Title" />