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

This commit is contained in:
Brian Muramatsu
2012-10-17 21:51:27 -07:00
committed by Android (Google) Code Review

View File

@@ -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>