diff options
| -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 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 14 |
7 files changed, 22 insertions, 14 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" > diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java index 5bb0e5733..82012b992 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java @@ -117,7 +117,7 @@ public class FilterRepresentation implements Cloneable { } public boolean supportsPartialRendering() { - return mSupportsPartialRendering; + return false && mSupportsPartialRendering; // disable for now } public void setSupportsPartialRendering(boolean value) { diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java index 3530935e1..ed0a72a33 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java @@ -554,20 +554,24 @@ public class ImagePreset { if (imageStateAdapter == null) { return; } - imageStateAdapter.clear(); - imageStateAdapter.addOriginal(); + Vector<State> states = new Vector<State>(); // TODO: supports Geometry representations in the state panel. if (false && mGeoData != null && mGeoData.hasModifications()) { State geo = new State("Geometry"); geo.setFilterRepresentation(mGeoData); - imageStateAdapter.add(geo); + states.add(geo); + } + for (FilterRepresentation filter : mFilters) { + State state = new State(filter.getName()); + state.setFilterRepresentation(filter); + states.add(state); } - imageStateAdapter.addAll(mFilters); if (mBorder != null) { State border = new State(mBorder.getName()); border.setFilterRepresentation(mBorder); - imageStateAdapter.add(border); + states.add(border); } + imageStateAdapter.fill(states); } public void setPartialRendering(boolean partialRendering, Rect bounds) { |