am 2115f63c: Merge "Add contentDescription attribute to setup wizard video and image"

* commit '2115f63cbaf74b828375d65aee3e93b097aaba5d':
  Add contentDescription attribute to setup wizard video and image
main
Tadashi G. Takaoka 2013-05-24 15:31:40 -07:00 committed by Android Git Automerger
commit dacb4b88c8
1 changed files with 4 additions and 2 deletions

View File

@ -36,13 +36,15 @@
android:id="@+id/setup_welcome_video" android:id="@+id/setup_welcome_video"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/setup_background" /> android:background="@color/setup_background"
android:contentDescription="@string/setup_welcome_additional_description"/>
<ImageView <ImageView
android:id="@+id/setup_welcome_image" android:id="@+id/setup_welcome_image"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:visibility="gone" /> android:visibility="gone"
android:contentDescription="@string/setup_welcome_additional_description"/>
</LinearLayout> </LinearLayout>
<View <View
android:layout_weight="@integer/setup_welcome_video_end_padding_weight_in_screen" android:layout_weight="@integer/setup_welcome_video_end_padding_weight_in_screen"