summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2010-12-09 17:51:53 +0800
committerChung-yih Wang <cywang@google.com>2010-12-09 18:18:48 +0800
commit587ed2356a337e809095ae44f22b5e85aad54583 (patch)
tree6c096ade53f0a89daf6597641604605abe84e387
parentac071ecc8a6b7a88ce0be1c11142fec8529ad80c (diff)
downloadpackages_apps_LegacyCamera-587ed2356a337e809095ae44f22b5e85aad54583.zip
packages_apps_LegacyCamera-587ed2356a337e809095ae44f22b5e85aad54583.tar.gz
packages_apps_LegacyCamera-587ed2356a337e809095ae44f22b5e85aad54583.tar.bz2
Fix the setting icon cut issue.
+Fix the dividers of other settings. Change-Id: Ie74333cc52273536a4c733b137fba78733decc08
-rw-r--r--res/layout-xlarge/in_line_setting_picker.xml6
-rw-r--r--res/layout-xlarge/other_setting_popup.xml4
-rw-r--r--res/layout-xlarge/setting_item.xml6
3 files changed, 7 insertions, 9 deletions
diff --git a/res/layout-xlarge/in_line_setting_picker.xml b/res/layout-xlarge/in_line_setting_picker.xml
index cb39319..9b05e56 100644
--- a/res/layout-xlarge/in_line_setting_picker.xml
+++ b/res/layout-xlarge/in_line_setting_picker.xml
@@ -20,15 +20,11 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
android:orientation="vertical">
<ImageView android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/divider_horizontal_holo_dark"
- android:gravity="center"
- android:scaleType="fitXY"
- android:adjustViewBounds="true" />
+ android:scaleType="fitXY" />
<LinearLayout android:orientation="horizontal"
style="@style/SettingRow">
<TextView android:id="@+id/title"
diff --git a/res/layout-xlarge/other_setting_popup.xml b/res/layout-xlarge/other_setting_popup.xml
index 16a773d..aa7d0dd 100644
--- a/res/layout-xlarge/other_setting_popup.xml
+++ b/res/layout-xlarge/other_setting_popup.xml
@@ -68,6 +68,10 @@
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_jpegquality_key"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ <ImageView android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:src="@drawable/divider_horizontal_holo_dark"
+ android:scaleType="fitXY" />
<TextView
android:text="@string/pref_restore_detail"
android:gravity="center"
diff --git a/res/layout-xlarge/setting_item.xml b/res/layout-xlarge/setting_item.xml
index 3e0df71..3db0f2d 100644
--- a/res/layout-xlarge/setting_item.xml
+++ b/res/layout-xlarge/setting_item.xml
@@ -23,9 +23,7 @@
<ImageView android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/divider_horizontal_holo_dark"
- android:gravity="center"
- android:scaleType="fitXY"
- android:adjustViewBounds="true" />
+ android:scaleType="fitXY" />
<LinearLayout android:id="@+id/setting_row"
style="@style/SettingRow">
@@ -35,7 +33,7 @@
<ImageView android:id="@+id/image"
android:layout_width="35dp"
android:layout_height="35dp"
- android:layout_marginRight="14dp"
+ android:layout_marginRight="35dp"
android:gravity="center"
android:scaleType="fitCenter"
android:adjustViewBounds="true" />