Disable Performance Monitor until it can work with multiple windows (#…

…1662)
MozillaReality · Aug 27, 2019 · d9a5082 · d9a5082
1 parent c3e3439
commit d9a5082
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -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
@@ -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);