Snap for 9392049 from 0a33f4234584cf06151232c3e4c50b7573bed211 to tm-qpr2-release (08ddef9b) · Commits · e / os / android_frameworks_base

core/java/android/app/Dialog.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -458,8 +458,7 @@ public class Dialog implements DialogInterface, Window.Callback,
		&& WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) {
		// Add onBackPressed as default back behavior.
		mDefaultBackCallback = this::onBackPressed;
		getOnBackInvokedDispatcher().registerOnBackInvokedCallback(
		OnBackInvokedDispatcher.PRIORITY_DEFAULT, mDefaultBackCallback);
		getOnBackInvokedDispatcher().registerSystemOnBackInvokedCallback(mDefaultBackCallback);
		mDefaultBackCallback = null;
		}
		}

+11 −7

Original line number	Diff line number	Diff line
		@@ -5514,6 +5514,9 @@ public class SettingsProvider extends ContentProvider {
		}
		if (currentVersion == 210) {
		final SettingsState secureSettings = getSecureSettingsLocked(userId);
		final Setting currentSetting = secureSettings.getSettingLocked(
		Secure.STATUS_BAR_SHOW_VIBRATE_ICON);
		if (currentSetting.isNull()) {
		final int defaultValueVibrateIconEnabled = getContext().getResources()
		.getInteger(R.integer.def_statusBarVibrateIconEnabled);
		secureSettings.insertSettingOverrideableByRestoreLocked(
		@@ -5521,6 +5524,7 @@ public class SettingsProvider extends ContentProvider {
		String.valueOf(defaultValueVibrateIconEnabled),
		null /* tag /, true / makeDefault */,
		SettingsState.SYSTEM_PACKAGE_NAME);
		}
		currentVersion = 211;
		}
		// vXXX: Add new settings above this point.

+8 −3

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ import android.view.WindowInsetsController.Appearance;
		import android.view.WindowInsetsController.Behavior;

		import androidx.annotation.NonNull;
		import androidx.annotation.VisibleForTesting;

		import com.android.internal.statusbar.LetterboxDetails;
		import com.android.internal.view.AppearanceRegion;
		@@ -125,7 +126,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
		private final DisplayManager mDisplayManager;
		private Context mWindowContext;
		private ScreenPinningNotify mScreenPinningNotify;
		private int mNavigationMode;
		private int mNavigationMode = -1;
		private final Consumer<Rect> mPipListener;

		/**
		@@ -217,8 +218,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
		parseCurrentSysuiState();
		mCommandQueue.addCallback(this);
		mOverviewProxyService.addCallback(this);
		mEdgeBackGestureHandler.onNavigationModeChanged(
		mNavigationModeController.addListener(this));
		onNavigationModeChanged(mNavigationModeController.addListener(this));
		mNavBarHelper.registerNavTaskStateUpdater(mNavbarTaskbarStateUpdater);
		mNavBarHelper.init();
		mEdgeBackGestureHandler.onNavBarAttached();
		@@ -492,6 +492,11 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
		!QuickStepContract.isGesturalMode(mNavigationMode));
		}

		@VisibleForTesting
		int getNavigationMode() {
		return mNavigationMode;
		}

		@Override
		public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {
		pw.println("TaskbarDelegate (displayId=" + mDisplayId + "):");

+10 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,9 @@ constructor(
		// Don't apply the filter to (non-promoted) group summaries
		// - summary will be pruned if necessary, depending on if children are filtered
		entry.parent?.summary == entry -> false
		// Check that the entry satisfies certain characteristics that would bypass the
		// filter
		shouldIgnoreUnseenCheck(entry) -> false
		else -> true
		}.also { hasFiltered -> hasFilteredAnyNotifs = hasFilteredAnyNotifs \|\| hasFiltered }

		@@ -134,6 +137,13 @@ constructor(
		keyguardNotificationVisibilityProvider.shouldHideNotification(entry)
		}

		private fun shouldIgnoreUnseenCheck(entry: NotificationEntry): Boolean =
		when {
		entry.isMediaNotification -> true
		entry.sbn.isOngoing -> true
		else -> false
		}

		// TODO(b/206118999): merge this class with SensitiveContentCoordinator which also depends on
		// these same updates
		private fun setupInvalidateNotifListCallbacks() {}

0 → 100644

+16 −0

Original line number	Diff line number	Diff line
		package com.android.systemui.statusbar.notification.fsi

		class FsiDebug {

		companion object {
		private const val debugTag = "FsiDebug"
		private const val debug = true

		fun log(s: Any) {
		if (!debug) {
		return
		}
		android.util.Log.d(debugTag, "$s")
		}
		}
		}
		No newline at end of file