| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright 2014 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2014 The Chromium Authors. All rights reserved. |
| 3 Use of this source code is governed by a BSD-style license that can be | 3 Use of this source code is governed by a BSD-style license that can be |
| 4 found in the LICENSE file. --> | 4 found in the LICENSE file. --> |
| 5 | 5 |
| 6 <resources xmlns:tools="http://schemas.android.com/tools"> | 6 <resources xmlns:tools="http://schemas.android.com/tools"> |
| 7 <!-- Q: Why put style resources under values-v17/ ? | 7 <!-- Q: Why put style resources under values-v17/ ? |
| 8 A: Problem: | 8 A: Problem: |
| 9 1. paddingStart causes a crash on Galaxy Tab&Note b/8351339. | 9 1. paddingStart causes a crash on Galaxy Tab&Note b/8351339. |
| 10 2. So we wrote a build script(generate_v14_compatible_resources.py)
to convert | 10 2. So we wrote a build script(generate_v14_compatible_resources.py)
to convert |
| 11 paddingStart to paddingLeft for pre-v17 (crbug.com/235118). | 11 paddingStart to paddingLeft for pre-v17 (crbug.com/235118). |
| 12 3. However, style files are not overrided by the corresponding gener
ated style files, | 12 3. However, style files are not overrided by the corresponding gener
ated style files, |
| 13 but merged when we pass them to aapt unlike layout files. | 13 but merged when we pass them to aapt unlike layout files. |
| 14 | 14 |
| 15 So we decided to keep style resources under values-v17/ so that it i
s not merged with | 15 So we decided to keep style resources under values-v17/ so that it i
s not merged with |
| 16 the generated style resources under res_v14_compatibility/values/ (c
rbug.com/243952). | 16 the generated style resources under res_v14_compatibility/values/ (c
rbug.com/243952). |
| 17 --> | 17 --> |
| 18 | 18 |
| 19 <style name="LauncherTheme" parent="@android:style/Theme.NoDisplay" /> | 19 <style name="LauncherTheme" parent="@android:style/Theme.NoDisplay" /> |
| 20 | 20 |
| 21 <style name="MainTheme" parent="Theme.AppCompat.Light.NoActionBar"> | 21 <style name="MainTheme" parent="Theme.AppCompat.Light.NoActionBar"> |
| 22 <item name="android:windowContentOverlay">@null</item> | 22 <item name="android:windowContentOverlay">@null</item> |
| 23 <item name="android:textColorHighlight">@color/text_highlight_color</ite
m> | 23 <item name="android:textColorHighlight">@color/text_highlight_color</ite
m> |
| 24 <item name="android:textColorLink">@color/light_active_color</item> | 24 <item name="android:textColorLink">@color/light_active_color</item> |
| 25 <item name="android:textColor">@color/default_text_color</item> | |
| 26 <item name="colorPrimaryDark">@android:color/black</item> | 25 <item name="colorPrimaryDark">@android:color/black</item> |
| 26 <item name="android:statusBarColor" tools:targetApi="21">@android:color/
black</item> |
| 27 | 27 |
| 28 <!-- Overriding AppCompat values --> | 28 <!-- Overriding AppCompat values --> |
| 29 <item name="colorControlNormal">@color/light_normal_color</item> | 29 <item name="colorControlNormal">@color/light_normal_color</item> |
| 30 <item name="colorControlActivated">@color/light_active_color</item> | 30 <item name="colorControlActivated">@color/light_active_color</item> |
| 31 | 31 |
| 32 <!-- Default TintedImageButton tint --> | 32 <!-- Default TintedImageButton tint --> |
| 33 <item name="tint">@color/dark_mode_tint</item> | 33 <item name="tint">@color/dark_mode_tint</item> |
| 34 | 34 |
| 35 <!-- Navigation Transitions, requires API level 21 --> | 35 <!-- Navigation Transitions, requires API level 21 --> |
| 36 <item name="android:windowAllowEnterTransitionOverlap" tools:targetApi="
21">false</item> | 36 <item name="android:windowAllowEnterTransitionOverlap" tools:targetApi="
21">false</item> |
| 37 <item name="android:windowAllowReturnTransitionOverlap" tools:targetApi=
"21">true</item> | 37 <item name="android:windowAllowReturnTransitionOverlap" tools:targetApi=
"21">true</item> |
| 38 <item name="android:windowContentTransitions" tools:targetApi="21">true<
/item> | 38 <item name="android:windowContentTransitions" tools:targetApi="21">true<
/item> |
| 39 <item name="android:windowEnterTransition" tools:targetApi="21">@transit
ion/fade</item> | 39 <item name="android:windowEnterTransition" tools:targetApi="21">@transit
ion/fade</item> |
| 40 <item name="android:windowExitTransition" tools:targetApi="21">@null</it
em> | 40 <item name="android:windowExitTransition" tools:targetApi="21">@null</it
em> |
| 41 <item name="android:windowSharedElementEnterTransition" tools:targetApi=
"21">@transition/move_image</item> | 41 <item name="android:windowSharedElementEnterTransition" tools:targetApi=
"21">@transition/move_image</item> |
| 42 <item name="android:windowSharedElementExitTransition" tools:targetApi="
21">@transition/move_image</item> | 42 <item name="android:windowSharedElementExitTransition" tools:targetApi="
21">@transition/move_image</item> |
| 43 </style> | 43 </style> |
| 44 | 44 |
| 45 <style name="TabbedModeTheme" parent="MainTheme"> | 45 <style name="TabbedModeTheme" parent="MainTheme"> |
| 46 <item name="android:windowBackground">@drawable/window_background</item> | 46 <item name="android:windowBackground">@drawable/window_background</item> |
| 47 </style> | 47 </style> |
| 48 | 48 |
| 49 <style name="FullscreenWhite" parent="Theme.AppCompat.Light" > | 49 <style name="FullscreenWhite" parent="Theme.AppCompat.Light" > |
| 50 <item name="android:windowBackground">@android:color/white</item> | 50 <item name="android:windowBackground">@android:color/white</item> |
| 51 <item name="android:textColor">@color/default_text_color</item> | |
| 52 <item name="android:textColorLink">@color/light_active_color</item> | 51 <item name="android:textColorLink">@color/light_active_color</item> |
| 53 <item name="colorPrimaryDark">@android:color/black</item> | 52 <item name="colorPrimaryDark">@android:color/black</item> |
| 54 <item name="colorPrimary">@color/light_active_color</item> | 53 <item name="colorPrimary">@color/light_active_color</item> |
| 55 <item name="colorAccent">@color/light_active_color</item> | 54 <item name="colorAccent">@color/light_active_color</item> |
| 56 <item name="windowNoTitle">true</item> | 55 <item name="windowNoTitle">true</item> |
| 57 </style> | 56 </style> |
| 58 | 57 |
| 59 <style name="FullscreenWhiteActivityTheme" parent="FullscreenWhite"> | 58 <style name="FullscreenWhiteActivityTheme" parent="FullscreenWhite"> |
| 60 <item name="windowActionBar">false</item> | 59 <item name="windowActionBar">false</item> |
| 61 </style> | 60 </style> |
| (...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 </style> | 568 </style> |
| 570 <style name="MaterialProgressBar" parent="Widget.AppCompat.ProgressBar.Horiz
ontal"> | 569 <style name="MaterialProgressBar" parent="Widget.AppCompat.ProgressBar.Horiz
ontal"> |
| 571 <item name="android:progressDrawable">@drawable/material_progressbar</it
em> | 570 <item name="android:progressDrawable">@drawable/material_progressbar</it
em> |
| 572 </style> | 571 </style> |
| 573 | 572 |
| 574 <!-- New tab page RecyclerView overscroll color --> | 573 <!-- New tab page RecyclerView overscroll color --> |
| 575 <style name="NewTabPageRecyclerView"> | 574 <style name="NewTabPageRecyclerView"> |
| 576 <item name="android:colorEdgeEffect">@color/google_grey_300</item> | 575 <item name="android:colorEdgeEffect">@color/google_grey_300</item> |
| 577 </style> | 576 </style> |
| 578 </resources> | 577 </resources> |
| OLD | NEW |