summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lima <joselima@google.com>2014-05-27 15:03:58 -0700
committerJose Lima <joselima@google.com>2014-05-27 16:54:39 -0700
commit6570d2e3cf6322877e5072482b36ed0c7aa362bb (patch)
treefd597a2329b5aaf846741d2d6d9dc5583708d798
parent751e8d10936e915d1e2cee1e8394863f27f6755a (diff)
downloaddevice_google_atv-6570d2e3cf6322877e5072482b36ed0c7aa362bb.tar.gz
device_google_atv-6570d2e3cf6322877e5072482b36ed0c7aa362bb.tar.bz2
device_google_atv-6570d2e3cf6322877e5072482b36ed0c7aa362bb.zip
Override default window transitions for ATV devices
- Use overlays to change the default window transitions in AndroidTV devices. - Right now all transitions are being replaced with simple fade in/out transitions. These will be replaced with the UX specified transitions when those are available. Change-Id: I8de3b2ea1cca3b0c6dc2df1c34469f43eccf609c
-rw-r--r--overlay/frameworks/base/core/res/res/anim/activity_close_enter.xml24
-rw-r--r--overlay/frameworks/base/core/res/res/anim/activity_close_exit.xml26
-rw-r--r--overlay/frameworks/base/core/res/res/anim/activity_open_enter.xml26
-rw-r--r--overlay/frameworks/base/core/res/res/anim/activity_open_exit.xml26
-rw-r--r--overlay/frameworks/base/core/res/res/anim/atv_fade_in_bottom.xml25
-rw-r--r--overlay/frameworks/base/core/res/res/anim/atv_fade_in_top.xml25
-rw-r--r--overlay/frameworks/base/core/res/res/anim/atv_fade_out_bottom.xml25
-rw-r--r--overlay/frameworks/base/core/res/res/anim/atv_fade_out_top.xml25
-rw-r--r--overlay/frameworks/base/core/res/res/anim/atv_wallpaper_enter.xml24
-rw-r--r--overlay/frameworks/base/core/res/res/anim/atv_wallpaper_exit.xml24
-rw-r--r--overlay/frameworks/base/core/res/res/anim/wallpaper_close_enter.xml26
-rw-r--r--overlay/frameworks/base/core/res/res/anim/wallpaper_close_exit.xml25
-rw-r--r--overlay/frameworks/base/core/res/res/anim/wallpaper_enter.xml23
-rw-r--r--overlay/frameworks/base/core/res/res/anim/wallpaper_exit.xml23
-rw-r--r--overlay/frameworks/base/core/res/res/anim/wallpaper_intra_close_enter.xml27
-rw-r--r--overlay/frameworks/base/core/res/res/anim/wallpaper_intra_close_exit.xml27
-rw-r--r--overlay/frameworks/base/core/res/res/anim/wallpaper_intra_open_enter.xml27
-rw-r--r--overlay/frameworks/base/core/res/res/anim/wallpaper_intra_open_exit.xml27
-rw-r--r--overlay/frameworks/base/core/res/res/anim/wallpaper_open_enter.xml26
-rw-r--r--overlay/frameworks/base/core/res/res/anim/wallpaper_open_exit.xml26
-rw-r--r--overlay/frameworks/base/core/res/res/values/styles.xml54
21 files changed, 202 insertions, 359 deletions
diff --git a/overlay/frameworks/base/core/res/res/anim/activity_close_enter.xml b/overlay/frameworks/base/core/res/res/anim/activity_close_enter.xml
deleted file mode 100644
index cdfab3b..0000000
--- a/overlay/frameworks/base/core/res/res/anim/activity_close_enter.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:zAdjustment="normal">
-
- <alpha android:fromAlpha="1.0" android:toAlpha="1.0"
- android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
- android:duration="300" />
-
-</set>
diff --git a/overlay/frameworks/base/core/res/res/anim/activity_close_exit.xml b/overlay/frameworks/base/core/res/res/anim/activity_close_exit.xml
deleted file mode 100644
index c6e5a53..0000000
--- a/overlay/frameworks/base/core/res/res/anim/activity_close_exit.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:shareInterpolator="false"
- android:zAdjustment="top">
-
- <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
- android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
- android:interpolator="@interpolator/decelerate_cubic"
- android:duration="300" />
-
-</set>
diff --git a/overlay/frameworks/base/core/res/res/anim/activity_open_enter.xml b/overlay/frameworks/base/core/res/res/anim/activity_open_enter.xml
deleted file mode 100644
index c83dff3..0000000
--- a/overlay/frameworks/base/core/res/res/anim/activity_open_enter.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:shareInterpolator="false"
- android:zAdjustment="top">
-
- <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
- android:fillEnabled="true" android:fillBefore="false" android:fillAfter="true"
- android:interpolator="@interpolator/decelerate_cubic"
- android:duration="300" />
-
-</set>
diff --git a/overlay/frameworks/base/core/res/res/anim/activity_open_exit.xml b/overlay/frameworks/base/core/res/res/anim/activity_open_exit.xml
deleted file mode 100644
index 6bc7562..0000000
--- a/overlay/frameworks/base/core/res/res/anim/activity_open_exit.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:background="#ff000000"
- android:zAdjustment="normal">
-
- <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
- android:fillEnabled="true" android:fillBefore="false" android:fillAfter="true"
- android:interpolator="@interpolator/decelerate_quint"
- android:duration="300" />
-
-</set>
diff --git a/overlay/frameworks/base/core/res/res/anim/atv_fade_in_bottom.xml b/overlay/frameworks/base/core/res/res/anim/atv_fade_in_bottom.xml
new file mode 100644
index 0000000..10b8840
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/anim/atv_fade_in_bottom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+ android:zAdjustment="normal"
+ android:interpolator="@android:interpolator/decelerate_quad"
+ android:fromAlpha="1.0"
+ android:toAlpha="1.0"
+ android:duration="@android:integer/config_mediumAnimTime" />
diff --git a/overlay/frameworks/base/core/res/res/anim/atv_fade_in_top.xml b/overlay/frameworks/base/core/res/res/anim/atv_fade_in_top.xml
new file mode 100644
index 0000000..f414dbd
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/anim/atv_fade_in_top.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+ android:zAdjustment="top"
+ android:interpolator="@android:interpolator/decelerate_quad"
+ android:fromAlpha="0.0"
+ android:toAlpha="1.0"
+ android:duration="@android:integer/config_mediumAnimTime" />
diff --git a/overlay/frameworks/base/core/res/res/anim/atv_fade_out_bottom.xml b/overlay/frameworks/base/core/res/res/anim/atv_fade_out_bottom.xml
new file mode 100644
index 0000000..4a0d201
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/anim/atv_fade_out_bottom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+ android:zAdjustment="normal"
+ android:interpolator="@android:interpolator/accelerate_quad"
+ android:fromAlpha="1.0"
+ android:toAlpha="1.0"
+ android:duration="@android:integer/config_mediumAnimTime" />
diff --git a/overlay/frameworks/base/core/res/res/anim/atv_fade_out_top.xml b/overlay/frameworks/base/core/res/res/anim/atv_fade_out_top.xml
new file mode 100644
index 0000000..d0a733f
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/anim/atv_fade_out_top.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+ android:zAdjustment="top"
+ android:interpolator="@android:interpolator/accelerate_quad"
+ android:fromAlpha="1.0"
+ android:toAlpha="0.0"
+ android:duration="@android:integer/config_mediumAnimTime" />
diff --git a/overlay/frameworks/base/core/res/res/anim/atv_wallpaper_enter.xml b/overlay/frameworks/base/core/res/res/anim/atv_wallpaper_enter.xml
new file mode 100644
index 0000000..b29104e
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/anim/atv_wallpaper_enter.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*\
+** Copyright 2009, 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="@interpolator/decelerate_quad">
+ <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+ android:duration="@android:integer/config_mediumAnimTime" />
+</set> \ No newline at end of file
diff --git a/overlay/frameworks/base/core/res/res/anim/atv_wallpaper_exit.xml b/overlay/frameworks/base/core/res/res/anim/atv_wallpaper_exit.xml
new file mode 100644
index 0000000..fb6a252
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/anim/atv_wallpaper_exit.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, 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="@interpolator/accelerate_quad">
+ <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+ android:duration="@android:integer/config_mediumAnimTime"/>
+</set> \ No newline at end of file
diff --git a/overlay/frameworks/base/core/res/res/anim/wallpaper_close_enter.xml b/overlay/frameworks/base/core/res/res/anim/wallpaper_close_enter.xml
deleted file mode 100644
index 12e90ff..0000000
--- a/overlay/frameworks/base/core/res/res/anim/wallpaper_close_enter.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:shareInterpolator="false"
- android:zAdjustment="top">
-
- <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
- android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
- android:interpolator="@interpolator/decelerate_cubic"
- android:duration="300" />
-
-</set>
diff --git a/overlay/frameworks/base/core/res/res/anim/wallpaper_close_exit.xml b/overlay/frameworks/base/core/res/res/anim/wallpaper_close_exit.xml
deleted file mode 100644
index ff15065..0000000
--- a/overlay/frameworks/base/core/res/res/anim/wallpaper_close_exit.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:detachWallpaper="true"
- android:shareInterpolator="false"
- android:zAdjustment="normal">
-
- <alpha android:fromAlpha="1.0" android:toAlpha="1.0"
- android:duration="300" />
-
-</set>
diff --git a/overlay/frameworks/base/core/res/res/anim/wallpaper_enter.xml b/overlay/frameworks/base/core/res/res/anim/wallpaper_enter.xml
deleted file mode 100644
index bef1683..0000000
--- a/overlay/frameworks/base/core/res/res/anim/wallpaper_enter.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:interpolator="@interpolator/decelerate_quad">
-
- <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
- android:duration="@android:integer/config_longAnimTime" />
-
-</set>
diff --git a/overlay/frameworks/base/core/res/res/anim/wallpaper_exit.xml b/overlay/frameworks/base/core/res/res/anim/wallpaper_exit.xml
deleted file mode 100644
index bee2f05..0000000
--- a/overlay/frameworks/base/core/res/res/anim/wallpaper_exit.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:interpolator="@interpolator/accelerate_quad">
-
- <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
- android:duration="@android:integer/config_longAnimTime" />
-
-</set>
diff --git a/overlay/frameworks/base/core/res/res/anim/wallpaper_intra_close_enter.xml b/overlay/frameworks/base/core/res/res/anim/wallpaper_intra_close_enter.xml
deleted file mode 100644
index 9fd882c..0000000
--- a/overlay/frameworks/base/core/res/res/anim/wallpaper_intra_close_enter.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:detachWallpaper="true"
- android:shareInterpolator="false"
- android:zAdjustment="normal">
-
- <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
- android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
- android:interpolator="@interpolator/accelerate_cubic"
- android:duration="280" />
-
-</set>
diff --git a/overlay/frameworks/base/core/res/res/anim/wallpaper_intra_close_exit.xml b/overlay/frameworks/base/core/res/res/anim/wallpaper_intra_close_exit.xml
deleted file mode 100644
index ffb0ce3..0000000
--- a/overlay/frameworks/base/core/res/res/anim/wallpaper_intra_close_exit.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:detachWallpaper="true"
- android:shareInterpolator="false"
- android:zAdjustment="top">
-
- <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
- android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
- android:interpolator="@interpolator/accelerate_cubic"
- android:duration="280" />
-
-</set>
diff --git a/overlay/frameworks/base/core/res/res/anim/wallpaper_intra_open_enter.xml b/overlay/frameworks/base/core/res/res/anim/wallpaper_intra_open_enter.xml
deleted file mode 100644
index 37fe213..0000000
--- a/overlay/frameworks/base/core/res/res/anim/wallpaper_intra_open_enter.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:detachWallpaper="true"
- android:shareInterpolator="false"
- android:zAdjustment="top">
-
- <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
- android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
- android:interpolator="@interpolator/decelerate_cubic"
- android:duration="280" />
-
-</set>
diff --git a/overlay/frameworks/base/core/res/res/anim/wallpaper_intra_open_exit.xml b/overlay/frameworks/base/core/res/res/anim/wallpaper_intra_open_exit.xml
deleted file mode 100644
index 60ab6d1..0000000
--- a/overlay/frameworks/base/core/res/res/anim/wallpaper_intra_open_exit.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:detachWallpaper="true"
- android:shareInterpolator="false"
- android:zAdjustment="normal">
-
- <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
- android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
- android:interpolator="@interpolator/decelerate_cubic"
- android:duration="280" />
-
-</set>
diff --git a/overlay/frameworks/base/core/res/res/anim/wallpaper_open_enter.xml b/overlay/frameworks/base/core/res/res/anim/wallpaper_open_enter.xml
deleted file mode 100644
index c9d5a7f..0000000
--- a/overlay/frameworks/base/core/res/res/anim/wallpaper_open_enter.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:detachWallpaper="true"
- android:shareInterpolator="false"
- android:zAdjustment="normal">
-
- <alpha android:fromAlpha="1.0" android:toAlpha="1.0"
- android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
- android:duration="375" />
-
-</set>
diff --git a/overlay/frameworks/base/core/res/res/anim/wallpaper_open_exit.xml b/overlay/frameworks/base/core/res/res/anim/wallpaper_open_exit.xml
deleted file mode 100644
index 7e9fbd9..0000000
--- a/overlay/frameworks/base/core/res/res/anim/wallpaper_open_exit.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:shareInterpolator="false"
- android:zAdjustment="top">
-
- <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
- android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
- android:interpolator="@interpolator/accelerate_decelerate"
- android:duration="200" />
-
-</set>
diff --git a/overlay/frameworks/base/core/res/res/values/styles.xml b/overlay/frameworks/base/core/res/res/values/styles.xml
new file mode 100644
index 0000000..23d480e
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/values/styles.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2006 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.
+-->
+
+<resources>
+
+ <!-- Standard animations for wallpapers. -->
+ <style name="Animation.Wallpaper">
+ <item name="windowEnterAnimation">@anim/atv_wallpaper_enter</item>
+ <item name="windowExitAnimation">@anim/atv_wallpaper_exit</item>
+ </style>
+
+ <!-- Standard animations for a full-screen window or activity. -->
+ <style name="Animation.Activity">
+ <item name="activityOpenEnterAnimation">@anim/atv_fade_in_top</item>
+ <item name="activityOpenExitAnimation">@anim/atv_fade_in_bottom</item>
+ <item name="activityCloseEnterAnimation">@anim/atv_fade_out_bottom</item>
+ <item name="activityCloseExitAnimation">@anim/atv_fade_out_top</item>
+
+ <item name="taskOpenEnterAnimation">@anim/atv_fade_in_top</item>
+ <item name="taskOpenExitAnimation">@anim/atv_fade_in_bottom</item>
+ <item name="taskCloseEnterAnimation">@anim/atv_fade_out_bottom</item>
+ <item name="taskCloseExitAnimation">@anim/atv_fade_out_top</item>
+
+ <item name="taskToFrontEnterAnimation">@anim/atv_fade_in_top</item>
+ <item name="taskToFrontExitAnimation">@anim/atv_fade_in_bottom</item>
+ <item name="taskToBackEnterAnimation">@anim/atv_fade_out_bottom</item>
+ <item name="taskToBackExitAnimation">@anim/atv_fade_out_top</item>
+
+ <item name="wallpaperOpenEnterAnimation">@anim/atv_fade_out_bottom</item>
+ <item name="wallpaperOpenExitAnimation">@anim/atv_fade_out_top</item>
+ <item name="wallpaperCloseEnterAnimation">@anim/atv_fade_in_top</item>
+ <item name="wallpaperCloseExitAnimation">@anim/atv_fade_in_bottom</item>
+
+ <item name="wallpaperIntraOpenEnterAnimation">@anim/atv_fade_in_top</item>
+ <item name="wallpaperIntraOpenExitAnimation">@anim/atv_fade_in_bottom</item>
+ <item name="wallpaperIntraCloseEnterAnimation">@anim/atv_fade_out_bottom</item>
+ <item name="wallpaperIntraCloseExitAnimation">@anim/atv_fade_out_top</item>
+ </style>
+
+</resources>