summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2012-10-11 16:58:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-11 16:58:43 -0700
commit63d46d02018979802733dde735a8ea5fca36ed05 (patch)
tree1ac7bbe6a7da219650ac5a361756b5eddfc3e679
parentd7755fd684f5861ff1a7c159683806f0ed23ce35 (diff)
parent3a987f7beef8d193050ad78ef8bff93ab85173b8 (diff)
downloadandroid_packages_apps_Snap-63d46d02018979802733dde735a8ea5fca36ed05.tar.gz
android_packages_apps_Snap-63d46d02018979802733dde735a8ea5fca36ed05.tar.bz2
android_packages_apps_Snap-63d46d02018979802733dde735a8ea5fca36ed05.zip
am 310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches
* commit '310a93dc17574f3595b03da6988a2fbf3b382f51': Remove old 360 icons
-rw-r--r--res/drawable-hdpi/ic_menu_photosphere.pngbin2175 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_menu_photosphere_active.pngbin2029 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_photosphere.pngbin1515 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_photosphere_active.pngbin1170 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_photosphere.pngbin2460 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_photosphere_active.pngbin2417 -> 0 bytes
-rw-r--r--res/layout/photopage_bottom_controls.xml2
7 files changed, 1 insertions, 1 deletions
diff --git a/res/drawable-hdpi/ic_menu_photosphere.png b/res/drawable-hdpi/ic_menu_photosphere.png
deleted file mode 100644
index 27043ef9b..000000000
--- a/res/drawable-hdpi/ic_menu_photosphere.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_photosphere_active.png b/res/drawable-hdpi/ic_menu_photosphere_active.png
deleted file mode 100644
index c57601574..000000000
--- a/res/drawable-hdpi/ic_menu_photosphere_active.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_photosphere.png b/res/drawable-mdpi/ic_menu_photosphere.png
deleted file mode 100644
index 4ba096952..000000000
--- a/res/drawable-mdpi/ic_menu_photosphere.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_photosphere_active.png b/res/drawable-mdpi/ic_menu_photosphere_active.png
deleted file mode 100644
index 96e2ac516..000000000
--- a/res/drawable-mdpi/ic_menu_photosphere_active.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_photosphere.png b/res/drawable-xhdpi/ic_menu_photosphere.png
deleted file mode 100644
index 19f9b290c..000000000
--- a/res/drawable-xhdpi/ic_menu_photosphere.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_photosphere_active.png b/res/drawable-xhdpi/ic_menu_photosphere_active.png
deleted file mode 100644
index a77a712ff..000000000
--- a/res/drawable-xhdpi/ic_menu_photosphere_active.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/photopage_bottom_controls.xml b/res/layout/photopage_bottom_controls.xml
index 434c59824..1111ef40e 100644
--- a/res/layout/photopage_bottom_controls.xml
+++ b/res/layout/photopage_bottom_controls.xml
@@ -23,7 +23,7 @@
android:visibility="gone"/>
<ImageView
android:id="@+id/photopage_bottom_control_panorama"
- android:src="@drawable/ic_menu_photosphere"
+ android:src="@drawable/ic_view_photosphere"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_centerHorizontal="true"