summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2016-01-14 11:36:38 +0100
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-01-15 01:47:05 -0800
commit2233950e703e2532b01f9f2893d9f7d8f5845cb1 (patch)
tree7557bf4eee6074750db8913fc4aa008de36c2280 /res
parent607a2f0b99886cb07b2d2b042d38bfb26da0f166 (diff)
downloadandroid_packages_apps_Snap-2233950e703e2532b01f9f2893d9f7d8f5845cb1.tar.gz
android_packages_apps_Snap-2233950e703e2532b01f9f2893d9f7d8f5845cb1.tar.bz2
android_packages_apps_Snap-2233950e703e2532b01f9f2893d9f7d8f5845cb1.zip
CameraActivity: Don't hide navigation bar
* Make it transparent instead. Change-Id: I08b06ac72d88aaf62ae7f52a3dde9ba865bc3542
Diffstat (limited to 'res')
-rw-r--r--res/layout/camera_filmstrip.xml3
-rw-r--r--res/layout/filmstrip_bottom_controls.xml1
-rw-r--r--res/values/styles.xml1
3 files changed, 4 insertions, 1 deletions
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml
index 2075a94f4..df6b7a267 100644
--- a/res/layout/camera_filmstrip.xml
+++ b/res/layout/camera_filmstrip.xml
@@ -23,7 +23,8 @@
<com.android.camera.ui.FilmStripView
android:id="@+id/filmstrip_view"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:clipToPadding="false" />
<!--com.android.camera.ui.FitSystemUiFrameLayout-->
<FrameLayout
diff --git a/res/layout/filmstrip_bottom_controls.xml b/res/layout/filmstrip_bottom_controls.xml
index 1ad07aee9..019ae32fd 100644
--- a/res/layout/filmstrip_bottom_controls.xml
+++ b/res/layout/filmstrip_bottom_controls.xml
@@ -22,6 +22,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:padding="10dp"
+ android:fitsSystemWindows="true"
android:visibility="visible" >
<ImageButton
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8d212b611..d014382b4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -25,6 +25,7 @@
<item name="android:windowTitleSize">0dp</item>
<item name="android:windowActionBarOverlay">true</item>
<item name="android:windowBackground">@android:color/black</item>
+ <item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:colorBackground">@android:color/black</item>
<item name="android:colorBackgroundCacheHint">@android:color/black</item>
<item name="android:actionBarStyle">@style/Material.ActionBar</item>