diff options
author | nicolasroard <nicolasroard@google.com> | 2013-05-01 20:30:04 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-01 20:30:04 -0700 |
commit | 4f347d06a1825b4891c97c778a03643587ed5f51 (patch) | |
tree | 4d40328def05636805f65005a428164c7bf8b3b2 /res/layout | |
parent | 92351fbc7c9829c3c1317334ed6c5d41ce8f749c (diff) | |
parent | 7c5349cd12130c41e56f061f369a0babbaa9107c (diff) | |
download | android_packages_apps_Snap-4f347d06a1825b4891c97c778a03643587ed5f51.tar.gz android_packages_apps_Snap-4f347d06a1825b4891c97c778a03643587ed5f51.tar.bz2 android_packages_apps_Snap-4f347d06a1825b4891c97c778a03643587ed5f51.zip |
am 00259461: Fix UI
* commit '00259461be82e601b58d3e970afbf0c012c5f3e7':
Fix UI
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/filtershow_editor_panel.xml | 4 | ||||
-rw-r--r-- | res/layout/filtershow_main_panel.xml | 1 | ||||
-rw-r--r-- | res/layout/filtershow_state_panel_new.xml | 11 | ||||
-rw-r--r-- | res/layout/filtershow_tiny_planet_editor.xml | 2 | ||||
-rw-r--r-- | res/layout/filtershow_vignette_editor.xml | 2 |
5 files changed, 12 insertions, 8 deletions
diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml index c559319d4..ef2fb8bfc 100644 --- a/res/layout/filtershow_editor_panel.xml +++ b/res/layout/filtershow_editor_panel.xml @@ -109,9 +109,7 @@ <FrameLayout android:id="@+id/state_panel_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:visibility="visible" - android:layout_gravity="top" - android:layout_weight="1" /> + android:visibility="visible" /> </LinearLayout> diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml index 768d3df25..53691d319 100644 --- a/res/layout/filtershow_main_panel.xml +++ b/res/layout/filtershow_main_panel.xml @@ -45,6 +45,7 @@ <com.android.gallery3d.filtershow.CenteredLinearLayout xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" + android:id="@+id/bottom_panel" android:layout_width="match_parent" android:layout_height="48dip" android:layout_gravity="center|bottom" diff --git a/res/layout/filtershow_state_panel_new.xml b/res/layout/filtershow_state_panel_new.xml index ea891a309..d2d59abc8 100644 --- a/res/layout/filtershow_state_panel_new.xml +++ b/res/layout/filtershow_state_panel_new.xml @@ -2,9 +2,15 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" - android:orientation="horizontal" + android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:background="@color/background_main_toolbar"> + + <View + android:background="@color/toolbar_separation_line" + android:layout_height="1dip" + android:layout_width="match_parent"/> <HorizontalScrollView android:layout_width="match_parent" @@ -23,5 +29,4 @@ </HorizontalScrollView> - </LinearLayout> diff --git a/res/layout/filtershow_tiny_planet_editor.xml b/res/layout/filtershow_tiny_planet_editor.xml index 61e0cf565..fd89f9966 100644 --- a/res/layout/filtershow_tiny_planet_editor.xml +++ b/res/layout/filtershow_tiny_planet_editor.xml @@ -17,7 +17,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:iconbutton="http://schemas.android.com/apk/res/com.android.gallery3d" - android:id="@+id/tinyPlanetEditor" + android:id="@+id/tinyPlanetEditor" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" > diff --git a/res/layout/filtershow_vignette_editor.xml b/res/layout/filtershow_vignette_editor.xml index 72a615fb4..9c9b4cb59 100644 --- a/res/layout/filtershow_vignette_editor.xml +++ b/res/layout/filtershow_vignette_editor.xml @@ -17,7 +17,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:iconbutton="http://schemas.android.com/apk/res/com.android.gallery3d" - android:id="@+id/tinyPlanetEditor" + android:id="@+id/vignetteEditor" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" > |