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

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

Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev

parents 80343f64 738cfc91

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -108,7 +108,7 @@ 




        <activity android:name=".recent.RecentsActivity"

        <activity android:name=".recent.RecentsActivity"

                android:label="@string/accessibility_desc_recent_apps"

                android:label="@string/accessibility_desc_recent_apps"

                android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar"

                android:theme="@style/RecentsStyle"

                android:excludeFromRecents="true"

                android:excludeFromRecents="true"

                android:launchMode="singleInstance"

                android:launchMode="singleInstance"

                android:exported="true">

                android:exported="true">

packages/SystemUI/res/anim/recents_launch_from_launcher_enter.xml

+0 −6
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 
-->

-->





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

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

     android:detachWallpaper="true"

     android:shareInterpolator="false"

     android:shareInterpolator="false"

     android:zAdjustment="normal">

     android:zAdjustment="normal">

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

  <!--scale android:fromXScale="2.0" android:toXScale="1.0"
@@ -28,9 +27,4 @@ 
         android:fillBefore="true" android:fillAfter="true"

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

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

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

         android:duration="250" /-->

         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>
 
</set>

packages/SystemUI/res/anim/recents_launch_from_launcher_exit.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 




<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="top">

  <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"

packages/SystemUI/res/anim/wallpaper_recents_launch_from_launcher_enter.xml

0 → 100644
+35 −0
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.

*/

-->



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

     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/wallpaper_recents_launch_from_launcher_exit.xml

0 → 100644
+28 −0
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.

*/

-->



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

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

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

         android:duration="250"/>

</set>