Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev am: 17521d0ac7

am: d32e9b5229

Change-Id: Icf5c8c48bb2ea7375cc03d3cec9d9879b6db7249
This commit is contained in:
Fan Zhang
2019-05-14 18:15:28 -07:00
committed by android-build-merger
9 changed files with 166 additions and 186 deletions

View File

@@ -27,8 +27,11 @@
<style name="Theme.Settings" parent="Theme.SettingsBase">
<item name="preferenceTheme">@style/PreferenceTheme</item>
<item name="android:clipToPadding">false</item>
<item name="android:clipChildren">false</item>
<item name="android:listPreferredItemHeight">72dip</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
@@ -88,6 +91,7 @@
</style>
<style name="ThemeOverlay.SwitchBar.Settings" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">
<item name="android:elevation">1dp</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>