commit c30a6712f266b9d4cf0c68b4a708ae6ae95911f4
author Brian Muramatsu <btmura@google.com> Wed Oct 17 21:51:27 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 17 21:51:28 2012 -0700
tree 998865ca9a7a2b20885cb5aec7cbb977b3ae6d2c
parent 5002303399341d7d442856a30df9080b896d7c55
parent 62ebbbc0decd6cbcb4b433199a67190006f3f6c4

Merge "Show regulatory info within a ScrollView" into jb-mr1-dev

res/layout/regulatory_info.xml

diff --git a/res/layout/regulatory_info.xml b/res/layout/regulatory_info.xml
index dc1efe8..5827557 100755
--- a/res/layout/regulatory_info.xml
+++ b/res/layout/regulatory_info.xml
@@ -13,9 +13,14 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:adjustViewBounds="true"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:scaleType="centerCrop"
-    android:src="@drawable/regulatory_info"/>
+    android:layout_height="wrap_content">
+    <ImageView
+        android:adjustViewBounds="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scaleType="centerCrop"
+        android:src="@drawable/regulatory_info" />
+</ScrollView>
+