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

Commit 0bac8bcb authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Animations for user switching." into jb-mr1-dev

parents 1679b368 9d9ece3c

core/java/android/view/IWindowManager.aidl

+3 −0
Original line number Diff line number Diff line
@@ -107,6 +107,9 @@ interface IWindowManager 
            IBinder freezeThisOneIfNeeded);

    void setNewConfiguration(in Configuration config);

    

    void startFreezingScreen(int exitAnim, int enterAnim);

    void stopFreezingScreen();



    // these require DISABLE_KEYGUARD permission

    void disableKeyguard(IBinder token, String tag);

    void reenableKeyguard(IBinder token);

core/java/android/view/animation/RotateAnimation.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.util.AttributeSet; 


/**

 * An animation that controls the rotation of an object. This rotation takes

 * place int the X-Y plane. You can specify the point to use for the center of

 * place in the X-Y plane. You can specify the point to use for the center of

 * the rotation, where (0,0) is the top left point. If not specified, (0,0) is

 * the default rotation point.

 *

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -1265,6 +1265,13 @@ 
        android:description="@string/permdesc_manageAppTokens"

        android:protectionLevel="signature" />



    <!-- @hide Allows the application to temporarily freeze the screen for a

         full-screen transition. -->

    <permission android:name="android.permission.FREEZE_SCREEN"

        android:label="@string/permlab_freezeScreen"

        android:description="@string/permdesc_freezeScreen"

        android:protectionLevel="signature" />

    

    <!-- Allows an application to inject user events (keys, touch, trackball)

         into the event stream and deliver them to ANY window.  Without this

         permission, you can only deliver events to windows in your own process.

core/res/res/anim/screen_user_enter.xml

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

<!--

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

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

            android:duration="500"

            android:interpolator="@interpolator/decelerate_quad" />

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

            android:duration="500"

            android:interpolator="@interpolator/decelerate_quad" />

</set>

core/res/res/anim/screen_user_exit.xml

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

<!--

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

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

            android:duration="500"

            android:interpolator="@interpolator/decelerate_quad" />

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

            android:duration="500"

            android:interpolator="@interpolator/decelerate_quad" />

</set>