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
diff --git a/res/drawable-xlarge-hdpi/textfield_end.9.png b/res/drawable-xlarge-hdpi/textfield_end.9.png
deleted file mode 100644
index be1b2b6..0000000
--- a/res/drawable-xlarge-hdpi/textfield_end.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xlarge-mdpi/textfield_end.9.png b/res/drawable-xlarge-hdpi/textfield_home_end.9.png
similarity index 92%
rename from res/drawable-xlarge-mdpi/textfield_end.9.png
rename to res/drawable-xlarge-hdpi/textfield_home_end.9.png
index 94706b4..4e79920 100644
--- a/res/drawable-xlarge-mdpi/textfield_end.9.png
+++ b/res/drawable-xlarge-hdpi/textfield_home_end.9.png
Binary files differ
diff --git a/res/drawable-xlarge-hdpi/textfield_home_start.9.png b/res/drawable-xlarge-hdpi/textfield_home_start.9.png
new file mode 100644
index 0000000..a338c69
--- /dev/null
+++ b/res/drawable-xlarge-hdpi/textfield_home_start.9.png
Binary files differ
diff --git a/res/drawable-xlarge-hdpi/textfield_start.9.png b/res/drawable-xlarge-hdpi/textfield_start.9.png
deleted file mode 100644
index 6b5ebe2..0000000
--- a/res/drawable-xlarge-hdpi/textfield_start.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xlarge-mdpi/textfield_end.9.png b/res/drawable-xlarge-mdpi/textfield_home_end.9.png
similarity index 92%
copy from res/drawable-xlarge-mdpi/textfield_end.9.png
copy to res/drawable-xlarge-mdpi/textfield_home_end.9.png
index 94706b4..753514f 100644
--- a/res/drawable-xlarge-mdpi/textfield_end.9.png
+++ b/res/drawable-xlarge-mdpi/textfield_home_end.9.png
Binary files differ
diff --git a/res/drawable-xlarge-mdpi/textfield_start.9.png b/res/drawable-xlarge-mdpi/textfield_home_start.9.png
similarity index 90%
rename from res/drawable-xlarge-mdpi/textfield_start.9.png
rename to res/drawable-xlarge-mdpi/textfield_home_start.9.png
index 8cddc34..11ee7ca 100644
--- a/res/drawable-xlarge-mdpi/textfield_start.9.png
+++ b/res/drawable-xlarge-mdpi/textfield_home_start.9.png
Binary files differ
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 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);
}
/**
