| commit | a742856872c4e4a2fd3d9a91457dedae6cc0eab1 | [log] [tgz] |
|---|---|---|
| author | Michael Jurka <mikejurka@google.com> | Thu Apr 26 14:00:52 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 26 14:00:52 2012 -0700 |
| tree | 8182869f9db9acd35e720f089a12fb5cd01cb246 | |
| parent | 0a6493c4583868bd0d1269ba89e95dfe00088259 [diff] | |
| parent | f8304f05db24b504b7a3bc113929af29df7daf6e [diff] |
Merge "Fix drag outlines for full-sized icons" into jb-dev
diff --git a/res/drawable-sw600dp-hdpi/ic_no_applications.png b/res/drawable-sw600dp-hdpi/ic_no_applications.png deleted file mode 100644 index 933d091..0000000 --- a/res/drawable-sw600dp-hdpi/ic_no_applications.png +++ /dev/null Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/tab_selected_focused_holo.9.png b/res/drawable-sw600dp-hdpi/tab_selected_focused_holo.9.png deleted file mode 100644 index 1ba35d5..0000000 --- a/res/drawable-sw600dp-hdpi/tab_selected_focused_holo.9.png +++ /dev/null Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/tab_selected_holo.9.png b/res/drawable-sw600dp-hdpi/tab_selected_holo.9.png deleted file mode 100644 index ef913cc..0000000 --- a/res/drawable-sw600dp-hdpi/tab_selected_holo.9.png +++ /dev/null Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-sw600dp-hdpi/tab_selected_pressed_focused_holo.9.png deleted file mode 100644 index d7e9688..0000000 --- a/res/drawable-sw600dp-hdpi/tab_selected_pressed_focused_holo.9.png +++ /dev/null Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/tab_selected_pressed_holo.9.png b/res/drawable-sw600dp-hdpi/tab_selected_pressed_holo.9.png deleted file mode 100644 index b8b1fcf..0000000 --- a/res/drawable-sw600dp-hdpi/tab_selected_pressed_holo.9.png +++ /dev/null Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_home_add_holo_dark.png b/res/drawable-sw600dp-mdpi/ic_home_add_holo_dark.png deleted file mode 100644 index 7f04589..0000000 --- a/res/drawable-sw600dp-mdpi/ic_home_add_holo_dark.png +++ /dev/null Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_no_applications.png b/res/drawable-sw600dp-mdpi/ic_no_applications.png deleted file mode 100644 index a4f695a..0000000 --- a/res/drawable-sw600dp-mdpi/ic_no_applications.png +++ /dev/null Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/tab_selected_focused_holo.9.png b/res/drawable-sw600dp-mdpi/tab_selected_focused_holo.9.png deleted file mode 100644 index 782ae35..0000000 --- a/res/drawable-sw600dp-mdpi/tab_selected_focused_holo.9.png +++ /dev/null Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/tab_selected_holo.9.png b/res/drawable-sw600dp-mdpi/tab_selected_holo.9.png deleted file mode 100644 index 255d072..0000000 --- a/res/drawable-sw600dp-mdpi/tab_selected_holo.9.png +++ /dev/null Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-sw600dp-mdpi/tab_selected_pressed_focused_holo.9.png deleted file mode 100644 index 10152bb..0000000 --- a/res/drawable-sw600dp-mdpi/tab_selected_pressed_focused_holo.9.png +++ /dev/null Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/tab_selected_pressed_holo.9.png b/res/drawable-sw600dp-mdpi/tab_selected_pressed_holo.9.png deleted file mode 100644 index 822ed51..0000000 --- a/res/drawable-sw600dp-mdpi/tab_selected_pressed_holo.9.png +++ /dev/null Binary files differ
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 00a35a5..7b71ff4 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -1421,7 +1421,7 @@ float alpha; - if (!LauncherApplication.isScreenLarge() || scrollProgress < 0) { + if (scrollProgress < 0) { alpha = scrollProgress < 0 ? mAlphaInterpolator.getInterpolation( 1 - Math.abs(scrollProgress)) : 1.0f; } else {
