Skip to content

Commit 0bac8bc

Browse files
Dianne HackbornAndroid (Google) Code Review
authored andcommitted
Merge "Animations for user switching." into jb-mr1-dev
2 parents 1679b36 + 9d9ece3 commit 0bac8bc

File tree

16 files changed

+2010
-1830
lines changed

16 files changed

+2010
-1830
lines changed

core/java/android/view/IWindowManager.aidl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ interface IWindowManager
107107
IBinder freezeThisOneIfNeeded);
108108
void setNewConfiguration(in Configuration config);
109109

110+
void startFreezingScreen(int exitAnim, int enterAnim);
111+
void stopFreezingScreen();
112+
110113
// these require DISABLE_KEYGUARD permission
111114
void disableKeyguard(IBinder token, String tag);
112115
void reenableKeyguard(IBinder token);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
/**
2424
* An animation that controls the rotation of an object. This rotation takes
25-
* place int the X-Y plane. You can specify the point to use for the center of
25+
* place in the X-Y plane. You can specify the point to use for the center of
2626
* the rotation, where (0,0) is the top left point. If not specified, (0,0) is
2727
* the default rotation point.
2828
*

core/res/AndroidManifest.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,6 +1265,13 @@
12651265
android:description="@string/permdesc_manageAppTokens"
12661266
android:protectionLevel="signature" />
12671267

1268+
<!-- @hide Allows the application to temporarily freeze the screen for a
1269+
full-screen transition. -->
1270+
<permission android:name="android.permission.FREEZE_SCREEN"
1271+
android:label="@string/permlab_freezeScreen"
1272+
android:description="@string/permdesc_freezeScreen"
1273+
android:protectionLevel="signature" />
1274+
12681275
<!-- Allows an application to inject user events (keys, touch, trackball)
12691276
into the event stream and deliver them to ANY window. Without this
12701277
permission, you can only deliver events to windows in your own process.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/* Copyright 20012, The Android Open Source Project
4+
**
5+
** Licensed under the Apache License, Version 2.0 (the "License");
6+
** you may not use this file except in compliance with the License.
7+
** You may obtain a copy of the License at
8+
**
9+
** http://www.apache.org/licenses/LICENSE-2.0
10+
**
11+
** Unless required by applicable law or agreed to in writing, software
12+
** distributed under the License is distributed on an "AS IS" BASIS,
13+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
** See the License for the specific language governing permissions and
15+
** limitations under the License.
16+
*/
17+
-->
18+
19+
<set xmlns:android="http://schemas.android.com/apk/res/android">
20+
<translate android:fromXDelta="100%p" android:toXDelta="0"
21+
android:duration="500"
22+
android:interpolator="@interpolator/decelerate_quad" />
23+
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
24+
android:duration="500"
25+
android:interpolator="@interpolator/decelerate_quad" />
26+
</set>
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/* Copyright 20012, The Android Open Source Project
4+
**
5+
** Licensed under the Apache License, Version 2.0 (the "License");
6+
** you may not use this file except in compliance with the License.
7+
** You may obtain a copy of the License at
8+
**
9+
** http://www.apache.org/licenses/LICENSE-2.0
10+
**
11+
** Unless required by applicable law or agreed to in writing, software
12+
** distributed under the License is distributed on an "AS IS" BASIS,
13+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
** See the License for the specific language governing permissions and
15+
** limitations under the License.
16+
*/
17+
-->
18+
19+
<set xmlns:android="http://schemas.android.com/apk/res/android">
20+
<translate android:fromXDelta="0" android:toXDelta="-100%p"
21+
android:duration="500"
22+
android:interpolator="@interpolator/decelerate_quad" />
23+
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
24+
android:duration="500"
25+
android:interpolator="@interpolator/decelerate_quad" />
26+
</set>
File renamed without changes.
File renamed without changes.
File renamed without changes.

core/res/res/values/public.xml

Lines changed: 1 addition & 1770 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)