Issue 546, let share screen scroll on tiny screens

git-svn-id: https://zxing.googlecode.com/svn/trunk@1602 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-09-22 12:53:31 +00:00
parent 919713eb3b
commit 897d6c3501

View file

@ -18,63 +18,78 @@
android:id="@+id/encode_view" android:id="@+id/encode_view"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:gravity="center"
android:background="@color/share_view" android:background="@color/share_view"
android:orientation="vertical" android:orientation="vertical">
android:padding="16dip">
<TextView <!-- ScrollView wrapper is to accommodate small screens -->
android:layout_width="wrap_content" <ScrollView
android:layout_height="wrap_content"
android:textColor="@color/share_text"
android:textSize="18sp"
android:text="@string/msg_share_explanation"
android:paddingBottom="24dip"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="center"
android:src="@drawable/share_via_barcode"
android:paddingBottom="24dip"/>
<LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="fill_parent">
android:orientation="horizontal"
android:paddingBottom="8dip">
<Button android:id="@+id/app_button" <!-- Must wrap the rest in one layout -->
android:layout_width="fill_parent" <LinearLayout
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:layout_weight="1" android:layout_height="fill_parent"
android:text="@string/button_share_app"/> android:gravity="center"
android:orientation="vertical"
android:padding="16dip">
<Button android:id="@+id/bookmark_button" <TextView
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:textColor="@color/share_text"
android:text="@string/button_share_bookmark"/> android:textSize="18sp"
android:text="@string/msg_share_explanation"
android:paddingBottom="24dip"/>
</LinearLayout> <ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="center"
android:src="@drawable/share_via_barcode"
android:paddingBottom="24dip"/>
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal"
android:paddingBottom="8dip">
<Button android:id="@+id/contact_button" <Button android:id="@+id/app_button"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/button_share_contact"/> android:text="@string/button_share_app"/>
<Button android:id="@+id/clipboard_button" <Button android:id="@+id/bookmark_button"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/button_share_clipboard"/> android:text="@string/button_share_bookmark"/>
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button android:id="@+id/contact_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/button_share_contact"/>
<Button android:id="@+id/clipboard_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/button_share_clipboard"/>
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout> </LinearLayout>