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

Commit 64b8d562 authored by Tony Mak's avatar Tony Mak
Browse files

Cross profile apps animation part 2 

Show and animate work/personal thumbnail during the transition.

Bug: 70799822

Test: Observe the animation in both normal mode / multi-window mode.
Test: go/wm-smoke

Change-Id: I9d5be689ce8dc9ce5c8197263d35514c68ab6f72
parent c131a929

core/res/res/anim/cross_profile_apps_thumbnail_enter.xml

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

<!--

/*

** Copyright 2018, 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.

*/

-->

<!-- This should be kept in sync with task_open_enter.xml -->

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

     android:shareInterpolator="false" android:zAdjustment="top">



    <alpha android:fromAlpha="0" android:toAlpha="1.0"

           android:startOffset="300"

           android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

           android:interpolator="@interpolator/decelerate_quart"

           android:duration="167"/>



    <translate android:fromYDelta="110%" android:toYDelta="0"

               android:startOffset="300"

               android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

               android:interpolator="@interpolator/decelerate_quint"

               android:duration="417"/>



    <!-- To keep the thumbnail around longer -->

    <alpha android:fromAlpha="1.0" android:toAlpha="0"

           android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

           android:interpolator="@interpolator/decelerate_quint"

           android:startOffset="717"

           android:duration="200"/>

</set>
 
 No newline at end of file

core/res/res/anim/task_open_enter.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
** limitations under the License.

*/

-->



<!-- This should in sync with task_open_enter_cross_profile_apps.xml -->

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

        android:shareInterpolator="false" android:zAdjustment="top">

core/res/res/anim/task_open_enter_cross_profile_apps.xml

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

<!--

/*

** Copyright 2018, 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.

*/

-->

<!-- This should in sync with task_open_enter.xml -->

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

     android:shareInterpolator="false" android:zAdjustment="top">



    <alpha android:fromAlpha="0" android:toAlpha="1.0"

           android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

           android:interpolator="@interpolator/decelerate_quart"

           android:startOffset="300"

           android:duration="167"/>



    <translate android:fromYDelta="110%" android:toYDelta="0"

               android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

               android:interpolator="@interpolator/decelerate_quint"

               android:startOffset="300"

               android:duration="417"/>



    <!-- To keep the transition around longer for the thumbnail, should be kept in sync with

         cross_profile_apps_thumbmail.xml -->

    <alpha android:fromAlpha="1.0" android:toAlpha="1.0"

           android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

           android:startOffset="717"

           android:duration="200"/>

</set>
 
 No newline at end of file

core/res/res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -631,4 +631,8 @@ 


    <!-- Default dialog corner radius -->

    <dimen name="dialog_corner_radius">2dp</dimen>



    <!-- Size of thumbnail used in the cross profile apps animation -->

    <dimen name="cross_profile_apps_thumbnail_size">72dp</dimen>



</resources>

core/res/res/values/symbols.xml

+5 −2
Original line number Diff line number Diff line
@@ -1578,8 +1578,10 @@ 
  <java-symbol type="anim" name="voice_activity_close_enter" />

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

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

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

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

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

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

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

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



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

  <java-symbol type="array" name="config_keyboardTapVibePattern" />
@@ -1726,6 +1728,7 @@ 
  <java-symbol type="style" name="Theme.ExpandedMenu" />

  <java-symbol type="string" name="forward_intent_to_owner" />

  <java-symbol type="string" name="forward_intent_to_work" />

  <java-symbol type="dimen" name="cross_profile_apps_thumbnail_size" />



  <!-- From services -->

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