Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Disable Performance Monitor until it can work with multiple windows #1662

Merged
MortimerGoro merged 1 commit into from
Aug 27, 2019
Merged

Disable Performance Monitor until it can work with multiple windows #1662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DeveloperOptionsView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down