Merge "Fix a couple leaks in SystemUI" (1c7f6f5d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -257,10 +257,6 @@ public class QuickStatusBarHeader extends RelativeLayout implements
		mNextAlarmTextView.setSelected(true);

		mPermissionsHubEnabled = PrivacyItemControllerKt.isPermissionsHubEnabled();
		// Change the ignored slots when DeviceConfig flag changes
		DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_PRIVACY,
		mContext.getMainExecutor(), mPropertiesListener);

		}

		private List<String> getIgnoredIconSlots() {
		@@ -489,6 +485,9 @@ public class QuickStatusBarHeader extends RelativeLayout implements
		super.onAttachedToWindow();
		mStatusBarIconController.addIconGroup(mIconManager);
		requestApplyInsets();
		// Change the ignored slots when DeviceConfig flag changes
		DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_PRIVACY,
		mContext.getMainExecutor(), mPropertiesListener);
		}

		@Override
		@@ -527,6 +526,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements
		public void onDetachedFromWindow() {
		setListening(false);
		mStatusBarIconController.removeIconGroup(mIconManager);
		DeviceConfig.removeOnPropertiesChangedListener(mPropertiesListener);
		super.onDetachedFromWindow();
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -829,7 +829,11 @@ public class NavigationBarView extends FrameLayout implements
		mRecentsOnboarding.onNavigationModeChanged(mNavBarMode);
		getRotateSuggestionButton().onNavigationModeChanged(mNavBarMode);

		if (isGesturalMode(mNavBarMode)) {
		mRegionSamplingHelper.start(mSamplingBounds);
		} else {
		mRegionSamplingHelper.stop();
		}
		}

		public void setAccessibilityButtonState(final boolean visible, final boolean longClickable) {