am dd9dcb43: Merge "Treat caption preview viewport as clipped 16:9 aspect" into lmp-dev

* commit 'dd9dcb43778437358847e57c05c6926e42e47c62':
  Treat caption preview viewport as clipped 16:9 aspect
This commit is contained in:
Alan Viverette
2014-07-22 00:12:40 +00:00
committed by Android Git Automerger
2 changed files with 7 additions and 2 deletions

View File

@@ -23,7 +23,9 @@
<FrameLayout
android:id="@+id/preview_viewport"
android:layout_width="match_parent"
android:layout_height="@dimen/captioning_preview_height" >
android:layout_height="@dimen/captioning_preview_height"
android:paddingStart="@dimen/settings_side_margin"
android:paddingEnd="@dimen/settings_side_margin" >
<ImageView
android:layout_width="match_parent"