PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix confirm lock UI theme." into nyc-mr1-dev am: 0c1d06e3a1

Browse Source 
am: 96bec70cb3

* commit '96bec70cb31d0f90620f0589634061a8591b1bbf':
  Fix confirm lock UI theme.

Change-Id: I4133af7020ab30cdbfd16c165af6d1d8871e0b26
This commit is contained in:
Andrew Sapperstein
2016-05-25 19:05:07 +00:00
committed by android-build-merger
parent bff6af37ba 96bec70cb3
commit d100ecf993
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/colors.xml
View File

@@ -69,7 +69,6 @@
<color name="sim_noitification">@*android:color/material_deep_teal_500</color>
<color name="warning">#ff5621</color>
<color name="confirm_device_credential_dark_background">#263238</color>
<color name="confirm_device_credential_transparent_black">#60000000</color>
<color name="voice_interaction_highlight">#33b5e5</color>

4
res/values/themes.xml
View File

@@ -269,10 +269,10 @@
<style name="Theme.ConfirmDeviceCredentialsDark" parent="@android:style/Theme.Material">
<item name="android:colorPrimary">@color/primary_color</item>
<item name="android:colorPrimaryDark">@color/primary_dark_color</item>
<item name="android:colorAccent">@color/accent_color_lighter</item>
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowBackground">@color/confirm_device_credential_dark_background</item>
<item name="android:windowBackground">?android:attr/colorPrimary</item>
<item name="confirmDeviceCredentialsSideMargin">32dp</item>
<item name="confirmDeviceCredentialsTopMargin">32dp</item>