diff options
| author | Doris Liu <tianliu@google.com> | 2013-01-14 18:41:03 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-14 18:41:03 -0800 |
| commit | 1e44409206f164fdd2b3cb1bec5bda8ef17806f6 (patch) | |
| tree | fad5cc8a4fb286c54582cce4c32e44b4fa78d280 /res | |
| parent | a9ec0ea5080a3ff96e8be3489541792577a1c417 (diff) | |
| parent | e687bdffc9ec121f6a24696aa2bf5d98d6416e49 (diff) | |
| download | Camera-1e44409206f164fdd2b3cb1bec5bda8ef17806f6.tar.gz | |
Merge "Ellipsize long text and use the framework switch" into gb-ub-photos-bryce
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/time_interval_popup.xml | 27 | ||||
| -rw-r--r-- | res/layout/timer_setting_popup.xml | 5 |
2 files changed, 16 insertions, 16 deletions
diff --git a/res/layout/time_interval_popup.xml b/res/layout/time_interval_popup.xml index 1fac11d8..9cf224a7 100644 --- a/res/layout/time_interval_popup.xml +++ b/res/layout/time_interval_popup.xml @@ -25,24 +25,21 @@ <LinearLayout android:orientation="horizontal" android:layout_height="wrap_content" android:layout_width="match_parent"> - <FrameLayout + <TextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:minHeight="@dimen/popup_title_frame_min_height"> - <TextView android:id="@+id/title" - style="@style/PopupTitleText" /> - </FrameLayout> - - <LinearLayout + android:gravity="center_vertical" + android:ellipsize="end" + android:layout_weight="1" + android:minHeight="@dimen/popup_title_frame_min_height" + style="@style/PopupTitleText" /> + <Switch + android:id="@+id/time_lapse_switch" + android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_width="match_parent" - android:orientation="horizontal"> - <com.android.camera.ui.Switch - android:id="@+id/time_lapse_switch" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="right|center_vertical" /> - </LinearLayout> + android:layout_weight="0" + android:layout_marginRight="8dp" + android:layout_gravity="right|center_vertical" /> </LinearLayout> <View style="@style/PopupTitleSeparator" /> diff --git a/res/layout/timer_setting_popup.xml b/res/layout/timer_setting_popup.xml index 8d0810c6..d6e8000e 100644 --- a/res/layout/timer_setting_popup.xml +++ b/res/layout/timer_setting_popup.xml @@ -29,13 +29,16 @@ android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:ellipsize="end" + android:layout_weight="1" android:minHeight="@dimen/popup_title_frame_min_height" android:gravity="center_vertical" style="@style/PopupTitleText" /> <Switch android:id="@+id/timer_setting_switch" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="match_parent" + android:layout_weight="0" android:layout_marginRight="8dp" android:layout_gravity="right|center_vertical" /> </LinearLayout> |