diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/colors.xml | 35 | ||||
| -rw-r--r-- | res/values/dimensions.xml | 5 | ||||
| -rw-r--r-- | res/values/styles.xml | 41 |
3 files changed, 53 insertions, 28 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index ffee48bd9..3b362aa3a 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -4,38 +4,41 @@ ** ** Copyright 2006, The Android Open Source Project ** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at ** -** http://www.apache.org/licenses/LICENSE-2.0 +** http://www.apache.org/licenses/LICENSE-2.0 ** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and ** limitations under the License. */ --> <!-- FIXME: Change the name of this file! It is now being used generically for the browser --> <resources> - <color name="white">#ffffffff</color> - <color name="black">#ff000000</color> - + <color name="white">#fafafa</color> + <color name="black">#212121</color> + <color name="primary">#4caf50</color> + <color name="primary_dark">#388e3c</color> + <color name="accent">#1b5e20</color> + <color name="floating_action_button_touch_tint">#388e3c</color> <color name="bookmarkWidgetHeader">#383847</color> <color name="bookmarkWidgetDivider">#383847</color> <color name="bookmarkWidgetItemBackground">#2b2b3c</color> <color name="bookmarkWidgetFolderBackground">#A0383847</color> <color name="bookmarkWidgetFaviconBackground">#23ffffff</color> <color name="bookmarkListFaviconBackground">#23ffffff</color> - <color name="tabFaviconBackground">#FF555555</color> + <color name="tabFaviconBackground">#4caf50</color> <color name="tabFocusHighlight">#FF99CC00</color> <color name="qcMenuBackground">#C0000000</color> - <color name="qc_normal">#E02A96BC</color> - <color name="qc_selected">#E0FF8800</color> - <color name="qc_sub">#F01A5B73</color> - <color name="qc_tab_nr">#F033B5E5</color> + <color name="qc_normal">#4caf50</color> + <color name="qc_selected">#388e3c</color> + <color name="qc_sub">#2e7d32</color> + <color name="qc_tab_nr">#2e7d32</color> <color name="tabViewTitleBackground">#D0000000</color> <color name="navtab_bg">#80606060</color> </resources> diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index 5e3ec8b4c..019a17329 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -74,4 +74,9 @@ <dimen name="nav_tab_text_small">14sp</dimen> <dimen name="suggest_item_padding">8dp</dimen> <dimen name="progress_bar_margin">-11dip</dimen> + <dimen name="diameter">48dp</dimen> + <dimen name="elevation_low">1dp</dimen> + <dimen name="elevation_high">4dp</dimen> + <dimen name="add_button_margin">16dp</dimen> + </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 17c5eb207..b0167c8c4 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -18,18 +18,30 @@ */ --> <resources> - <style name="BrowserTheme" parent="@android:Theme.Holo"> + <style name="BrowserTheme" parent="@android:Theme.Material.Light"> <item name="android:windowBackground">@color/white</item> - <item name="android:colorBackground">#FFFFFFFF</item> + <item name="android:colorBackground">@color/white</item> <item name="android:windowActionBar">false</item> <item name="android:windowNoTitle">true</item> <item name="android:windowActionModeOverlay">true</item> <item name="android:actionBarStyle">@style/ActionBarStyle</item> + <item name="android:colorPrimary">@color/primary</item> + <item name="android:colorPrimaryDark">@color/primary_dark</item> + <item name="android:colorAccent">@color/accent</item> </style> - <style name="DialogWhenLarge" parent="@android:style/Theme.Holo.DialogWhenLarge" > + <style name="PreferencesTheme" parent="@android:Theme.Material.Light.DarkActionBar"> + <item name="android:colorPrimary">@color/primary</item> + <item name="android:colorPrimaryDark">@color/primary_dark</item> + <item name="android:colorAccent">@color/accent</item> + </style> + <style name="DialogWhenLarge" parent="@android:style/Theme.Material.DialogWhenLarge" > <item name="android:windowActionBar">false</item> + <item name="android:popupBackground">#fafafa</item> </style> - <style name="BookmarkTheme" parent="@android:Theme.Holo"> + <style name="BookmarkTheme" parent="@android:Theme.Material"> + <item name="android:colorPrimary">@color/primary</item> + <item name="android:colorPrimaryDark">@color/primary_dark</item> + <item name="android:colorAccent">@color/accent</item> <item name="android:windowActionBar">false</item> <item name="android:windowNoTitle">true</item> <item name="android:colorBackgroundCacheHint">@null</item> @@ -39,26 +51,31 @@ <item name="android:backgroundDimEnabled">false</item> <item name="android:windowIsTranslucent">true</item> </style> - <style name="ActionBarStyle" parent="@android:style/Widget.Holo.ActionBar"> - <item name="android:background">@drawable/bg_urlbar</item> + <style name="ActionBarStyle" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar"> + <item name="android:background">@color/primary</item> <item name="android:displayOptions"></item> </style> - <style name="Suggestions" parent="@android:style/Widget.Holo.AutoCompleteTextView"> - <item name="android:popupBackground">#D0000000</item> + <style name="Suggestions" parent="@android:style/Widget.Material.AutoCompleteTextView"> + <item name="android:popupBackground">#fafafa</item> <item name="android:dropDownVerticalOffset">0dip</item> + <item name="android:textColor">?android:attr/textColorPrimaryInverse</item> + <item name="android:textColorHint">?android:attr/textColorHintInverse</item> + </style> + <style name="Widget.UrlInputView" parent="BrowserTheme"> + <item name="android:colorAccent">@color/accent</item> </style> <style name="SuggestionLineMedium" - parent="@android:style/TextAppearance.Holo.Medium"> + parent="@android:style/TextAppearance.Material.Medium"> <item name="android:textSize">16sp</item> </style> <style name="SuggestionLineSmall" - parent="@android:style/TextAppearance.Holo.Small"> + parent="@android:style/TextAppearance.Material.Small"> <item name="android:textSize">12sp</item> </style> <style name="ActionBar" parent="@android:style/Widget.ActionBar"> - <item name="android:background">@color/black</item> + <item name="android:background">@color/primary</item> </style> - <style name="ShortcutTheme" parent="@android:Theme.Holo.DialogWhenLarge"> + <style name="ShortcutTheme" parent="@android:Theme.Material.DialogWhenLarge"> </style> <style name="TitleBar"> <item name="android:windowEnterAnimation">@anim/title_bar_enter</item> |