summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/time_interval_popup.xml27
-rw-r--r--res/layout/timer_setting_popup.xml5
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>