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

Commit ffda371c authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 25734 into eclair 

* changes:
  Show the live wallpaper on the lock screen.
parents a120d482 6136b7ef

core/java/android/view/WindowManagerPolicy.java

+6 −0
Original line number Diff line number Diff line
@@ -435,6 +435,12 @@ public interface WindowManagerPolicy { 
     */

    public int subWindowTypeToLayerLw(int type);



    /**

     * Get the highest layer (actually one more than) that the wallpaper is

     * allowed to be in.

     */

    public int getMaxWallpaperLayer();

    

    /**

     * Called when the system would like to show a UI to indicate that an

     * application is starting.  You can use this to add a

core/res/res/anim/dialog_enter.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        android:interpolator="@anim/decelerate_interpolator">

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

           android:fromYScale="0.9" android:toYScale="1.0"

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

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

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

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

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

core/res/res/anim/dialog_exit.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        android:interpolator="@anim/accelerate_interpolator">

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

           android:fromYScale="1.0" android:toYScale="0.9"

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

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

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

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

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

core/res/res/anim/recent_enter.xml

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

<!--

/*

** Copyright 2009, 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:interpolator="@anim/decelerate_interpolator">

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

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

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

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

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

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

</set>

core/res/res/anim/recent_exit.xml

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

<!--

/*

** Copyright 2009, 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:interpolator="@anim/decelerate_interpolator"

        android:zAdjustment="top">

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

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

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

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

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

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

</set>