Merge "Update ActionBar for using contentInsetStart" into lmp-preview-dev

This commit is contained in:
Fabrice Di Meglio
2014-05-30 00:47:42 +00:00
committed by Android (Google) Code Review
3 changed files with 17 additions and 3 deletions

View File

@@ -44,5 +44,10 @@
<!-- SwitchBar padding start -->
<dimen name="switchbar_padding_start">80dp</dimen>
<!-- SwitchBar padding end -->
<dimen name="switchbar_padding_end">80dp</dimen>
<!-- ActionBar contentInsetStart -->
<dimen name="actionbar_contentInsetStart">80dp</dimen>
</resources>

View File

@@ -94,8 +94,11 @@
<dimen name="dashboard_category_title_height">48dp</dimen>
<!-- SwitchBar padding start -->
<dimen name="switchbar_padding_start">72dp</dimen>
<!-- SwitchBar padding emd -->
<dimen name="switchbar_padding_end">@*android:dimen/preference_fragment_padding_side</dimen>
<dimen name="switchbar_padding_start">84dp</dimen>
<!-- SwitchBar padding end. Should be 2 x @*android:dimen/preference_fragment_padding_side -->
<dimen name="switchbar_padding_end">32dp</dimen>
<!-- ActionBar contentInsetStart -->
<dimen name="actionbar_contentInsetStart">84dp</dimen>
</resources>

View File

@@ -89,6 +89,12 @@
<!-- Used by the StatusBar and NavBar -->
<item name="android:colorPrimaryDark">@color/actionbar_background_color</item>
<item name="android:colorAccent">@color/quantum_orange_A200</item>
<!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Theme.ActionBar</item>
</style>
<style name="Theme.ActionBar" parent="@android:style/Widget.Quantum.Light.ActionBar.Solid">
<item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>
</style>
</resources>