summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
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/layout/list_menu_item.xml50
-rw-r--r--res/values/styles.xml1
4 files changed, 31 insertions, 24 deletions
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml
index cb49367d0..30da433a3 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 ef370a327..2d6db81d6 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/layout/list_menu_item.xml b/res/layout/list_menu_item.xml
index 45ab11f96..36e41d2a5 100644
--- a/res/layout/list_menu_item.xml
+++ b/res/layout/list_menu_item.xml
@@ -28,37 +28,41 @@
-->
<com.android.camera.ui.ListMenuItem xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
+ android:layout_height="@dimen/setting_row_height"
android:background="@drawable/setting_list_item_bg"
- android:padding="5dip" >
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip" >
<ImageView
android:id="@+id/list_image"
android:layout_width="@dimen/setting_item_icon_width"
android:layout_height="@dimen/setting_item_icon_width"
- android:layout_alignParentStart="true"
- android:layout_marginEnd="15dp"
- android:layout_centerVertical="true"
- android:gravity="center" />
+ android:layout_marginRight="16dp" />
- <TextView
- android:id="@+id/title"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_toEndOf="@+id/list_image"
- android:textColor="@android:color/white"
- android:textStyle="bold" />
+ android:orientation="vertical">
- <TextView
- android:id="@+id/current_setting"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/title"
- android:layout_marginTop="1dip"
- android:layout_toEndOf="@+id/list_image"
- android:text="@string/crop_save"
- android:textColor="@color/white"
- android:textSize="10dip"
- android:textStyle="bold" />
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="@android:color/white"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/current_setting"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="1dip"
+ android:text="@string/crop_save"
+ android:textColor="@color/white"
+ android:textSize="10dip"
+ android:textStyle="bold" />
+
+ </LinearLayout>
</com.android.camera.ui.ListMenuItem>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3e3ef161d..50a279a4a 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>