summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2016-01-14 14:50:54 +0100
committerDanny Baumann <dannybaumann@web.de>2016-01-20 23:30:41 -0800
commit96b38fddc1aa487755e6c186df9e18ab70165d38 (patch)
treefe50ff0efc85ae3a042f83e89dd915d143e53000 /res
parente1abba9f64f2141e9ab08946f751e0ccb6ed13ef (diff)
downloadandroid_packages_apps_Snap-96b38fddc1aa487755e6c186df9e18ab70165d38.tar.gz
android_packages_apps_Snap-96b38fddc1aa487755e6c186df9e18ab70165d38.tar.bz2
android_packages_apps_Snap-96b38fddc1aa487755e6c186df9e18ab70165d38.zip
Improve CameraControls layout code.
Improve control placement, and clean up redundant code. Change-Id: Ia650b09be48a81d34241f7ab22c6b3db5032ada7
Diffstat (limited to 'res')
-rw-r--r--res/layout-port/camera_controls.xml8
-rw-r--r--res/values/dimens.xml2
2 files changed, 4 insertions, 6 deletions
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index e65567830..525ffc326 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -61,6 +61,7 @@
android:id="@+id/preview_thumb"
android:layout_width="@dimen/capture_size"
android:layout_height="@dimen/capture_size"
+ android:layout_margin="12dp"
android:layout_gravity="top|right"
android:background="@android:color/transparent"
android:contentDescription="@string/switch_photo_filmstrip"
@@ -96,16 +97,13 @@
android:id="@+id/remaining_photos_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@android:color/transparent"
- android:textColor="@android:color/white"
- android:visibility="gone" />
+ android:textColor="@android:color/white" />
<ImageView
android:id="@+id/remaining_photos_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/remaining_sheets"
- android:visibility="gone" />
+ android:src="@drawable/remaining_sheets" />
</LinearLayout>
</com.android.camera.ui.CameraControls>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 15dca9df1..ba25dd1ba 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -169,7 +169,7 @@
<dimen name="filter_mode_width">100dp</dimen>
<dimen name="filter_mode_padding">10dp</dimen>
- <dimen name="remaining_photos_margin">67dp</dimen>
+ <dimen name="remaining_photos_margin">56dp</dimen>
<!-- Margins for 4:3 preview on 16:9 screen with 640dp height -->
<dimen name="preview_top_margin">57dp</dimen>