summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Sharkey <>2009-03-25 17:07:33 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-25 17:07:33 -0700
commit887bc4b35498edbe211402bab7ca0c9cb15c7169 (patch)
tree571e5c74bc23cb7f0de149d234fd47afd1624682
parentc20a566dd088ede3cb04482f922a351f4352be0b (diff)
downloadLegacyCamera-887bc4b35498edbe211402bab7ca0c9cb15c7169.zip
LegacyCamera-887bc4b35498edbe211402bab7ca0c9cb15c7169.tar.gz
LegacyCamera-887bc4b35498edbe211402bab7ca0c9cb15c7169.tar.bz2
Automated import from //branches/donutburger/...@142721,142721
-rw-r--r--res/drawable-land/photo_frame.9.pngbin0 -> 17119 bytes
-rw-r--r--res/drawable/photo_frame.9.pngbin3943 -> 17254 bytes
-rw-r--r--res/drawable/photo_inner.9.pngbin0 -> 3000 bytes
-rw-r--r--res/layout/photo_frame.xml23
4 files changed, 18 insertions, 5 deletions
diff --git a/res/drawable-land/photo_frame.9.png b/res/drawable-land/photo_frame.9.png
new file mode 100644
index 0000000..7d479b5
--- /dev/null
+++ b/res/drawable-land/photo_frame.9.png
Binary files differ
diff --git a/res/drawable/photo_frame.9.png b/res/drawable/photo_frame.9.png
index b153260..9dbf362 100644
--- a/res/drawable/photo_frame.9.png
+++ b/res/drawable/photo_frame.9.png
Binary files differ
diff --git a/res/drawable/photo_inner.9.png b/res/drawable/photo_inner.9.png
new file mode 100644
index 0000000..0e77c7b
--- /dev/null
+++ b/res/drawable/photo_inner.9.png
Binary files differ
diff --git a/res/layout/photo_frame.xml b/res/layout/photo_frame.xml
index 5537b1e..00ab25d 100644
--- a/res/layout/photo_frame.xml
+++ b/res/layout/photo_frame.xml
@@ -14,11 +14,24 @@
limitations under the License.
-->
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/photo"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:scaleType="center"
- android:cropToPadding="true"
android:background="@drawable/photo_frame"
- />
+ >
+
+ <ImageView
+ android:id="@+id/photo"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:scaleType="center"
+ android:cropToPadding="true"
+ />
+
+ <ImageView
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="@drawable/photo_inner"
+ />
+
+</FrameLayout> \ No newline at end of file