diff options
| author | Erin Dahlgren <edahlgren@google.com> | 2014-05-21 01:11:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 01:11:31 +0000 |
| commit | 0b283b41482254254f0a17ada6415f7cc8b8c46f (patch) | |
| tree | 2b9cf77a69f6c57adede4258898c4f5157ee4a8d /res | |
| parent | b514cdeaffca52da323481293e3b9117de04d375 (diff) | |
| parent | f142fcf45c93ee674b976cc68883ea30c904a9d1 (diff) | |
| download | android_packages_apps_Camera2-0b283b41482254254f0a17ada6415f7cc8b8c46f.tar.gz android_packages_apps_Camera2-0b283b41482254254f0a17ada6415f7cc8b8c46f.tar.bz2 android_packages_apps_Camera2-0b283b41482254254f0a17ada6415f7cc8b8c46f.zip | |
Merge "Maximize space for Large Text in aspect ratio dialog." into ub-camera-everglades
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-port/aspect_ratio_dialog_content.xml | 60 | ||||
| -rw-r--r-- | res/layout-port/aspect_ratio_selector.xml | 32 |
2 files changed, 46 insertions, 46 deletions
diff --git a/res/layout-port/aspect_ratio_dialog_content.xml b/res/layout-port/aspect_ratio_dialog_content.xml index 966cf2da5..e40825a9c 100644 --- a/res/layout-port/aspect_ratio_dialog_content.xml +++ b/res/layout-port/aspect_ratio_dialog_content.xml @@ -21,29 +21,59 @@ android:paddingLeft="16dp" android:paddingRight="16dp"> <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:gravity="center" android:text="@string/photo_size_selection_title" android:textSize="22sp" - android:textColor="@color/dialog_text_color" - android:layout_marginTop="28dp" - android:layout_marginBottom="56dp" /> - <include layout="@layout/aspect_ratio_selector" /> + android:textColor="@color/dialog_text_color" /> + <include + layout="@layout/aspect_ratio_selector" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="2" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:orientation="horizontal"> + <!-- NOTE: These texts only make sense on a 4:3 sensor device. --> + <TextView + android:id="@+id/text_4x3" + android:layout_width="0dp" + android:layout_height="match_parent" + android:text="@string/full_sensor_4x3_aspect_ratio" + android:textSize="16sp" + android:textColor="@color/dialog_text_color" + android:gravity="center" + android:layout_weight="1"/> + <TextView + android:id="@+id/text_16x9" + android:layout_width="0dp" + android:layout_height="match_parent" + android:text="@string/cropped_sensor_16x9_aspect_ratio" + android:textSize="16sp" + android:textColor="@color/dialog_text_color" + android:gravity="center" + android:layout_weight="1"/> + </LinearLayout> <TextView android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginBottom="-20dp" android:layout_weight="1" android:textSize="20sp" - android:layout_marginLeft="28dp" - android:layout_marginRight="28dp" android:textColor="@color/dialog_text_color" android:gravity="center" android:text="@string/photo_aspect_ratio_selection_content" /> - <Button - android:id="@+id/confirm_button" - style="@style/BlueButton" - android:layout_marginTop="28dp" - android:layout_marginBottom="28dp" - android:text="@string/confirm_button_text" /> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" > + <Button + android:id="@+id/confirm_button" + style="@style/BlueButton" + android:layout_gravity="center" + android:text="@string/confirm_button_text" /> + </FrameLayout> </LinearLayout>
\ No newline at end of file diff --git a/res/layout-port/aspect_ratio_selector.xml b/res/layout-port/aspect_ratio_selector.xml index 625301339..81f99a9b2 100644 --- a/res/layout-port/aspect_ratio_selector.xml +++ b/res/layout-port/aspect_ratio_selector.xml @@ -17,9 +17,7 @@ <com.android.camera.widget.AspectRatioSelector xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/aspect_ratio_selector" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:orientation="vertical" > <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -38,32 +36,4 @@ android:src="@drawable/aspect_ratio_16x9" android:layout_marginLeft="28dp"/> </LinearLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="28dp" - android:layout_marginLeft="28dp" - android:layout_marginRight="28dp" - android:orientation="horizontal"> - - <!-- NOTE: These texts only make sense on a 4:3 sensor device. --> - <TextView - android:id="@+id/text_4x3" - android:layout_width="0dp" - android:layout_height="match_parent" - android:text="@string/full_sensor_4x3_aspect_ratio" - android:textSize="16sp" - android:textColor="@color/dialog_text_color" - android:gravity="center" - android:layout_weight="1"/> - <TextView - android:id="@+id/text_16x9" - android:layout_width="0dp" - android:layout_height="match_parent" - android:text="@string/cropped_sensor_16x9_aspect_ratio" - android:textSize="16sp" - android:textColor="@color/dialog_text_color" - android:gravity="center" - android:layout_weight="1"/> - </LinearLayout> </com.android.camera.widget.AspectRatioSelector>
\ No newline at end of file |