From: Fan Zhang <zhfan@google.com>
Date: Wed, 27 Apr 2016 16:52:38 +0000 (+0000)
Subject: Merge "Add c2c and chat support when there is eligible account." into nyc-mr1-dev
X-Git-Tag: android-x86-7.1-r1~847
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=562f6322e596b0e31cc295abd9ae75ce1a065082;p=android-x86%2Fpackages-apps-Settings.git

Merge "Add c2c and chat support when there is eligible account." into nyc-mr1-dev
---

562f6322e596b0e31cc295abd9ae75ce1a065082
diff --cc res/values/styles.xml
index 6601325a75,764cc58bf5..345edc9733
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@@ -344,8 -340,24 +344,16 @@@
          <item name="android:textColor">@color/warning</item>
      </style>
  
+     <style name="TextAppearance.SupportTitle"
+            parent="@android:style/TextAppearance.Material.Subhead">
+         <item name="android:textColor">?android:attr/colorAccent</item>
+         <item name="android:textSize">24sp</item>
+     </style>
+ 
+     <style name="TextAppearance.SupportSummary" parent="TextAppearance.CategoryTitle"/>
+ 
      <style name="FingerprintLayoutTheme">
 -        <item name="suwBackground">@drawable/fp_enrollment_header</item>
 -        <item name="suwIllustrationAspectRatio">@dimen/fingerprint_illustration_aspect_ratio</item>
 -        <item name="suwDecorPaddingTop">@dimen/fingerprint_decor_padding_top</item>
 -    </style>
 -
 -    <style name="SetupWizardFingerprintLayoutTheme">
 -        <item name="suwBackgroundTile">@drawable/setup_illustration_tile</item>
 -        <item name="suwIllustration">@drawable/setup_illustration_lock_screen</item>
 -        <item name="suwIllustrationHorizontalTile">@drawable/setup_illustration_horizontal_tile</item>
 +        <item name="android:icon">@drawable/ic_fingerprint_header</item>
      </style>
  
      <style name="TextAppearance.ConfirmDeviceCredentialsErrorText"