Merge "Fix the activity enter / exit animation." into udc-dev (0209aeed) · Commits · e / os / android_frameworks_base

packages/CredentialManager/res/values/colors.xml

deleted100644 → 0

+0 −10

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<resources>
		<color name="purple_200">#FFBB86FC</color>
		<color name="purple_500">#FF6200EE</color>
		<color name="purple_700">#FF3700B3</color>
		<color name="teal_200">#FF03DAC5</color>
		<color name="teal_700">#FF018786</color>
		<color name="black">#FF000000</color>
		<color name="white">#FFFFFFFF</color>
		</resources>
		No newline at end of file

+15 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2023 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.
		-->
		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<!-- The name of this application. Credential Manager is a service that centralizes and provides
		access to a user's credentials used to sign in to various apps. [CHAR LIMIT=80] -->

+15 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2023 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.
		-->
		<resources>
		<style name="Theme.CredentialSelector" parent="@*android:style/ThemeOverlay.DeviceDefault.Accent.DayNight">
		<item name="android:windowContentOverlay">@null</item>

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.credentialmanager

		import android.app.Activity
		import android.content.Intent
		import android.credentials.ui.BaseDialogResult
		import android.credentials.ui.RequestInfo
		@@ -47,6 +48,8 @@ import com.android.credentialmanager.ui.theme.PlatformTheme
		class CredentialSelectorActivity : ComponentActivity() {
		override fun onCreate(savedInstanceState: Bundle?) {
		super.onCreate(savedInstanceState)
		overrideActivityTransition(Activity.OVERRIDE_TRANSITION_OPEN,
		0, 0)
		Log.d(Constants.LOG_TAG, "Creating new CredentialSelectorActivity")
		try {
		val (isCancellationRequest, shouldShowCancellationUi, _) =

+1 −1

Original line number	Diff line number	Diff line
		@@ -454,7 +454,7 @@ internal fun Scrim(
		if (color.isSpecified) {
		val alpha by animateFloatAsState(
		targetValue = if (visible) 1f else 0f,
		animationSpec = TweenSpec()
		animationSpec = TweenSpec(durationMillis = SwipeableDefaults.DefaultDurationMillis)
		)
		LocalConfiguration.current
		val resources = LocalContext.current.resources