Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5f984c3 authored by Helen Qin's avatar Helen Qin Committed by Automerger Merge Worker
Browse files

Merge "Fix the activity enter / exit animation." into udc-dev am: 0209aeed 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22778356



Change-Id: I3b9c87235101f0cfc8fc42e71fdeaa79f6797ffe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c9d5f48 0209aeed

packages/CredentialManager/res/values/colors.xml

deleted100644 → 0
+0 −10
Original line number Original line 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

packages/CredentialManager/res/values/strings.xml

+15 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?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">

<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

  <!-- 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] -->

  access to a user's credentials used to sign in to various apps. [CHAR LIMIT=80] -->

packages/CredentialManager/res/values/themes.xml

+15 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?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>

<resources>

  <style name="Theme.CredentialSelector" parent="@*android:style/ThemeOverlay.DeviceDefault.Accent.DayNight">

  <style name="Theme.CredentialSelector" parent="@*android:style/ThemeOverlay.DeviceDefault.Accent.DayNight">

    <item name="android:windowContentOverlay">@null</item>

    <item name="android:windowContentOverlay">@null</item>

packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorActivity.kt

+3 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package com.android.credentialmanager

package com.android.credentialmanager





import android.app.Activity

import android.content.Intent

import android.content.Intent

import android.credentials.ui.BaseDialogResult

import android.credentials.ui.BaseDialogResult

import android.credentials.ui.RequestInfo

import android.credentials.ui.RequestInfo
@@ -47,6 +48,8 @@ import com.android.credentialmanager.ui.theme.PlatformTheme 
class CredentialSelectorActivity : ComponentActivity() {

class CredentialSelectorActivity : ComponentActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {

    override fun onCreate(savedInstanceState: Bundle?) {

        super.onCreate(savedInstanceState)

        super.onCreate(savedInstanceState)

        overrideActivityTransition(Activity.OVERRIDE_TRANSITION_OPEN,

            0, 0)

        Log.d(Constants.LOG_TAG, "Creating new CredentialSelectorActivity")

        Log.d(Constants.LOG_TAG, "Creating new CredentialSelectorActivity")

        try {

        try {

            val (isCancellationRequest, shouldShowCancellationUi, _) =

            val (isCancellationRequest, shouldShowCancellationUi, _) =

packages/CredentialManager/src/com/android/credentialmanager/common/material/ModalBottomSheet.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -454,7 +454,7 @@ internal fun Scrim( 
    if (color.isSpecified) {

    if (color.isSpecified) {

        val alpha by animateFloatAsState(

        val alpha by animateFloatAsState(

            targetValue = if (visible) 1f else 0f,

            targetValue = if (visible) 1f else 0f,

            animationSpec = TweenSpec()

            animationSpec = TweenSpec(durationMillis = SwipeableDefaults.DefaultDurationMillis)

        )

        )

        LocalConfiguration.current

        LocalConfiguration.current

        val resources = LocalContext.current.resources

        val resources = LocalContext.current.resources