summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-02-06 16:43:52 -0800
committerWinson Chung <winsonc@google.com>2012-02-07 16:16:27 -0800
commit42c29aedf2b518c4317fc534f3c87711b57bc9b5 (patch)
tree634f6f3152ea96be08a361328f3a54d8dff99dea /res
parent6af9af057f2e40c54a4ed447c4628eef7dc15683 (diff)
downloadandroid_packages_apps_Trebuchet-42c29aedf2b518c4317fc534f3c87711b57bc9b5.tar.gz
android_packages_apps_Trebuchet-42c29aedf2b518c4317fc534f3c87711b57bc9b5.tar.bz2
android_packages_apps_Trebuchet-42c29aedf2b518c4317fc534f3c87711b57bc9b5.zip
Animating the drag view scale up and down when dragging items.
- Also fixing up how we draw the drag view alpha Change-Id: Ied82aec9d52274b0fe65c989eab818b0264a9eb2
Diffstat (limited to 'res')
-rw-r--r--res/values-sw600dp/config.xml7
-rw-r--r--res/values/colors.xml3
-rw-r--r--res/values/config.xml7
3 files changed, 6 insertions, 11 deletions
diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml
index 7a0789839..2ce563dc8 100644
--- a/res/values-sw600dp/config.xml
+++ b/res/values-sw600dp/config.xml
@@ -11,10 +11,9 @@
<!-- Whether or not to fade the side pages -->
<bool name="config_workspaceFadeAdjacentScreens">true</bool>
- <!-- 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 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 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 ece0fd895..1efeb9e49 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -23,9 +23,6 @@
<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 7ab98707c..691fb07e2 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -54,10 +54,9 @@
<integer name="config_crosshairsFadeInTime">600</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>
+ <!-- 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>
<!-- The duration (in ms) of the fade animation on the object outlines, used when
we are dragging objects around on the home screen. -->