summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2010-11-23 14:30:24 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-23 14:30:24 -0800
commit2f5590d98eca736709a6dea530131a424a7b1ac7 (patch)
tree02a6d89fa1a5bc7326b95ab244d14344495a8f20 /res
parent755b686527032ca6ffe2e01193110a46bac93ff7 (diff)
parent1f878a1fc51571f9750e9b7a1b9de1c44a0c3e97 (diff)
downloadandroid_packages_apps_Trebuchet-2f5590d98eca736709a6dea530131a424a7b1ac7.tar.gz
android_packages_apps_Trebuchet-2f5590d98eca736709a6dea530131a424a7b1ac7.tar.bz2
android_packages_apps_Trebuchet-2f5590d98eca736709a6dea530131a424a7b1ac7.zip
Merge "Updated assets for QSB launch and added a custom transition animation."
Diffstat (limited to 'res')
-rw-r--r--res/drawable-xlarge-hdpi/textfield_home_end.9.png (renamed from res/drawable-xlarge-hdpi/textfield_end.9.png)bin2950 -> 2936 bytes
-rw-r--r--res/drawable-xlarge-hdpi/textfield_home_start.9.pngbin0 -> 1207 bytes
-rw-r--r--res/drawable-xlarge-hdpi/textfield_start.9.pngbin3049 -> 0 bytes
-rw-r--r--res/drawable-xlarge-mdpi/textfield_home_end.9.png (renamed from res/drawable-xlarge-mdpi/textfield_end.9.png)bin2926 -> 2935 bytes
-rw-r--r--res/drawable-xlarge-mdpi/textfield_home_start.9.png (renamed from res/drawable-xlarge-mdpi/textfield_start.9.png)bin2958 -> 3008 bytes
-rw-r--r--res/layout-xlarge-land/launcher.xml4
-rw-r--r--res/layout-xlarge-port/launcher.xml4
7 files changed, 4 insertions, 4 deletions
diff --git a/res/drawable-xlarge-hdpi/textfield_end.9.png b/res/drawable-xlarge-hdpi/textfield_home_end.9.png
index be1b2b684..4e79920da 100644
--- a/res/drawable-xlarge-hdpi/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 000000000..a338c697b
--- /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 6b5ebe2d6..000000000
--- 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
index 94706b4ef..753514f38 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
index 8cddc3499..11ee7cadc 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 7516796f7..f93506e26 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 c2ca4679c..088f08166 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