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

Commit f15005ee authored by Michael Jurka's avatar Michael Jurka Committed by Android (Google) Code Review
Browse files

Merge "Use black bg in recents if using live wallpaper" into jb-mr1-dev

parents d4805af6 071316e5

packages/SystemUI/res/anim/recents_launch_from_launcher_enter.xml

0 → 100644
+36 −0
Original line number 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.

*/

-->



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

     android:detachWallpaper="true"

     android:shareInterpolator="false"

     android:zAdjustment="normal">

  <!--scale android:fromXScale="2.0" android:toXScale="1.0"

         android:fromYScale="2.0" android:toYScale="1.0"

         android:interpolator="@android:interpolator/decelerate_cubic"

         android:fillEnabled="true"

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

         android:pivotX="50%p" android:pivotY="50%p"

         android:duration="250" /-->

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

         android:fillEnabled="true"

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

         android:interpolator="@android:interpolator/decelerate_cubic"

         android:duration="250"/>

</set>

packages/SystemUI/res/anim/recent_app_enter.xml→packages/SystemUI/res/anim/recents_launch_from_launcher_exit.xml

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

<!--

/*

** Copyright 2009, The Android Open Source Project

** 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.
@@ -17,14 +17,12 @@ 
*/

-->



<!-- Special window zoom animation: this is the element that enters the screen,

     it starts at 200% and scales down.  Goes with zoom_exit.xml. -->

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

        android:interpolator="@android:anim/decelerate_interpolator">

    <scale android:fromXScale="0.25" android:toXScale="1.0"

           android:fromYScale="0.25" android:toYScale="1.0"

           android:pivotX="0%p" android:pivotY="0%p"

           android:duration="500" />

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

            android:duration="500"/>

     android:shareInterpolator="false"

     android:zAdjustment="normal">

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

         android:fillEnabled="true"

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

         android:interpolator="@android:interpolator/decelerate_cubic"

         android:duration="250"/>

</set>

packages/SystemUI/res/anim/recent_app_leave.xml→packages/SystemUI/res/anim/recents_return_to_launcher_enter.xml

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

<!--

/*

** Copyright 2009, The Android Open Source Project

** 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.
@@ -17,14 +17,10 @@ 
*/

-->



<!-- Special window zoom animation: this is the element that enters the screen,

     it starts at 200% and scales down.  Goes with zoom_exit.xml. -->

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

        android:interpolator="@android:anim/decelerate_interpolator">

    <scale android:fromXScale="1.0" android:toXScale="0.25"

           android:fromYScale="1.0" android:toYScale="0.25"

           android:pivotX="0%p" android:pivotY="0%p"

           android:duration="500" />

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

            android:duration="500"/>

     android:shareInterpolator="false"

     android:zAdjustment="normal">

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

         android:interpolator="@android:interpolator/decelerate_cubic"

         android:duration="250"/>

</set>

packages/SystemUI/res/anim/recents_return_to_launcher_exit.xml

0 → 100644
+31 −0
Original line number 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.

*/

-->



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

     android:shareInterpolator="false"

     android:zAdjustment="normal">

  <!--scale android:fromXScale="1.0" android:toXScale="2.0"

         android:fromYScale="1.0" android:toYScale="2.0"

         android:interpolator="@android:interpolator/decelerate_cubic"

         android:pivotX="50%p" android:pivotY="50%p"

         android:duration="250" /-->

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

         android:interpolator="@android:interpolator/decelerate_cubic"

         android:duration="250"/>

</set>

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
    <dimen name="status_bar_recents_item_padding">0dip</dimen>

    <!-- When recents first appears, how far the icon and label of the primary activity

         travel -->

    <dimen name="status_bar_recents_app_icon_translate_distance">100dp</dimen>

    <dimen name="status_bar_recents_app_icon_translate_distance">35dip</dimen>



    <!-- Where to place the app icon over the thumbnail -->

    <dimen name="status_bar_recents_app_icon_left_margin">0dp</dimen>