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

Commit 98a9d206 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Add different animation for transitions with translucent apps 

None of the existing animation really work with transitions in
which a translucent app is appearing/disappearing. Add a separate
animation for that and change all existing transitions to these
new transition types in case we detect that only translucent
activities are appearing/disappearing.

Test: Sharesheet animations
Test: go/wm-smoke
Change-Id: Iffe57b7664dddf647d723c91d115ade60c12ad33
Fixes: 37953606
Fixes: 70730519
Fixes: 72649981
Fixes: 72686618
parent be418293

core/java/android/view/WindowManager.java

+15 −1
Original line number Diff line number Diff line
@@ -235,6 +235,18 @@ public interface WindowManager extends ViewManager { 
     */

    int TRANSIT_KEYGUARD_UNOCCLUDE = 23;



    /**

     * A translucent activity is being opened.

     * @hide

     */

    int TRANSIT_TRANSLUCENT_ACTIVITY_OPEN = 24;



    /**

     * A translucent activity is being closed.

     * @hide

     */

    int TRANSIT_TRANSLUCENT_ACTIVITY_CLOSE = 25;



    /**

     * @hide

     */
@@ -258,7 +270,9 @@ public interface WindowManager extends ViewManager { 
            TRANSIT_KEYGUARD_GOING_AWAY,

            TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER,

            TRANSIT_KEYGUARD_OCCLUDE,

            TRANSIT_KEYGUARD_UNOCCLUDE

            TRANSIT_KEYGUARD_UNOCCLUDE,

            TRANSIT_TRANSLUCENT_ACTIVITY_OPEN,

            TRANSIT_TRANSLUCENT_ACTIVITY_CLOSE

    })

    @Retention(RetentionPolicy.SOURCE)

    @interface TransitionType {}

core/proto/android/server/windowmanagerservice.proto

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ message AppTransitionProto { 
    TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER = 21;

    TRANSIT_KEYGUARD_OCCLUDE = 22;

    TRANSIT_KEYGUARD_UNOCCLUDE = 23;

    TRANSIT_TRANSLUCENT_ACTIVITY_OPEN = 24;

    TRANSIT_TRANSLUCENT_ACTIVITY_CLOSE = 25;

  }

  optional TransitionType last_used_app_transition = 2;

}

core/res/res/anim/activity_translucent_close_exit.xml

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

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

  -->



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

    android:shareInterpolator="false"

    android:zAdjustment="top">

    <translate

        android:fromYDelta="0%"

        android:toYDelta="100%"

        android:interpolator="@interpolator/fast_out_linear_in"

        android:duration="300"/>

</set>

core/res/res/anim/activity_translucent_open_enter.xml

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

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

  -->



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

    android:shareInterpolator="false">

    <translate

        android:fromYDelta="100%"

        android:toYDelta="0"

        android:interpolator="@interpolator/linear_out_slow_in"

        android:duration="300"/>

</set>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -1611,6 +1611,8 @@ 
  <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="anim" name="activity_translucent_open_enter" />

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



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

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