Merge "Set QR scan activity to light theme in setup flow" into qt-dev am: 54cddc70e5

am: 9f8406d876

Change-Id: I4ca7732c16bfaf11b5ede3763a3b20e1bd9c74ae
This commit is contained in:
Pasty Chang
2019-04-30 13:34:49 -07:00
committed by android-build-merger
4 changed files with 58 additions and 7 deletions

View File

@@ -211,4 +211,25 @@
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
</style>
<!-- This light theme for a window that can be applied to show light theme in setupwizard flow,
regardless of whether system theme changed to dark or light theme. WARNING: your settings
activity shows in setupwizard flow, but doesn't use setupwizard theme. This theme must be
set to ensure settings activity always shows light theme in setupwizard flow. -->
<style name="LightTheme.SettingsBase.SetupWizard" parent="@android:style/Theme.DeviceDefault">
<item name="android:windowLightStatusBar">true</item>
<item name="android:navigationBarColor">@android:color/white</item>
<item name="android:windowLightNavigationBar">true</item>
<item name="android:navigationBarDividerColor">@*android:color/navigation_bar_divider_device_default_settings</item>
<item name="android:colorPrimary">@*android:color/primary_device_default_settings_light</item>
<item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
<item name="android:colorBackground">@*android:color/background_device_default_light</item>
<item name="android:colorAccent">@*android:color/accent_device_default_light</item>
<item name="android:listDivider">@*android:color/list_divider_color_light</item>
<item name="android:textColorPrimary">@*android:color/primary_text_light</item>
<item name="android:textColorSecondary">@*android:color/secondary_text_light</item>
</style>
</resources>