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

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

Merge change 24020 into eclair 

* changes:
  Wallpapers: new transitions, hiding when not visible, other cleanup.
parents da214787 25994b43

api/current.xml

+51 −7
Original line number Diff line number Diff line
@@ -4699,7 +4699,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843416"

 value="16843420"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -6492,7 +6492,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843417"

 value="16843421"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -7526,7 +7526,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843415"

 value="16843419"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -8611,7 +8611,7 @@ 
 visibility="public"

>

</field>

<field name="wallpaperActivityCloseEnterAnimation"

<field name="wallpaperCloseEnterAnimation"

 type="int"

 transient="false"

 volatile="false"
@@ -8622,7 +8622,7 @@ 
 visibility="public"

>

</field>

<field name="wallpaperActivityCloseExitAnimation"

<field name="wallpaperCloseExitAnimation"

 type="int"

 transient="false"

 volatile="false"
@@ -8633,7 +8633,51 @@ 
 visibility="public"

>

</field>

<field name="wallpaperActivityOpenEnterAnimation"

<field name="wallpaperIntraCloseEnterAnimation"

 type="int"

 transient="false"

 volatile="false"

 value="16843417"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="wallpaperIntraCloseExitAnimation"

 type="int"

 transient="false"

 volatile="false"

 value="16843418"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="wallpaperIntraOpenEnterAnimation"

 type="int"

 transient="false"

 volatile="false"

 value="16843415"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="wallpaperIntraOpenExitAnimation"

 type="int"

 transient="false"

 volatile="false"

 value="16843416"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="wallpaperOpenEnterAnimation"

 type="int"

 transient="false"

 volatile="false"
@@ -8644,7 +8688,7 @@ 
 visibility="public"

>

</field>

<field name="wallpaperActivityOpenExitAnimation"

<field name="wallpaperOpenExitAnimation"

 type="int"

 transient="false"

 volatile="false"

core/java/android/view/WindowManagerPolicy.java

+8 −2
Original line number Diff line number Diff line
@@ -344,12 +344,18 @@ public interface WindowManagerPolicy { 
    public final int TRANSIT_TASK_TO_FRONT = 10;

    /** A window in an existing task is being put below all other tasks. */

    public final int TRANSIT_TASK_TO_BACK = 11;

    /** A window in a new activity that doesn't have a wallpaper is being

     * opened on top of one that does, effectively closing the wallpaper. */

    public final int TRANSIT_WALLPAPER_CLOSE = 12;

    /** A window in a new activity that does have a wallpaper is being

     * opened on one that didn't, effectively opening the wallpaper. */

    public final int TRANSIT_WALLPAPER_OPEN = 13;

    /** A window in a new activity is being opened on top of an existing one,

     * and both are on top of the wallpaper. */

    public final int TRANSIT_WALLPAPER_ACTIVITY_OPEN = 12;

    public final int TRANSIT_WALLPAPER_INTRA_OPEN = 14;

    /** The window in the top-most activity is being closed to reveal the

     * previous activity, and both are on top of he wallpaper. */

    public final int TRANSIT_WALLPAPER_ACTIVITY_CLOSE = 13;

    public final int TRANSIT_WALLPAPER_INTRA_CLOSE = 15;

    

    /** Screen turned off because of power button */

    public final int OFF_BECAUSE_OF_USER = 1;

core/res/res/anim/accelerate_decelerate_interpolator.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
*/

-->



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

core/res/res/anim/accelerate_interpolator.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
*/

-->



<accelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android" factor="1" />
 
<accelerateInterpolator />

core/res/res/anim/anticipate_interpolator.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
*/

-->



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