Merge "Fix switchbar margin" into nyc-dev am: eb72900

am: 6e7b095

* commit '6e7b09561f7019b4684f55c26fa075180f882bfe':
  Fix switchbar margin

Change-Id: Id711bb8464fe556af06d2d3e79cb48162e248351
This commit is contained in:
Jason Monk
2016-04-12 16:56:21 +00:00
committed by android-build-merger

View File

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