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

Commit 6aa73cf2 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Tweaking animation XMLs and removing dead code. (Bug 17672056, Bug... 

Merge "Tweaking animation XMLs and removing dead code. (Bug 17672056, Bug 18415217)" into lmp-mr1-dev
parents f95a9fe5 c041d883

packages/SystemUI/res/anim/recents_from_app_enter.xml

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

*/

-->



<!-- Recents Activity -->

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

     android:shareInterpolator="false"

     android:zAdjustment="top">

packages/SystemUI/res/anim/recents_from_app_exit.xml

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

*/

-->



<!-- Incoming Activity -->

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

     android:shareInterpolator="false"

     android:zAdjustment="normal">

packages/SystemUI/res/anim/recents_from_search_launcher_enter.xml

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

*/

-->



<!-- Recents Activity -->

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

     android:shareInterpolator="false"

     android:zAdjustment="normal">

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

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

         android:fillEnabled="true"

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

         android:interpolator="@android:interpolator/linear"

         android:duration="50"/>

         android:duration="1"/>

</set>

packages/SystemUI/res/anim/recents_from_search_launcher_exit.xml

+2 −3
Original line number Diff line number Diff line
@@ -16,14 +16,13 @@ 
** limitations under the License.

*/

-->



<!-- Launcher Activity -->

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

     android:shareInterpolator="false"

     android:zAdjustment="top">

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

  		 android:startOffset="50"

         android:fillEnabled="true"

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

         android:interpolator="@android:interpolator/linear_out_slow_in"

         android:duration="100"/>

         android:duration="@integer/recents_enter_from_home_transition_duration"/>

</set>

packages/SystemUI/res/anim/recents_to_search_launcher_enter.xml

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

*/

-->



<!-- Launcher Activity -->

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

     android:shareInterpolator="false"

     android:zAdjustment="normal">