From d9a50822c5401a5b8ffcc13ec78b3da8e4d41d4a Mon Sep 17 00:00:00 2001 From: "Randall E. Barker" Date: Mon, 26 Aug 2019 23:44:47 -0700 Subject: [PATCH] Disable Performance Monitor until it can work with multiple windows (#1662) --- .../shared/org/mozilla/vrbrowser/browser/SettingsStore.java | 3 ++- .../vrbrowser/ui/widgets/settings/DeveloperOptionsView.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java index 9a132be78..28af9e130 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java @@ -199,7 +199,8 @@ public void setMultiprocessEnabled(boolean isEnabled) { } public boolean isPerformanceMonitorEnabled() { - return mPrefs.getBoolean(mContext.getString(R.string.settings_key_performance_monitor), PERFORMANCE_MONITOR_DEFAULT); + // Disabling Performance Monitor until it can properly handle multi-window + return false; // mPrefs.getBoolean(mContext.getString(R.string.settings_key_performance_monitor), PERFORMANCE_MONITOR_DEFAULT); } public void setPerformanceMonitorEnabled(boolean isEnabled) { diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DeveloperOptionsView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DeveloperOptionsView.java index b656aef12..b3dd45a84 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DeveloperOptionsView.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DeveloperOptionsView.java @@ -56,6 +56,8 @@ private void initialize(Context aContext) { mBinding.performanceMonitorSwitch.setOnCheckedChangeListener(mPerformanceListener); setPerformance(SettingsStore.getInstance(getContext()).isPerformanceMonitorEnabled(), false); + // Hide Performance Monitor switch until it can handle multiple windows. + mBinding.performanceMonitorSwitch.setVisibility(View.GONE); if (BuildConfig.DEBUG) { mBinding.debugLoggingSwitch.setVisibility(View.GONE);