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

Commit 8add88aa authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Update TaskFragment animation to exclude scrim" into sc-v2-dev am: 4d94c48a am: 9050566c 

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

Change-Id: Ibbe13ad62ec4a78babfcbe915b76c3add60f329c
parents 61ed5385 9050566c

core/res/res/anim/task_fragment_close_enter.xml

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

<!--

  Copyright (C) 2021 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.

   -->



<set xmlns:android="http://schemas.android.com/apk/res/android"

    android:shareInterpolator="false">

    <scale

        android:fromXScale="1.1"

        android:toXScale="1"

        android:fromYScale="1.1"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="400"/>

</set>
 
 No newline at end of file

core/res/res/anim/task_fragment_close_exit.xml

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

<!--

  Copyright (C) 2021 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.

   -->



<set xmlns:android="http://schemas.android.com/apk/res/android"

    android:shareInterpolator="false"

    android:zAdjustment="top">

    <alpha

        android:fromAlpha="1"

        android:toAlpha="0.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="33"

        android:duration="50"/>

    <scale

        android:fromXScale="1"

        android:toXScale="0.9"

        android:fromYScale="1"

        android:toYScale="0.9"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="400"/>

</set>

core/res/res/anim/task_fragment_open_enter.xml

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

<!--

  Copyright (C) 2021 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.

   -->



<set xmlns:android="http://schemas.android.com/apk/res/android"

    android:shareInterpolator="false">

    <alpha

        android:fromAlpha="0"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="50"

        android:duration="50"/>

    <scale

        android:fromXScale="0.85"

        android:toXScale="1"

        android:fromYScale="0.85"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="400"/>

</set>

core/res/res/anim/task_fragment_open_exit.xml

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

<!--

  Copyright (C) 2021 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.

   -->



<set xmlns:android="http://schemas.android.com/apk/res/android"

    android:shareInterpolator="false">

    <scale

        android:fromXScale="1"

        android:toXScale="1.05"

        android:fromYScale="1"

        android:toYScale="1.05"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="400"/>

</set>
 
 No newline at end of file

core/res/res/values/symbols.xml

+4 −0
Original line number Diff line number Diff line
@@ -1701,6 +1701,10 @@ 
  <java-symbol type="anim" name="activity_translucent_close_exit" />

  <java-symbol type="anim" name="activity_open_enter" />

  <java-symbol type="anim" name="activity_close_exit" />

  <java-symbol type="anim" name="task_fragment_close_enter" />

  <java-symbol type="anim" name="task_fragment_close_exit" />

  <java-symbol type="anim" name="task_fragment_open_enter" />

  <java-symbol type="anim" name="task_fragment_open_exit" />



  <java-symbol type="array" name="config_autoRotationTiltTolerance" />

  <java-symbol type="array" name="config_longPressVibePattern" />