summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorChao Zhang <chaoz@codeaurora.org>2016-05-03 12:46:49 +0800
committerChao Zhang <chaoz@codeaurora.org>2016-05-06 10:48:08 +0800
commit4c8c153f5b4a82ca44297a47301c30ac1ad3d810 (patch)
tree69dbf6d25f96783e242142266d00e391a4b26175 /res/layout
parent44fba2a3719737b4aca0cd4ed7fbac77539a971d (diff)
downloadandroid_packages_apps_Gallery2-4c8c153f5b4a82ca44297a47301c30ac1ad3d810.tar.gz
android_packages_apps_Gallery2-4c8c153f5b4a82ca44297a47301c30ac1ad3d810.tar.bz2
android_packages_apps_Gallery2-4c8c153f5b4a82ca44297a47301c30ac1ad3d810.zip
Gallery2: modify some UI interface according to UI document.
1. Modify layout of actionbar when selected photo; 2. Modify menu string in Video Page; 3. Modify compare button's position in photo editor; 4. Modify bottom panel's height in photo editor; 5. Set video play icon to 48dp in PhotoView; Change-Id: Ic660d5dde87998e87eb02482ac7ba7e2ba2f0bb1 CRs-Fixed: 1010984
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/action_mode.xml11
-rw-r--r--res/layout/filtershow_activity.xml4
-rw-r--r--res/layout/filtershow_bottom_panel.xml2
-rw-r--r--res/layout/filtershow_main_panel.xml2
-rw-r--r--res/layout/photopage_bottom_controls.xml2
5 files changed, 8 insertions, 13 deletions
diff --git a/res/layout/action_mode.xml b/res/layout/action_mode.xml
index f941b6427..ec4704d92 100644
--- a/res/layout/action_mode.xml
+++ b/res/layout/action_mode.xml
@@ -35,15 +35,10 @@
android:textColor="#8A000000"
android:textSize="20sp"
android:singleLine="true"
- android:gravity="left|center_vertical"
- android:paddingEnd="25dip"
+ android:gravity="start|center_vertical"
+ android:paddingEnd="15dip"
+ android:paddingStart="0dp"
android:layout_width="wrap_content"
android:layout_height="match_parent" />
</FrameLayout>
- <ImageView android:layout_marginStart="16dip"
- android:layout_marginEnd="8dip"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:gravity="bottom"
- android:src="@drawable/cab_divider_vertical_dark" />
</LinearLayout>
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 56666ece3..87adf730b 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -51,8 +51,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
- android:layout_marginRight="10dp"
- android:layout_marginTop="104dp"
+ android:layout_marginRight="@dimen/compare_margin_right"
+ android:layout_marginTop="@dimen/compare_margin_top"
android:background="@android:color/transparent"
android:src="@drawable/comparison_before"
android:visibility="visible" />
diff --git a/res/layout/filtershow_bottom_panel.xml b/res/layout/filtershow_bottom_panel.xml
index abefcba39..80efe1a08 100644
--- a/res/layout/filtershow_bottom_panel.xml
+++ b/res/layout/filtershow_bottom_panel.xml
@@ -31,7 +31,7 @@
<com.android.gallery3d.filtershow.CenteredLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/bottom_panel"
android:layout_width="match_parent"
- android:layout_height="48dip"
+ android:layout_height="match_parent"
android:layout_gravity="center|bottom"
android:background="@color/bottom_panel_background_color"
android:orientation="vertical">
diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml
index b9b18a036..5b0510a1c 100644
--- a/res/layout/filtershow_main_panel.xml
+++ b/res/layout/filtershow_main_panel.xml
@@ -47,7 +47,7 @@
<FrameLayout
android:id="@+id/bottom_panel_container"
android:layout_width="match_parent"
- android:layout_height="48dip"
+ android:layout_height="@dimen/bottom_panel_height"
android:visibility="visible"
android:layout_gravity="center"/>
</LinearLayout>
diff --git a/res/layout/photopage_bottom_controls.xml b/res/layout/photopage_bottom_controls.xml
index 3f19af150..f52a704a7 100644
--- a/res/layout/photopage_bottom_controls.xml
+++ b/res/layout/photopage_bottom_controls.xml
@@ -5,7 +5,7 @@
android:layout_height="56dp"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
- android:background="#42000000"
+ android:background="@color/photo_page_bottom_panel"
android:gravity="bottom"
android:orientation="horizontal"
android:visibility="gone" >