summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Ashdown <ashdown@google.com>2014-03-20 01:12:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-20 01:12:57 +0000
commit32e4344a20c4f9c9323061aaef96678c098d6200 (patch)
tree2b65c237f62c1c60f7187733ef9268cb5dce93c9
parent49635c7147d1e71d052b80d89c69785baaee99b3 (diff)
parenta2bc37722e9fa0af9d67986038aec58af5308771 (diff)
downloadandroid_packages_apps_Trebuchet-32e4344a20c4f9c9323061aaef96678c098d6200.tar.gz
android_packages_apps_Trebuchet-32e4344a20c4f9c9323061aaef96678c098d6200.tar.bz2
android_packages_apps_Trebuchet-32e4344a20c4f9c9323061aaef96678c098d6200.zip
am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
* commit 'a2bc37722e9fa0af9d67986038aec58af5308771': Revert "Fix issue of extra blank screen after uninstall (issue 12372657)"
-rw-r--r--src/com/android/launcher3/AppsCustomizePagedView.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index 5c8828aaf..251ae2108 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -828,7 +828,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
}
});
} else {
- mLauncher.getWorkspace().removeExtraEmptyScreen(true, null);
mLauncher.unlockScreenOrientation(false);
}
}