diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-21 17:01:26 -0700 |
|---|---|---|
| committer | Ed Heyl <edheyl@google.com> | 2015-07-22 11:31:04 -0700 |
| commit | e612775922ec9f8cc4e5cb976bc62b3312a3de0e (patch) | |
| tree | 96beaf07307486f6491f022da63ebe381765d1a8 /res/values/styles.xml | |
| parent | a83129f0bc778fd1ccd799bd8cfa40270f632e1d (diff) | |
| download | android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.gz android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.bz2 android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.zip | |
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
b/22609402
Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
Diffstat (limited to 'res/values/styles.xml')
| -rw-r--r-- | res/values/styles.xml | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 77798f174..7d60cbe0a 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -18,8 +18,15 @@ --> <resources> + <style name="Theme.Light.CustomOverscroll" parent="@android:style/Theme.DeviceDefault"> + <item name="android:colorEdgeEffect">@color/folder_edge_effect_color</item> + </style> + + <style name="Theme.Dark.CustomOverscroll" parent="@android:style/Theme.DeviceDefault"> + <item name="android:colorEdgeEffect">@color/workspace_edge_effect_color</item> + </style> - <style name="WorkspaceIcon"> + <style name="Icon"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> <item name="android:layout_gravity">center</item> @@ -32,11 +39,7 @@ <item name="android:fontFamily">sans-serif-condensed</item> </style> - <style name="WorkspaceIcon.Portrait"></style> - - <style name="WorkspaceIcon.Landscape"></style> - - <style name="WorkspaceIcon.AppsCustomize"> + <style name="Icon.AllApps"> <item name="android:background">@null</item> <item name="android:textColor">@color/quantum_panel_text_color</item> <item name="android:drawablePadding">@dimen/dynamic_grid_icon_drawable_padding</item> @@ -44,7 +47,7 @@ <item name="customShadows">false</item> </style> - <style name="WorkspaceIcon.Folder"> + <style name="Icon.Folder"> <item name="android:background">@null</item> <item name="android:textColor">@color/quantum_panel_text_color</item> <item name="android:shadowRadius">0</item> @@ -58,7 +61,7 @@ <item name="android:layout_height">match_parent</item> </style> - <style name="DropTargetButton.Base"> + <style name="DropTargetButtonBase"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">match_parent</item> <item name="android:layout_gravity">center</item> @@ -76,7 +79,7 @@ <item name="android:shadowRadius">4.0</item> </style> - <style name="DropTargetButton" parent="DropTargetButton.Base"></style> + <style name="DropTargetButton" parent="DropTargetButtonBase" /> <style name="PreloadIcon"> <item name="background">@drawable/virtual_preload</item> @@ -90,9 +93,4 @@ <item name="ringOutset">4dp</item> </style> - <!-- Overridden in device overlays --> - <style name="PagedViewWidgetImageView"> - <item name="android:paddingLeft">@dimen/app_widget_preview_padding_left</item> - </style> - </resources> |