From 2ad83b94d6d4c11af2e0ab5788b2df90a1c87020 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Tue, 9 May 2017 14:19:57 -0400 Subject: [PATCH] Disable parts of tuner from user builds They aren't quite there yet. Test: manual Change-Id: I5532fe4121ab85d3baed7569c66906b5219e33e9 Fixes: 37513325 --- .../com/android/systemui/tuner/TunerFragment.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java index e7bce708e48f3..df2be489b886c 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java @@ -19,9 +19,11 @@ import android.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.content.DialogInterface; +import android.os.Build; import android.os.Bundle; import android.provider.Settings; import android.support.v14.preference.PreferenceFragment; +import android.support.v7.preference.Preference; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -43,6 +45,11 @@ public class TunerFragment extends PreferenceFragment { public static final String SETTING_SEEN_TUNER_WARNING = "seen_tuner_warning"; private static final String WARNING_TAG = "tuner_warning"; + private static final String[] DEBUG_ONLY = new String[] { + "nav_bar", + "lockscreen", + "picture_in_picture", + }; private static final int MENU_REMOVE = Menu.FIRST + 1; @@ -68,6 +75,12 @@ public class TunerFragment extends PreferenceFragment { if (!alwaysOnAvailable()) { getPreferenceScreen().removePreference(findPreference(KEY_DOZE)); } + if (!Build.IS_DEBUGGABLE) { + for (int i = 0; i < DEBUG_ONLY.length; i++) { + Preference preference = findPreference(DEBUG_ONLY[i]); + if (preference != null) getPreferenceScreen().removePreference(preference); + } + } if (Settings.Secure.getInt(getContext().getContentResolver(), SETTING_SEEN_TUNER_WARNING, 0) == 0) {