From 1fff41fb3bd1a9039bf2f78528ba01333793f065 Mon Sep 17 00:00:00 2001 From: Fabian Kozynski Date: Wed, 16 Dec 2020 10:03:31 -0500 Subject: [PATCH] Fix NPE in user builds In user builds, we were not creating the menu item for the prototype but we were toggling it. Now just make it visible or not depending on the build. Test: manual Change-Id: I8ab6bf229b08c0819e4c1484fafa86a7c0019b9d --- .../android/systemui/qs/customize/QSCustomizer.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java index d7933d3225f26..73ab9b037385b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java @@ -77,11 +77,11 @@ public class QSCustomizer extends LinearLayout { toolbar.getMenu().add(Menu.NONE, MENU_RESET, 0, mContext.getString(com.android.internal.R.string.reset)); - if (Build.IS_ENG || Build.IS_USERDEBUG) { - // Prototype menu item - toolbar.getMenu().add(Menu.NONE, MENU_REMOVE_LABELS, Menu.NONE, "Remove labels") - .setCheckable(true); - } + // Prototype menu item + toolbar.getMenu() + .add(Menu.NONE, MENU_REMOVE_LABELS, Menu.NONE, "Remove labels") + .setCheckable(true) + .setVisible(Build.IS_ENG || Build.IS_USERDEBUG); toolbar.setTitle(R.string.qs_edit); mRecyclerView = findViewById(android.R.id.list); mTransparentView = findViewById(R.id.customizer_transparent_view);