diff options
| -rw-r--r-- | api/current.txt | 7 | ||||
| -rw-r--r-- | core/res/res/transition/explode.xml | 16 | ||||
| -rw-r--r-- | core/res/res/transition/slide_bottom.xml | 16 | ||||
| -rw-r--r-- | core/res/res/transition/slide_left.xml | 16 | ||||
| -rw-r--r-- | core/res/res/transition/slide_right.xml | 16 | ||||
| -rw-r--r-- | core/res/res/transition/slide_top.xml | 16 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 21 |
7 files changed, 108 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index f6ccc67..1638388 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2522,7 +2522,14 @@ package android { public static final class R.transition { ctor public R.transition(); + field public static final int explode = 17760259; // 0x10f0003 + field public static final int fade = 17760258; // 0x10f0002 + field public static final int move = 17760257; // 0x10f0001 field public static final int no_transition = 17760256; // 0x10f0000 + field public static final int slide_bottom = 17760260; // 0x10f0004 + field public static final int slide_left = 17760263; // 0x10f0007 + field public static final int slide_right = 17760262; // 0x10f0006 + field public static final int slide_top = 17760261; // 0x10f0005 } public static final class R.xml { diff --git a/core/res/res/transition/explode.xml b/core/res/res/transition/explode.xml new file mode 100644 index 0000000..fe22284 --- /dev/null +++ b/core/res/res/transition/explode.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> +<explode xmlns:android="http://schemas.android.com/apk/res/android"/> diff --git a/core/res/res/transition/slide_bottom.xml b/core/res/res/transition/slide_bottom.xml new file mode 100644 index 0000000..46dc0d6 --- /dev/null +++ b/core/res/res/transition/slide_bottom.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> +<slide xmlns:android="http://schemas.android.com/apk/res/android" android:slideEdge="bottom"/> diff --git a/core/res/res/transition/slide_left.xml b/core/res/res/transition/slide_left.xml new file mode 100644 index 0000000..997bd97 --- /dev/null +++ b/core/res/res/transition/slide_left.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> +<slide xmlns:android="http://schemas.android.com/apk/res/android" android:slideEdge="left"/> diff --git a/core/res/res/transition/slide_right.xml b/core/res/res/transition/slide_right.xml new file mode 100644 index 0000000..98f8f6a --- /dev/null +++ b/core/res/res/transition/slide_right.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> +<slide xmlns:android="http://schemas.android.com/apk/res/android" android:slideEdge="right"/> diff --git a/core/res/res/transition/slide_top.xml b/core/res/res/transition/slide_top.xml new file mode 100644 index 0000000..07ab945 --- /dev/null +++ b/core/res/res/transition/slide_top.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> +<slide xmlns:android="http://schemas.android.com/apk/res/android" android:slideEdge="top"/> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index f6ad78b..7703bfa 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2458,5 +2458,26 @@ <!-- An interpolator which accelerates fast and keeps accelerating until the end. --> <public type="interpolator" name="fast_out_linear_in" /> + <!-- Used for Activity Transitions, this transition indicates that no Transition + should be used. --> <public type="transition" name="no_transition" id="0x010f0000"/> + <!-- A transition that moves and resizes a view --> + <public type="transition" name="move"/> + <!-- A transition that fades views in and out. --> + <public type="transition" name="fade"/> + <!-- A transition that moves views in or out of the scene to or from the edges when + a view visibility changes. --> + <public type="transition" name="explode"/> + <!-- A transition that moves views in or out of the scene to or from the bottom edge when + a view visibility changes. --> + <public type="transition" name="slide_bottom"/> + <!-- A transition that moves views in or out of the scene to or from the top edge when + a view visibility changes. --> + <public type="transition" name="slide_top"/> + <!-- A transition that moves views in or out of the scene to or from the right edge when + a view visibility changes. --> + <public type="transition" name="slide_right"/> + <!-- A transition that moves views in or out of the scene to or from the left edge when + a view visibility changes. --> + <public type="transition" name="slide_left"/> </resources> |