summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-03-17 20:51:30 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-03-17 20:51:30 -0700
commite9f453cea2aff1f9ae4cb996fe6f64772b7a9090 (patch)
treed5cc65c74765b0a8f67a36ad307c2563e7c35b7b /res
parent26223608a193d137ea4bcf3d3d5d2ce51fe4be44 (diff)
parentd9f2785ed1322f100137e2e9f76ee2e509a6fd4a (diff)
downloadandroid_packages_apps_Gallery2-e9f453cea2aff1f9ae4cb996fe6f64772b7a9090.tar.gz
android_packages_apps_Gallery2-e9f453cea2aff1f9ae4cb996fe6f64772b7a9090.tar.bz2
android_packages_apps_Gallery2-e9f453cea2aff1f9ae4cb996fe6f64772b7a9090.zip
Merge "Gallery2: Adjust the layout of bottom controls of photopage" into android_ui.lnx.1.2-dev
Diffstat (limited to 'res')
-rw-r--r--res/layout/photopage_bottom_controls.xml26
1 files changed, 10 insertions, 16 deletions
diff --git a/res/layout/photopage_bottom_controls.xml b/res/layout/photopage_bottom_controls.xml
index fc9882280..3f19af150 100644
--- a/res/layout/photopage_bottom_controls.xml
+++ b/res/layout/photopage_bottom_controls.xml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/photopage_bottom_controls"
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_alignParentBottom="true"
+ android:layout_gravity="bottom"
android:background="#42000000"
+ android:gravity="bottom"
android:orientation="horizontal"
android:visibility="gone" >
@@ -12,12 +14,9 @@
android:id="@+id/photopage_bottom_control_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentStart="true"
- android:layout_centerVertical="true"
+ android:layout_gravity="center_vertical"
+ android:layout_weight="1"
android:background="@null"
- android:paddingStart="20dp"
- android:layout_marginBottom="20dp"
android:src="@drawable/edit"
android:visibility="gone" />
@@ -25,10 +24,8 @@
android:id="@+id/photopage_bottom_control_share"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_marginBottom="20dp"
- android:layout_centerInParent="true"
- android:layout_centerVertical="true"
+ android:layout_gravity="center_vertical"
+ android:layout_weight="1"
android:background="@null"
android:src="@drawable/share"
android:visibility="gone" />
@@ -37,13 +34,10 @@
android:id="@+id/photopage_bottom_control_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- android:layout_marginBottom="20dp"
+ android:layout_gravity="center_vertical"
+ android:layout_weight="1"
android:background="@null"
- android:paddingEnd="20dp"
android:src="@drawable/delete"
android:visibility="gone" />
-</RelativeLayout>
+</LinearLayout>