summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-09-07 18:02:31 -0700
committerAdam Cohen <adamcohen@google.com>2011-09-11 17:24:49 -0700
commitb5ba097015c4794fa822f30b38a60a7070a00097 (patch)
treec6cde4abffb777df40d00567836cd7117924f994 /res
parent09c1552341d76f9963eb18245887d86c4d00301f (diff)
downloadandroid_packages_apps_Trebuchet-b5ba097015c4794fa822f30b38a60a7070a00097.tar.gz
android_packages_apps_Trebuchet-b5ba097015c4794fa822f30b38a60a7070a00097.tar.bz2
android_packages_apps_Trebuchet-b5ba097015c4794fa822f30b38a60a7070a00097.zip
Workspace overscroll effect
-> Made AllAppsCustomize scroll/over scroll more subtle Change-Id: Icf1889b3adccce22d4a2d80c5b487518b0ab3157
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/overscroll_glow_left.9.pngbin0 -> 1966 bytes
-rw-r--r--res/drawable-hdpi/overscroll_glow_right.9.pngbin0 -> 1942 bytes
-rw-r--r--res/drawable-mdpi/overscroll_glow_left.9.pngbin0 -> 1607 bytes
-rw-r--r--res/drawable-mdpi/overscroll_glow_right.9.pngbin0 -> 1602 bytes
-rw-r--r--res/drawable-xhdpi/overscroll_glow_left.9.pngbin0 -> 2585 bytes
-rw-r--r--res/drawable-xhdpi/overscroll_glow_right.9.pngbin0 -> 2512 bytes
-rw-r--r--res/layout-port/launcher.xml8
-rw-r--r--res/values/dimens.xml1
8 files changed, 5 insertions, 4 deletions
diff --git a/res/drawable-hdpi/overscroll_glow_left.9.png b/res/drawable-hdpi/overscroll_glow_left.9.png
new file mode 100644
index 000000000..cb8f22ae1
--- /dev/null
+++ b/res/drawable-hdpi/overscroll_glow_left.9.png
Binary files differ
diff --git a/res/drawable-hdpi/overscroll_glow_right.9.png b/res/drawable-hdpi/overscroll_glow_right.9.png
new file mode 100644
index 000000000..3135816db
--- /dev/null
+++ b/res/drawable-hdpi/overscroll_glow_right.9.png
Binary files differ
diff --git a/res/drawable-mdpi/overscroll_glow_left.9.png b/res/drawable-mdpi/overscroll_glow_left.9.png
new file mode 100644
index 000000000..5989dcee1
--- /dev/null
+++ b/res/drawable-mdpi/overscroll_glow_left.9.png
Binary files differ
diff --git a/res/drawable-mdpi/overscroll_glow_right.9.png b/res/drawable-mdpi/overscroll_glow_right.9.png
new file mode 100644
index 000000000..5a6d2bc55
--- /dev/null
+++ b/res/drawable-mdpi/overscroll_glow_right.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/overscroll_glow_left.9.png b/res/drawable-xhdpi/overscroll_glow_left.9.png
new file mode 100644
index 000000000..cb4776069
--- /dev/null
+++ b/res/drawable-xhdpi/overscroll_glow_left.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/overscroll_glow_right.9.png b/res/drawable-xhdpi/overscroll_glow_right.9.png
new file mode 100644
index 000000000..25abad0ab
--- /dev/null
+++ b/res/drawable-xhdpi/overscroll_glow_right.9.png
Binary files differ
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index b45800ef5..898e849ea 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -46,6 +46,10 @@
android:layout_gravity="bottom"
android:layout_marginBottom="@dimen/button_bar_height" />
+ <include
+ android:id="@+id/qsb_bar"
+ layout="@layout/qsb_bar" />
+
<!-- The workspace contains 5 screens of cells -->
<com.android.launcher2.Workspace
android:id="@+id/workspace"
@@ -67,10 +71,6 @@
<include android:id="@+id/cell5" layout="@layout/workspace_screen" />
</com.android.launcher2.Workspace>
- <include
- android:id="@+id/qsb_bar"
- layout="@layout/qsb_bar" />
-
<include layout="@layout/apps_customize_pane"
android:id="@+id/apps_customize_pane"
android:layout_width="match_parent"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a5b394d72..512419a9a 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -35,6 +35,7 @@
<dimen name="hotseat_cell_height">64dp</dimen>
<dimen name="hotseat_width_gap">-1dp</dimen>
<dimen name="hotseat_height_gap">-1dp</dimen>
+ <dimen name="workspace_overscroll_drawable_padding">0dp</dimen>
<!-- QSB -->
<dimen name="toolbar_button_vertical_padding">0dip</dimen>