summaryrefslogtreecommitdiffstats
path: root/res/layout-xlarge
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-01-17 19:59:56 +0800
committerWu-cheng Li <wuchengli@google.com>2011-01-17 19:59:56 +0800
commit5426155b3bca7b49a35725b6c88952d90a437001 (patch)
tree918621f022c317cf7c9de6756f3dc8a08235dafe /res/layout-xlarge
parenta3c77b71a4744c22bd1b12497c479adb07ef2b85 (diff)
downloadLegacyCamera-5426155b3bca7b49a35725b6c88952d90a437001.zip
LegacyCamera-5426155b3bca7b49a35725b6c88952d90a437001.tar.gz
LegacyCamera-5426155b3bca7b49a35725b6c88952d90a437001.tar.bz2
Add char limit to some strings.
Also adjust the layout according to char limit and remove unused time lapse strings. bug:3329896 Change-Id: Icb8b909b4936d548825bd2dc279962fac0978203
Diffstat (limited to 'res/layout-xlarge')
-rw-r--r--res/layout-xlarge/basic_setting_popup.xml2
-rw-r--r--res/layout-xlarge/in_line_setting_picker.xml4
-rw-r--r--res/layout-xlarge/other_setting_popup.xml3
-rw-r--r--res/layout-xlarge/setting_item.xml5
4 files changed, 9 insertions, 5 deletions
diff --git a/res/layout-xlarge/basic_setting_popup.xml b/res/layout-xlarge/basic_setting_popup.xml
index 263d25a..d18dae2 100644
--- a/res/layout-xlarge/basic_setting_popup.xml
+++ b/res/layout-xlarge/basic_setting_popup.xml
@@ -18,7 +18,7 @@
-->
<com.android.camera.ui.BasicSettingPopup xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="359dp"
+ android:layout_width="410dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
diff --git a/res/layout-xlarge/in_line_setting_picker.xml b/res/layout-xlarge/in_line_setting_picker.xml
index 47cd024..f4ba7a4 100644
--- a/res/layout-xlarge/in_line_setting_picker.xml
+++ b/res/layout-xlarge/in_line_setting_picker.xml
@@ -24,7 +24,9 @@
android:orientation="horizontal"
style="@style/SettingRow">
<TextView android:id="@+id/title"
- style="@style/SettingPickerText" />
+ style="@style/SettingPickerText"
+ android:layout_width="220dp"
+ android:layout_height="match_parent" />
<Button android:id="@+id/decrement"
android:layout_width="72dp"
diff --git a/res/layout-xlarge/other_setting_popup.xml b/res/layout-xlarge/other_setting_popup.xml
index a916165..4dfbe62 100644
--- a/res/layout-xlarge/other_setting_popup.xml
+++ b/res/layout-xlarge/other_setting_popup.xml
@@ -37,7 +37,8 @@
style="@style/SettingTitleText" />
</FrameLayout>
- <FrameLayout android:layout_width="570dp"
+ <FrameLayout
+ android:layout_width="590dp"
android:layout_height="wrap_content"
android:background="@drawable/dialog_bottom_holo_dark">
<ListView android:id="@+id/settingList"
diff --git a/res/layout-xlarge/setting_item.xml b/res/layout-xlarge/setting_item.xml
index da54ddc..43e6271 100644
--- a/res/layout-xlarge/setting_item.xml
+++ b/res/layout-xlarge/setting_item.xml
@@ -20,11 +20,12 @@
style="@style/SettingRow">
<TextView android:id="@+id/text"
- style="@style/SettingPickerText"/>
+ style="@style/SettingPickerText"
+ android:layout_width="267dp"
+ android:layout_height="match_parent"/>
<ImageView android:id="@+id/image"
android:layout_width="35dp"
android:layout_height="35dp"
- android:gravity="center"
android:scaleType="fitCenter"
android:adjustViewBounds="true" />
</LinearLayout>