summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/PagedView.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2010-11-01 11:57:06 -0700
committerWinson Chung <winsonc@google.com>2010-11-01 12:10:25 -0700
commit10fefb18c4f227f6a08fc24966800e49ce743be8 (patch)
tree7a94020c093bf24631c34d3a387025db4c9eb412 /src/com/android/launcher2/PagedView.java
parent27ebab6ff9999098938044101bec1e40e7f89b13 (diff)
downloadandroid_packages_apps_Trebuchet-10fefb18c4f227f6a08fc24966800e49ce743be8.tar.gz
android_packages_apps_Trebuchet-10fefb18c4f227f6a08fc24966800e49ce743be8.tar.bz2
android_packages_apps_Trebuchet-10fefb18c4f227f6a08fc24966800e49ce743be8.zip
Fixing issues in Launcher
- Now ending choice mode if a selected application is removed - Only updating apps in the customization drawer if the applications change - Adding null check when determining scrolling in PagedView Change-Id: I0b23d1383649626dc012bd70a5e8087885b77c17
Diffstat (limited to 'src/com/android/launcher2/PagedView.java')
-rw-r--r--src/com/android/launcher2/PagedView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 9739b156f..c1256969b 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -755,7 +755,9 @@ public abstract class PagedView extends ViewGroup {
// by a distant descendant, so use the mAllowLongPress flag to block
// everything
final View currentPage = getPageAt(mCurrentPage);
- currentPage.cancelLongPress();
+ if (currentPage != null) {
+ currentPage.cancelLongPress();
+ }
}
}
}