diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-11-22 14:58:22 -0800 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2010-11-23 13:43:14 -0800 |
| commit | 1f878a1fc51571f9750e9b7a1b9de1c44a0c3e97 (patch) | |
| tree | 540260bcc3604801b059ae8213f49691ac30f645 | |
| parent | 59fbda815e7b1c38f7aaf5d7eb87601f78e88c5b (diff) | |
| download | packages_apps_trebuchet-1f878a1fc51571f9750e9b7a1b9de1c44a0c3e97.zip packages_apps_trebuchet-1f878a1fc51571f9750e9b7a1b9de1c44a0c3e97.tar.gz packages_apps_trebuchet-1f878a1fc51571f9750e9b7a1b9de1c44a0c3e97.tar.bz2 | |
Updated assets for QSB launch and added a custom transition animation.
Using a fade animation for launching QSB because the standard intra-wallpaper transition
has changed.
Bug: 3223441
| -rw-r--r-- | res/drawable-xlarge-hdpi/textfield_home_end.9.png (renamed from res/drawable-xlarge-hdpi/textfield_end.9.png) | bin | 2950 -> 2936 bytes | |||
| -rw-r--r-- | res/drawable-xlarge-hdpi/textfield_home_start.9.png | bin | 0 -> 1207 bytes | |||
| -rw-r--r-- | res/drawable-xlarge-hdpi/textfield_start.9.png | bin | 3049 -> 0 bytes | |||
| -rw-r--r-- | res/drawable-xlarge-mdpi/textfield_home_end.9.png (renamed from res/drawable-xlarge-mdpi/textfield_end.9.png) | bin | 2926 -> 2935 bytes | |||
| -rw-r--r-- | res/drawable-xlarge-mdpi/textfield_home_start.9.png (renamed from res/drawable-xlarge-mdpi/textfield_start.9.png) | bin | 2958 -> 3008 bytes | |||
| -rw-r--r-- | res/layout-xlarge-land/launcher.xml | 4 | ||||
| -rw-r--r-- | res/layout-xlarge-port/launcher.xml | 4 | ||||
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 2 |
8 files changed, 6 insertions, 4 deletions
diff --git a/res/drawable-xlarge-hdpi/textfield_end.9.png b/res/drawable-xlarge-hdpi/textfield_home_end.9.png Binary files differindex be1b2b6..4e79920 100644 --- a/res/drawable-xlarge-hdpi/textfield_end.9.png +++ b/res/drawable-xlarge-hdpi/textfield_home_end.9.png diff --git a/res/drawable-xlarge-hdpi/textfield_home_start.9.png b/res/drawable-xlarge-hdpi/textfield_home_start.9.png Binary files differnew file mode 100644 index 0000000..a338c69 --- /dev/null +++ b/res/drawable-xlarge-hdpi/textfield_home_start.9.png diff --git a/res/drawable-xlarge-hdpi/textfield_start.9.png b/res/drawable-xlarge-hdpi/textfield_start.9.png Binary files differdeleted file mode 100644 index 6b5ebe2..0000000 --- a/res/drawable-xlarge-hdpi/textfield_start.9.png +++ /dev/null diff --git a/res/drawable-xlarge-mdpi/textfield_end.9.png b/res/drawable-xlarge-mdpi/textfield_home_end.9.png Binary files differindex 94706b4..753514f 100644 --- a/res/drawable-xlarge-mdpi/textfield_end.9.png +++ b/res/drawable-xlarge-mdpi/textfield_home_end.9.png diff --git a/res/drawable-xlarge-mdpi/textfield_start.9.png b/res/drawable-xlarge-mdpi/textfield_home_start.9.png Binary files differindex 8cddc34..11ee7ca 100644 --- a/res/drawable-xlarge-mdpi/textfield_start.9.png +++ b/res/drawable-xlarge-mdpi/textfield_home_start.9.png diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml index 7516796..f93506e 100644 --- a/res/layout-xlarge-land/launcher.xml +++ b/res/layout-xlarge-land/launcher.xml @@ -63,7 +63,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="16dp" - android:background="@drawable/textfield_start" + android:background="@drawable/textfield_home_start" android:orientation="horizontal"> <!-- Global search icon --> <ImageView @@ -84,7 +84,7 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="match_parent" - android:background="@drawable/textfield_end" + android:background="@drawable/textfield_home_end" android:orientation="horizontal"> <!-- Voice search icon --> <ImageView diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml index c2ca467..088f081 100644 --- a/res/layout-xlarge-port/launcher.xml +++ b/res/layout-xlarge-port/launcher.xml @@ -63,7 +63,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="16dp" - android:background="@drawable/textfield_start" + android:background="@drawable/textfield_home_start" android:orientation="horizontal"> <!-- Global search icon --> <ImageView @@ -84,7 +84,7 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="match_parent" - android:background="@drawable/textfield_end" + android:background="@drawable/textfield_home_end" android:orientation="horizontal"> <!-- Voice search icon --> <ImageView diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 55a6176..232fef4 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1923,6 +1923,8 @@ public final class Launcher extends Activity */ public void onClickSearchButton(View v) { startSearch(null, false, null, true); + // Use a custom animation for launching search + overridePendingTransition(R.anim.fade_in_fast, R.anim.fade_out_fast); } /** |
