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

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

Merge change 22003 into eclair 

* changes:
  Add wallpaper transition animations.
parents 34484ae7 f8fbdb6b

api/current.xml

+55 −0
Original line number Diff line number Diff line
@@ -8567,6 +8567,50 @@ 
 visibility="public"

>

</field>

<field name="wallpaperActivityCloseEnterAnimation"

 type="int"

 transient="false"

 volatile="false"

 value="16843412"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="wallpaperActivityCloseExitAnimation"

 type="int"

 transient="false"

 volatile="false"

 value="16843413"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="wallpaperActivityOpenEnterAnimation"

 type="int"

 transient="false"

 volatile="false"

 value="16843410"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="wallpaperActivityOpenExitAnimation"

 type="int"

 transient="false"

 volatile="false"

 value="16843411"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="webViewStyle"

 type="int"

 transient="false"
@@ -12087,6 +12131,17 @@ 
 visibility="public"

>

</field>

<field name="Animation_InputMethod"

 type="int"

 transient="false"

 volatile="false"

 value="16973910"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Animation_Toast"

 type="int"

 transient="false"

core/java/android/view/WindowManagerPolicy.java

+6 −0
Original line number Diff line number Diff line
@@ -344,6 +344,12 @@ 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 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;

    /** 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;

    

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

    public final int OFF_BECAUSE_OF_USER = 1;

core/res/res/anim/wallpaper_activity_close_enter.xml

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

<!--

/* //device/apps/common/res/anim/options_panel_exit.xml

**

** Copyright 2007, 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="2.0" android:toXScale="1.0"

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

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

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

	<translate android:fromXDelta="-150%" android:toXDelta="0"

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

</set>

core/res/res/anim/wallpaper_activity_close_exit.xml

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

<!--

/* //device/apps/common/res/anim/options_panel_exit.xml

**

** Copyright 2007, 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/accelerate_interpolator">

    <scale android:fromXScale="1.0" android:toXScale=".5"

           android:fromYScale="1.0" android:toYScale=".5"

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

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

	<translate android:fromXDelta="0%" android:toXDelta="100%"

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

</set>

core/res/res/anim/wallpaper_activity_open_enter.xml

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

<!--

/* //device/apps/common/res/anim/options_panel_exit.xml

**

** Copyright 2007, 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=".5" android:toXScale="1.0"

           android:fromYScale=".5" android:toYScale="1.0"

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

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

    <translate android:fromXDelta="100%" android:toXDelta="0"

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

</set>