summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-08-05 22:57:39 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-08-05 22:57:39 -0700
commita7444215df8b707c4ccd505805d9e85b59266596 (patch)
tree32ae7df59fbf158f258a5a2ebeda7bbc9221768a
parent71c704a10909735e1323e767f04ab8be8dcca983 (diff)
parent2911a2d53dd329c72d1c593c9603189e88a35ecb (diff)
downloadandroid_packages_apps_Snap-a7444215df8b707c4ccd505805d9e85b59266596.tar.gz
android_packages_apps_Snap-a7444215df8b707c4ccd505805d9e85b59266596.tar.bz2
android_packages_apps_Snap-a7444215df8b707c4ccd505805d9e85b59266596.zip
Merge "SnapdragonCamera: Modify paddings and size of menus"
-rw-r--r--res/layout/list_menu_item.xml2
-rw-r--r--res/values/styles.xml2
-rw-r--r--src/com/android/camera/CameraActivity.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/res/layout/list_menu_item.xml b/res/layout/list_menu_item.xml
index fc29f3cba..c7bfa8684 100644
--- a/res/layout/list_menu_item.xml
+++ b/res/layout/list_menu_item.xml
@@ -37,7 +37,7 @@
android:layout_width="@dimen/setting_item_icon_width"
android:layout_height="@dimen/setting_item_icon_width"
android:layout_alignParentLeft="true"
- android:layout_marginRight="20dp"
+ android:layout_marginRight="15dp"
android:gravity="center" />
<TextView
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bd971d5a2..f893aaa48 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -120,7 +120,7 @@
<item name="android:orientation">horizontal</item>
<item name="android:layout_width">3000dp</item>
<item name="android:layout_height">@dimen/setting_row_height</item>
- <item name="android:paddingLeft">10dp</item>
+ <item name="android:paddingLeft">4dp</item>
<item name="android:paddingRight">@dimen/setting_item_list_margin</item>
<item name="android:background">@drawable/setting_picker</item>
</style>
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 63a38f0a4..3f845db05 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1579,7 +1579,7 @@ public class CameraActivity extends Activity
int lower = Math.min(width, height);
- int offset = lower * 10 / 100;
+ int offset = lower * 7 / 100;
SETTING_LIST_WIDTH_1 = lower / 2 + offset;
SETTING_LIST_WIDTH_2 = lower / 2 - offset;
registerSDcardMountedReceiver();