Snap for 12056069 from 142a8e13e71e057c1a2a4c22042de1e137f71bc0 to 24Q4-release (dfda5daa) · Commits · e / os / android_frameworks_base

core/res/res/values-watch/colors.xml

deleted100644 → 0

+0 −43

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2014 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<!-- Watch specific system colors. -->
		<resources>
		<color name="system_error_light">#B3261E</color>
		<color name="system_on_error_light">#FFFFFF</color>
		<color name="system_error_container_light">#F7DCDA</color>
		<color name="system_on_error_container_light">#410E0B</color>

		<color name="system_error_dark">#F2B8B5</color>
		<color name="system_on_error_dark">#601410</color>
		<color name="system_error_container_dark">#FF8986</color>
		<color name="system_on_error_container_dark">#410E0B</color>

		<!-- With material deprecation of 'background' in favor of 'surface' we flatten these
		on watches to match the black background requirements -->
		<color name="system_surface_dark">#000000</color>
		<color name="system_surface_dim_dark">#000000</color>
		<color name="system_surface_bright_dark">#000000</color>

		<!-- Wear flattens the typical 5 container layers to 3; container + high & low -->
		<color name="system_surface_container_dark">#303030</color>
		<color name="system_surface_variant_dark">#303030</color>
		<color name="system_surface_container_high_dark">#474747</color>
		<color name="system_surface_container_highest_dark">#474747</color>
		<color name="system_surface_container_low_dark">#252626</color>
		<color name="system_surface_container_lowest_dark">#252626</color>

		</resources>

packages/SystemUI/aconfig/systemui.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -1051,6 +1051,16 @@ flag {
		}
		}

		flag {
		name: "glanceable_hub_back_gesture"
		namespace: "systemui"
		description: "Enables back gesture on the glanceable hub"
		bug: "346331399"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "glanceable_hub_allow_keyguard_when_dreaming"
		namespace: "systemui"

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt

+13 −4

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.platform.LocalDensity
		import androidx.compose.ui.unit.dp
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		import com.android.compose.animation.scene.Back
		import com.android.compose.animation.scene.CommunalSwipeDetector
		import com.android.compose.animation.scene.Edge
		import com.android.compose.animation.scene.ElementKey
		@@ -41,6 +42,7 @@ import com.android.compose.animation.scene.SwipeDirection
		import com.android.compose.animation.scene.observableTransitionState
		import com.android.compose.animation.scene.transitions
		import com.android.compose.theme.LocalAndroidColorScheme
		import com.android.systemui.Flags.glanceableHubBackGesture
		import com.android.systemui.communal.shared.model.CommunalBackgroundType
		import com.android.systemui.communal.shared.model.CommunalScenes
		import com.android.systemui.communal.shared.model.CommunalTransitionKeys
		@@ -193,10 +195,17 @@ fun CommunalContainer(
		Box(modifier = Modifier.fillMaxSize())
		}

		scene(
		CommunalScenes.Communal,
		userActions = mapOf(Swipe(SwipeDirection.Right) to CommunalScenes.Blank)
		) {
		val userActions =
		if (glanceableHubBackGesture()) {
		mapOf(
		Swipe(SwipeDirection.Right) to CommunalScenes.Blank,
		Back to CommunalScenes.Blank,
		)
		} else {
		mapOf(Swipe(SwipeDirection.Right) to CommunalScenes.Blank)
		}

		scene(CommunalScenes.Communal, userActions = userActions) {
		CommunalScene(
		backgroundType = backgroundType,
		colors = colors,

packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -126,6 +126,8 @@ public class QuickStepContract {
		public static final long SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED = 1L << 33;
		// PiP animation is running
		public static final long SYSUI_STATE_DISABLE_GESTURE_PIP_ANIMATING = 1L << 34;
		// Communal hub is showing
		public static final long SYSUI_STATE_COMMUNAL_HUB_SHOWING = 1L << 35;

		// Mask for SystemUiStateFlags to isolate SYSUI_STATE_AWAKE and
		// SYSUI_STATE_WAKEFULNESS_TRANSITION, to match WAKEFULNESS_* constants
		@@ -176,6 +178,7 @@ public class QuickStepContract {
		SYSUI_STATE_SHORTCUT_HELPER_SHOWING,
		SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED,
		SYSUI_STATE_DISABLE_GESTURE_PIP_ANIMATING,
		SYSUI_STATE_COMMUNAL_HUB_SHOWING,
		})
		public @interface SystemUiStateFlags {}

		@@ -283,6 +286,9 @@ public class QuickStepContract {
		if ((flags & SYSUI_STATE_DISABLE_GESTURE_PIP_ANIMATING) != 0) {
		str.add("disable_gesture_pip_animating");
		}
		if ((flags & SYSUI_STATE_COMMUNAL_HUB_SHOWING) != 0) {
		str.add("communal_hub_showing");
		}

		return str.toString();
		}
		@@ -336,7 +342,8 @@ public class QuickStepContract {
		// the keyguard)
		if ((sysuiStateFlags & SYSUI_STATE_BOUNCER_SHOWING) != 0
		\|\| (sysuiStateFlags & SYSUI_STATE_DIALOG_SHOWING) != 0
		\|\| (sysuiStateFlags & SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING) != 0) {
		\|\| (sysuiStateFlags & SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING) != 0
		\|\| (sysuiStateFlags & SYSUI_STATE_COMMUNAL_HUB_SHOWING) != 0) {
		return false;
		}
		if ((sysuiStateFlags & SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) != 0) {

packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -233,7 +233,7 @@ public class SystemActions implements CoreStartable, ConfigurationController.Con
		// NotificationShadeWindowController.registerCallback() only keeps weak references.
		mNotificationShadeCallback =
		(keyguardShowing, keyguardOccluded, keyguardGoingAway, bouncerShowing, mDozing,
		panelExpanded, isDreaming) ->
		panelExpanded, isDreaming, communalShowing) ->
		registerOrUnregisterDismissNotificationShadeAction();
		mScreenshotHelper = new ScreenshotHelper(mContext);
		}