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

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

Merge changes If0dfada2,Ice6a508b,Icf082399,I4db9cd1b,I88bd0f79 

* changes:
  Fixing issue with history icons getting clobbered.
  Fallback 1 for Recents timeout behaviour
  Drawing thumbnail background color for empty space in view.
  Fixing issue with task animating from 0,0.
  Minor tweak to enter/exit animation for the home activity.
parents 9884eaad d7eb1ef7

packages/SystemUI/res/anim/recents_from_app_enter.xml

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

<!--

/*

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

*/

-->

<!-- Recents Activity -->

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

     android:shareInterpolator="false"

     android:zAdjustment="top">

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

         android:fillEnabled="true"

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

         android:interpolator="@android:interpolator/fast_out_slow_in"

         android:duration="0"/>

</set>

packages/SystemUI/res/anim/recents_from_app_exit.xml

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

<!--

/*

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

*/

-->

<!-- Incoming Activity -->

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

     android:shareInterpolator="false"

     android:zAdjustment="normal">



    <!-- Animate the view out only after recents is visible -->

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

           android:fillEnabled="true"

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

           android:interpolator="@android:interpolator/fast_out_slow_in"

           android:duration="1"/>

</set>

packages/SystemUI/res/anim/recents_from_launcher_enter.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,6 +23,6 @@ 
  <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

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

         android:fillEnabled="true"

         android:fillEnabled="true"

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

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

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

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

         android:duration="150"/>

         android:duration="150"/>

</set>
 
</set>

packages/SystemUI/res/anim/recents_from_launcher_exit.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -23,6 +23,6 @@ 
  <alpha android:fromAlpha="1.0" android:toAlpha="0.0"

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

         android:fillEnabled="true"

         android:fillEnabled="true"

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

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

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

         android:interpolator="@interpolator/recents_from_launcher_exit_interpolator"

         android:duration="150"/>

         android:duration="133"/>

</set>
 
</set>

packages/SystemUI/res/anim/recents_from_search_launcher_exit.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -23,6 +23,6 @@ 
  <alpha android:fromAlpha="1.0" android:toAlpha="0.0"

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

         android:fillEnabled="true"

         android:fillEnabled="true"

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

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

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

         android:interpolator="@interpolator/recents_from_launcher_exit_interpolator"

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

         android:duration="133"/>

</set>
 
</set>