From 5c3653f3e9f5589ac964ca2758d7ec7d29b2b61e Mon Sep 17 00:00:00 2001 From: martincz Date: Wed, 30 Sep 2015 00:39:51 +0800 Subject: Trebuchet: fix NPE when QuickSearchBox is missing Change-Id: I8eb1e02907d1e7f56d43dbff3b2fed1e0846d990 --- src/com/android/launcher3/DeviceProfile.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 2832ec77f..d65b4759a 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -811,11 +811,13 @@ public class DeviceProfile { // Layout the search bar View qsbBar = launcher.getQsbBar(); - qsbBar.setVisibility(searchBarVisible ? View.VISIBLE : View.GONE); - LayoutParams vglp = qsbBar.getLayoutParams(); - vglp.width = LayoutParams.MATCH_PARENT; - vglp.height = LayoutParams.MATCH_PARENT; - qsbBar.setLayoutParams(vglp); + if (qsbBar != null) { + qsbBar.setVisibility(searchBarVisible ? View.VISIBLE : View.GONE); + LayoutParams vglp = qsbBar.getLayoutParams(); + vglp.width = LayoutParams.MATCH_PARENT; + vglp.height = LayoutParams.MATCH_PARENT; + qsbBar.setLayoutParams(vglp); + } // Layout the workspace PagedView workspace = (PagedView) launcher.findViewById(R.id.workspace); -- cgit v1.2.3