summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-11-18 19:47:42 -0800
committerDianne Hackborn <hackbod@google.com>2010-11-18 19:57:49 -0800
commit8e11ef0d949a52fec15359ec35557b2e773b093d (patch)
treee05b9bc14369925d52a27e8f913e5c5a5533727e /core
parent71d4ecb185bbe9e699aa85c65c98427a67a3fb12 (diff)
downloadframeworks_base-8e11ef0d949a52fec15359ec35557b2e773b093d.zip
frameworks_base-8e11ef0d949a52fec15359ec35557b2e773b093d.tar.gz
frameworks_base-8e11ef0d949a52fec15359ec35557b2e773b093d.tar.bz2
Some work on issue #3201795: Improve transition when keyboard comes up
Now try to slide dialogs if they end up moving due to the IME (or other system things) showing/hiding. Pretty hackish, but seems to work. Change-Id: Icd297e941cf847fa920c9605145c46be63043d52
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/WindowManager.java1
-rw-r--r--core/res/res/anim/accelerate_cubic_interpolator.xml3
-rw-r--r--core/res/res/anim/accelerate_decelerate_interpolator.xml3
-rw-r--r--core/res/res/anim/accelerate_interpolator.xml3
-rw-r--r--core/res/res/anim/accelerate_quint_interpolator.xml3
-rw-r--r--core/res/res/anim/decelerate_cubic_interpolator.xml3
-rw-r--r--core/res/res/anim/decelerate_interpolator.xml3
-rw-r--r--core/res/res/anim/decelerate_quint_interpolator.xml3
-rw-r--r--core/res/res/anim/window_move_from_decor.xml28
-rw-r--r--core/res/res/drawable/item_background.xml3
10 files changed, 37 insertions, 16 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index a64ee9d..784951f 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -922,7 +922,6 @@ public interface WindowManager extends ViewManager {
*/
public int screenOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
-
public LayoutParams() {
super(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
type = TYPE_APPLICATION;
diff --git a/core/res/res/anim/accelerate_cubic_interpolator.xml b/core/res/res/anim/accelerate_cubic_interpolator.xml
index c736766..90f62da 100644
--- a/core/res/res/anim/accelerate_cubic_interpolator.xml
+++ b/core/res/res/anim/accelerate_cubic_interpolator.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/* //device/apps/common/res/anim/ease_in_interpolator.xml
-**
+/*
** Copyright 2010, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/core/res/res/anim/accelerate_decelerate_interpolator.xml b/core/res/res/anim/accelerate_decelerate_interpolator.xml
index 4a0216b..e7f9d9f 100644
--- a/core/res/res/anim/accelerate_decelerate_interpolator.xml
+++ b/core/res/res/anim/accelerate_decelerate_interpolator.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/* //device/apps/common/res/anim/ease_in_out_interpolator.xml
-**
+/*
** Copyright 2007, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/core/res/res/anim/accelerate_interpolator.xml b/core/res/res/anim/accelerate_interpolator.xml
index 13f87f3..18207f2 100644
--- a/core/res/res/anim/accelerate_interpolator.xml
+++ b/core/res/res/anim/accelerate_interpolator.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/* //device/apps/common/res/anim/ease_in_interpolator.xml
-**
+/*
** Copyright 2007, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/core/res/res/anim/accelerate_quint_interpolator.xml b/core/res/res/anim/accelerate_quint_interpolator.xml
index 5ab4909..cd3595c 100644
--- a/core/res/res/anim/accelerate_quint_interpolator.xml
+++ b/core/res/res/anim/accelerate_quint_interpolator.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/* //device/apps/common/res/anim/ease_in_interpolator.xml
-**
+/*
** Copyright 2010, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/core/res/res/anim/decelerate_cubic_interpolator.xml b/core/res/res/anim/decelerate_cubic_interpolator.xml
index 78bdb40..550a591 100644
--- a/core/res/res/anim/decelerate_cubic_interpolator.xml
+++ b/core/res/res/anim/decelerate_cubic_interpolator.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/* //device/apps/common/res/anim/ease_in_interpolator.xml
-**
+/*
** Copyright 2010, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/core/res/res/anim/decelerate_interpolator.xml b/core/res/res/anim/decelerate_interpolator.xml
index 7b29fb3..48e2308 100644
--- a/core/res/res/anim/decelerate_interpolator.xml
+++ b/core/res/res/anim/decelerate_interpolator.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/* //device/apps/common/res/anim/ease_out_interpolator.xml
-**
+/*
** Copyright 2007, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/core/res/res/anim/decelerate_quint_interpolator.xml b/core/res/res/anim/decelerate_quint_interpolator.xml
index 0e543e6..7545b17 100644
--- a/core/res/res/anim/decelerate_quint_interpolator.xml
+++ b/core/res/res/anim/decelerate_quint_interpolator.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/* //device/apps/common/res/anim/ease_in_interpolator.xml
-**
+/*
** Copyright 2010, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/core/res/res/anim/window_move_from_decor.xml b/core/res/res/anim/window_move_from_decor.xml
new file mode 100644
index 0000000..94062db
--- /dev/null
+++ b/core/res/res/anim/window_move_from_decor.xml
@@ -0,0 +1,28 @@
+<?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.
+*/
+-->
+
+<!-- Animation when a window is being moved on screen because the decors
+ around it (such as the IME) have changed. In this case the parent
+ container size is actually the amount the window has moved. Yes,
+ a nasty hack. -->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:fromYDelta="100%p" android:toYDelta="0"
+ android:fromXDelta="100%p" android:toXDelta="0"
+ android:interpolator="@anim/decelerate_quint_interpolator"
+ android:duration="@android:integer/config_mediumAnimTime" />
diff --git a/core/res/res/drawable/item_background.xml b/core/res/res/drawable/item_background.xml
index a1c9ff8..f7fef82 100644
--- a/core/res/res/drawable/item_background.xml
+++ b/core/res/res/drawable/item_background.xml
@@ -14,7 +14,8 @@
limitations under the License.
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:exitFadeDuration="@android:integer/config_mediumAnimTime">
<item android:state_window_focused="false" android:drawable="@color/transparent" />