diff options
author | Martijn Coenen <maco@google.com> | 2011-11-07 16:22:46 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-07 16:22:46 +0000 |
commit | c9a17f611b2fb3ce84fb62f6df1ae78557dd0b19 (patch) | |
tree | fd451a7e7b843ed9db1717400e6f14f1ff5070c6 /res | |
parent | 5c5ecd9d29a8598df2deaee1862e5f0eb23971f1 (diff) | |
parent | f7a151e2fe02af5026d6aad37447f13bff60c56a (diff) | |
download | packages_apps_nfc-c9a17f611b2fb3ce84fb62f6df1ae78557dd0b19.zip packages_apps_nfc-c9a17f611b2fb3ce84fb62f6df1ae78557dd0b19.tar.gz packages_apps_nfc-c9a17f611b2fb3ce84fb62f6df1ae78557dd0b19.tar.bz2 |
am f7a151e2: Merge "Remove static background image from Beam when no hw-acceleration." into ics-mr1
* commit 'f7a151e2fe02af5026d6aad37447f13bff60c56a':
Remove static background image from Beam when no hw-acceleration.
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/back.png | bin | 32598 -> 0 bytes | |||
-rw-r--r-- | res/layout/screenshot.xml | 9 |
2 files changed, 1 insertions, 8 deletions
diff --git a/res/drawable-hdpi/back.png b/res/drawable-hdpi/back.png Binary files differdeleted file mode 100644 index dcad41d..0000000 --- a/res/drawable-hdpi/back.png +++ /dev/null diff --git a/res/layout/screenshot.xml b/res/layout/screenshot.xml index 2e12a59..24a3a71 100644 --- a/res/layout/screenshot.xml +++ b/res/layout/screenshot.xml @@ -22,14 +22,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" /> - <ImageView android:id="@+id/back" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:adjustViewBounds="true" - android:src="@drawable/back" - android:scaleType="centerCrop" - android:visibility="gone" - /> + <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" |