Chromium Code Reviews| 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:statusBarColor" tools:targetApi="21">@android:color/ black</item> | 25 <item name="android:statusBarColor" tools:targetApi="21">@android:color/ black</item> |
| 26 <item name="android:textColor">@color/default_text_color</item> | |
| 26 | 27 |
| 27 <!-- Overriding AppCompat values --> | 28 <!-- Overriding AppCompat values --> |
| 28 <item name="colorControlNormal">@color/light_normal_color</item> | 29 <item name="colorControlNormal">@color/light_normal_color</item> |
| 29 <item name="colorControlActivated">@color/light_active_color</item> | 30 <item name="colorControlActivated">@color/light_active_color</item> |
| 30 | 31 |
| 31 <!-- Default TintedImageButton tint --> | 32 <!-- Default TintedImageButton tint --> |
| 32 <item name="tint">@color/dark_mode_tint</item> | 33 <item name="tint">@color/dark_mode_tint</item> |
| 33 | 34 |
| 34 <!-- Navigation Transitions, requires API level 21 --> | 35 <!-- Navigation Transitions, requires API level 21 --> |
| 35 <item name="android:windowAllowEnterTransitionOverlap" tools:targetApi=" 21">false</item> | 36 <item name="android:windowAllowEnterTransitionOverlap" tools:targetApi=" 21">false</item> |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 48 <style name="FullscreenWhiteDialog" parent="Theme.AppCompat.Light" > | 49 <style name="FullscreenWhiteDialog" parent="Theme.AppCompat.Light" > |
| 49 <item name="android:windowBackground">@android:color/white</item> | 50 <item name="android:windowBackground">@android:color/white</item> |
| 50 <item name="android:textColorLink">@color/light_active_color</item> | 51 <item name="android:textColorLink">@color/light_active_color</item> |
| 51 <item name="android:statusBarColor" tools:targetApi="21">@android:color/ black</item> | 52 <item name="android:statusBarColor" tools:targetApi="21">@android:color/ black</item> |
| 52 <item name="colorPrimary">@color/light_active_color</item> | 53 <item name="colorPrimary">@color/light_active_color</item> |
| 53 <item name="colorAccent">@color/light_active_color</item> | 54 <item name="colorAccent">@color/light_active_color</item> |
| 54 </style> | 55 </style> |
| 55 | 56 |
| 56 <style name="DownloadActivityTheme" parent="FullscreenWhiteDialog"> | 57 <style name="DownloadActivityTheme" parent="FullscreenWhiteDialog"> |
| 57 <item name="colorPrimaryDark">@android:color/black</item> | 58 <item name="colorPrimaryDark">@android:color/black</item> |
| 59 <item name="android:textColor">@color/default_text_color</item> | |
|
gone
2016/10/10 18:22:55
This should go under the FullscreenWhiteDialog sec
bhallam
2016/10/11 02:15:19
Done.
| |
| 58 | 60 |
| 59 <!-- Remove ActionBar --> | 61 <!-- Remove ActionBar --> |
| 60 <item name="windowNoTitle">true</item> | 62 <item name="windowNoTitle">true</item> |
| 61 <item name="windowActionBar">false</item> | 63 <item name="windowActionBar">false</item> |
| 62 </style> | 64 </style> |
| 63 | 65 |
| 64 <!-- Web app themes --> | 66 <!-- Web app themes --> |
| 65 <style name="WebappTheme" parent="MainTheme"> | 67 <style name="WebappTheme" parent="MainTheme"> |
| 66 <item name="android:windowBackground">@null</item> | 68 <item name="android:windowBackground">@null</item> |
| 67 <item name="android:windowDisablePreview">true</item> | 69 <item name="android:windowDisablePreview">true</item> |
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 582 </style> | 584 </style> |
| 583 <style name="MaterialProgressBar" parent="Widget.AppCompat.ProgressBar.Horiz ontal"> | 585 <style name="MaterialProgressBar" parent="Widget.AppCompat.ProgressBar.Horiz ontal"> |
| 584 <item name="android:progressDrawable">@drawable/material_progressbar</it em> | 586 <item name="android:progressDrawable">@drawable/material_progressbar</it em> |
| 585 </style> | 587 </style> |
| 586 | 588 |
| 587 <!-- New tab page RecyclerView overscroll color --> | 589 <!-- New tab page RecyclerView overscroll color --> |
| 588 <style name="NewTabPageRecyclerView"> | 590 <style name="NewTabPageRecyclerView"> |
| 589 <item name="android:colorEdgeEffect">@color/google_grey_300</item> | 591 <item name="android:colorEdgeEffect">@color/google_grey_300</item> |
| 590 </style> | 592 </style> |
| 591 </resources> | 593 </resources> |
| OLD | NEW |