diff options
author | Winson Chung <winsonc@google.com> | 2012-02-13 13:03:52 -0800 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2012-02-13 13:03:52 -0800 |
commit | a1cdab039292f3d809528c0e2e38580b37864d8d (patch) | |
tree | 696d35b58eea07325f0a839d95eafdf79f9c0583 /res | |
parent | 9659d0c3a5c29f880bc12d1051e3e3beae2d4a87 (diff) | |
download | android_packages_apps_Trebuchet-a1cdab039292f3d809528c0e2e38580b37864d8d.tar.gz android_packages_apps_Trebuchet-a1cdab039292f3d809528c0e2e38580b37864d8d.tar.bz2 android_packages_apps_Trebuchet-a1cdab039292f3d809528c0e2e38580b37864d8d.zip |
Reverting: "Animating the drag view scale up and down when dragging items."
Change-Id: I133ff2631834a4b97e1e4750fb7c07793ddeba69
Diffstat (limited to 'res')
-rw-r--r-- | res/values-sw600dp/config.xml | 7 | ||||
-rw-r--r-- | res/values/colors.xml | 3 | ||||
-rw-r--r-- | res/values/config.xml | 7 |
3 files changed, 11 insertions, 6 deletions
diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml index 2ce563dc8..7a0789839 100644 --- a/res/values-sw600dp/config.xml +++ b/res/values-sw600dp/config.xml @@ -11,9 +11,10 @@ <!-- Whether or not to fade the side pages --> <bool name="config_workspaceFadeAdjacentScreens">true</bool> - <!-- When dragging an item on the workspace, how much bigger (scale factor) the dragged view - should be, as compared to the original view. If 0, it will not be scaled at all. --> - <integer name="config_dragViewScaleFactor">115</integer> + <!-- When dragging items on the workspace, how much bigger (in pixels) the dragged view + should be, as compared to the original view. If 0, it will not be scaled at all. + Should be an even number, for pixel alignment. --> + <integer name="config_dragViewExtraPixels">0</integer> <!-- When shrinking the workspace, this is the percentage of its original size. --> <integer name="config_workspaceShrinkPercent">17</integer> diff --git a/res/values/colors.xml b/res/values/colors.xml index 1efeb9e49..ece0fd895 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -23,6 +23,9 @@ <color name="delete_target_hover_tint">#DAFF0000</color> <color name="info_target_hover_tint">#DA0099CC</color> + <!-- The alpha/color to apply to the drag image --> + <color name="drag_view_multiply_color">#CCFFFFFF</color> + <color name="bubble_dark_background">#20000000</color> <color name="appwidget_error_color">#FCCC</color> diff --git a/res/values/config.xml b/res/values/config.xml index 691fb07e2..7ab98707c 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -54,9 +54,10 @@ <integer name="config_crosshairsFadeInTime">600</integer> - <!-- When dragging an item on the workspace, how much bigger (scale factor) the dragged view - should be, as compared to the original view. If 0, it will not be scaled at all. --> - <integer name="config_dragViewScaleFactor">115</integer> + <!-- When dragging an item on the workspace, how much bigger (in pixels) the dragged view + should be, as compared to the original view. If 0, it will not be scaled at all. + Should be an even number, for pixel alignment. --> + <integer name="config_dragViewExtraPixels">40</integer> <!-- The duration (in ms) of the fade animation on the object outlines, used when we are dragging objects around on the home screen. --> |