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

Commit 88c1e8c3 authored by Winson Chung's avatar Winson Chung Committed by Android Git Automerger
Browse files

am 13b2497b: am 5c4be30a: am 6aa73cf2: Merge "Tweaking animation XMLs and... 

am 13b2497b: am 5c4be30a: am 6aa73cf2: Merge "Tweaking animation XMLs and removing dead code. (Bug 17672056, Bug 18415217)" into lmp-mr1-dev

* commit '13b2497b':
  Tweaking animation XMLs and removing dead code. (Bug 17672056, Bug 18415217)
parents da61f371 13b2497b

packages/SystemUI/res/anim/recents_from_app_enter.xml

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

** limitations under the License.

*/

*/

-->

-->



<!-- Recents Activity -->

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

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

     android:shareInterpolator="false"

     android:shareInterpolator="false"

     android:zAdjustment="top">

     android:zAdjustment="top">

packages/SystemUI/res/anim/recents_from_app_exit.xml

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

** limitations under the License.

*/

*/

-->

-->



<!-- Incoming Activity -->

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

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

     android:shareInterpolator="false"

     android:shareInterpolator="false"

     android:zAdjustment="normal">

     android:zAdjustment="normal">

packages/SystemUI/res/anim/recents_from_search_launcher_enter.xml

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

** limitations under the License.

*/

*/

-->

-->



<!-- Recents Activity -->

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

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

     android:shareInterpolator="false"

     android:shareInterpolator="false"

     android:zAdjustment="normal">

     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:fillEnabled="true"

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

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

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

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

         android:duration="50"/>

         android:duration="1"/>

</set>
 
</set>

packages/SystemUI/res/anim/recents_from_search_launcher_exit.xml

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

** limitations under the License.

*/

*/

-->

-->



<!-- Launcher Activity -->

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

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

     android:shareInterpolator="false"

     android:shareInterpolator="false"

     android:zAdjustment="top">

     android:zAdjustment="top">

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

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

  		 android:startOffset="50"

         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="@android:interpolator/linear_out_slow_in"

         android:duration="100"/>

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

</set>
 
</set>

packages/SystemUI/res/anim/recents_to_search_launcher_enter.xml

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

** limitations under the License.

*/

*/

-->

-->



<!-- Launcher Activity -->

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

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

     android:shareInterpolator="false"

     android:shareInterpolator="false"

     android:zAdjustment="normal">

     android:zAdjustment="normal">