summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/photo_module.xml4
-rw-r--r--res/values/colors.xml3
-rw-r--r--res/values/dimens.xml4
3 files changed, 11 insertions, 0 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index 5047112a0..9407e1af9 100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -124,12 +124,16 @@
android:background="@android:color/white"
android:visibility="gone"
android:alpha="0" />
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<ViewStub android:id="@+id/face_view_stub"
android:inflatedId="@+id/face_view"
android:layout="@layout/face_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"/>
+ </FrameLayout>
<com.android.camera.ui.RenderOverlay
android:id="@+id/render_overlay"
android:layout_width="match_parent"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index cd7f5977d..dba33f40d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -73,4 +73,7 @@
<color name="setting_color">#ff10aadc</color>
<color name="setting_color_light">#ffade9fd</color>
<color name="list_divider_color">#d8ababab</color>
+
+ <color name="camera_control_bg_opaque">#ff191919</color>
+ <color name="camera_control_bg_transparent">#4d191919</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index dac42d22e..d162adf17 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -166,4 +166,8 @@
<dimen name="filter_mode_padding">10dp</dimen>
<dimen name="remaining_photos_margin">67dp</dimen>
+
+ <!-- Margins for 4:3 preview on 16:9 screen with 640dp height -->
+ <dimen name="preview_top_margin">57dp</dimen>
+ <dimen name="preview_bottom_margin">103dp</dimen>
</resources>