diff options
author | Jorim Jaggi <jjaggi@google.com> | 2015-07-28 23:19:39 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-28 23:19:39 +0000 |
commit | 353fe1c665e0065d4c8eecdf41c22f1a1a607f2c (patch) | |
tree | 20cc2f3bd081c3ba8e0ae409b1b142ecdf6bd31c /packages/SystemUI/res | |
parent | 403e22b97dc3763e55bf2fb9ab0d681e7ee6c828 (diff) | |
parent | 0d210f6395072db4a4c53d4cb8fac4a59a3965b4 (diff) | |
download | frameworks_base-353fe1c665e0065d4c8eecdf41c22f1a1a607f2c.zip frameworks_base-353fe1c665e0065d4c8eecdf41c22f1a1a607f2c.tar.gz frameworks_base-353fe1c665e0065d4c8eecdf41c22f1a1a607f2c.tar.bz2 |
am 0d210f63: Animation for touch, wake and unlock
* commit '0d210f6395072db4a4c53d4cb8fac4a59a3965b4':
Animation for touch, wake and unlock
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r-- | packages/SystemUI/res/anim/navbar_fade_in.xml | 22 | ||||
-rw-r--r-- | packages/SystemUI/res/values/styles.xml | 5 |
2 files changed, 27 insertions, 0 deletions
diff --git a/packages/SystemUI/res/anim/navbar_fade_in.xml b/packages/SystemUI/res/anim/navbar_fade_in.xml new file mode 100644 index 0000000..e3429e6 --- /dev/null +++ b/packages/SystemUI/res/anim/navbar_fade_in.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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:fromAlpha="0.0" + android:toAlpha="1.0" + android:interpolator="@android:interpolator/linear_out_slow_in" + android:duration="200"/> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 1889862..8241ddf 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -206,6 +206,11 @@ <item name="android:windowExitAnimation">@*android:anim/shrink_fade_out_from_bottom</item> </style> + <style name="Animation.NavigationBarFadeIn"> + <item name="android:windowEnterAnimation">@anim/navbar_fade_in</item> + <item name="android:windowExitAnimation">@null</item> + </style> + <!-- Standard animations for hiding and showing the status bar. --> <style name="Animation.StatusBar"> </style> |