Merge "Fix switchbar margin" into nyc-dev

am: eb72900

* commit 'eb7290055c377cf9f6136cc609646c0f897587a2':
  Fix switchbar margin

Change-Id: I45abaf3127a7402d473389ece8cba0a12b690605
This commit is contained in:
Jason Monk
2016-04-12 16:50:32 +00:00
committed by android-build-merger

View File

@@ -198,8 +198,8 @@
</style> </style>
<style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar"> <style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">
<item name="switchBarMarginStart">@dimen/switchbar_margin_start</item> <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
<item name="switchBarMarginEnd">@dimen/switchbar_margin_end</item> <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
<item name="switchBarBackgroundColor">@color/switchbar_background_color</item> <item name="switchBarBackgroundColor">@color/switchbar_background_color</item>
</style> </style>