diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-08-14 22:29:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-14 22:29:59 +0000 |
| commit | df33ed22a313c8f9dac95b947511ee0677d52dbf (patch) | |
| tree | cb1a267711d55239b4d0ffeb4cee9fac2f2d7869 /res | |
| parent | 3e3e9e219a76e8ef4fb56b8ef4c6e0bac06c6cd1 (diff) | |
| parent | cc93b34f2cb66379b553972b120ea3e0cd90175e (diff) | |
| download | android_packages_apps_Gallery2-df33ed22a313c8f9dac95b947511ee0677d52dbf.tar.gz android_packages_apps_Gallery2-df33ed22a313c8f9dac95b947511ee0677d52dbf.tar.bz2 android_packages_apps_Gallery2-df33ed22a313c8f9dac95b947511ee0677d52dbf.zip | |
Merge "Fix layout in editor panels in landscape" into gb-ub-photos-carlsbad
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/filtershow_editor_panel.xml | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/res/layout-land/filtershow_editor_panel.xml b/res/layout-land/filtershow_editor_panel.xml index cafafde1b..e49725236 100644 --- a/res/layout-land/filtershow_editor_panel.xml +++ b/res/layout-land/filtershow_editor_panel.xml @@ -36,6 +36,13 @@ android:layout_alignParentTop="true" /> + <View + android:id="@+id/bottomControlLineBottom" + android:background="@color/toolbar_separation_line" + android:layout_height="1dip" + android:layout_width="match_parent" + android:layout_alignParentBottom="true" + /> <LinearLayout android:id="@+id/applyBar" android:layout_width="match_parent" @@ -44,7 +51,7 @@ android:orientation="horizontal" android:baselineAligned="false" android:visibility="visible" - android:layout_alignParentBottom="true" + android:layout_above="@id/bottomControlLineBottom" > <ImageButton @@ -101,13 +108,20 @@ android:src="@drawable/ic_menu_done_holo_light" android:textSize="18dip"/> </LinearLayout> + <View + android:id="@+id/bottomControlLineTop" + android:background="@color/toolbar_separation_line" + android:layout_height="1dip" + android:layout_width="match_parent" + android:layout_above="@id/applyBar" + /> <LinearLayout android:id="@+id/controlArea" android:layout_width="match_parent" android:layout_height="fill_parent" android:orientation="vertical" - android:layout_above="@id/applyBar" + android:layout_above="@id/bottomControlLineTop" android:layout_below="@id/toggle_state" android:gravity="bottom" android:visibility="visible"> |