diff options
| -rw-r--r-- | res/layout/camera_filmstrip.xml | 1 | ||||
| -rw-r--r-- | res/layout/filtershow_export_dialog.xml | 80 | ||||
| -rw-r--r-- | res/values/filtershow_strings.xml | 4 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/pipeline/HighresRenderingRequestTask.java | 2 |
4 files changed, 86 insertions, 1 deletions
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml index 85f04125d..935f38ae8 100644 --- a/res/layout/camera_filmstrip.xml +++ b/res/layout/camera_filmstrip.xml @@ -35,6 +35,7 @@ android:paddingLeft="5dp" android:paddingRight="5dp" android:paddingTop="5dp" + android:visibility="gone" android:src="@drawable/ic_view_photosphere" /> </FrameLayout>
\ No newline at end of file diff --git a/res/layout/filtershow_export_dialog.xml b/res/layout/filtershow_export_dialog.xml new file mode 100644 index 000000000..202107504 --- /dev/null +++ b/res/layout/filtershow_export_dialog.xml @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:divider="?android:dividerVertical" + android:showDividers="middle"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal|center_vertical" + android:layout_margin="7dp" + android:text="@string/select_compression"/> + + <LinearLayout + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <SeekBar + android:id="@+id/qualitySeekBar" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="3" + android:layout_margin="7dp" + android:max="100" + android:progress="100"/> + + <TextView + android:id="@+id/qualityTextView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_marginLeft="7dp" + android:layout_gravity="center_vertical|center_horizontal"/> + + </LinearLayout> + + <LinearLayout + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="48dp" + style="?android:attr/buttonBarStyle"> + + <Button + android:id="@+id/cancel" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:text="@string/cancel" + style="?android:attr/buttonBarButtonStyle" /> + + <Button + android:id="@+id/done" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:text="@string/done" + style="?android:attr/buttonBarButtonStyle"/> + + </LinearLayout> + +</LinearLayout> diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index 68eca34f3..c4546c89e 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -49,6 +49,10 @@ <string name="hide_imagestate_panel">Hide Applied Effects</string> <!-- Text for the menu item to export a flattened photo[CHAR LIMIT=30] --> <string name="export_flattened">Export Flattened Image</string> + <!-- Text for selecting export image quality [CHAR LIMIT=100] --> + <string name="select_compression">Select output quality.</string> + <!-- Text for quality value tag [CHAR LIMIT=30] --> + <string name="quality">Quality</string> <!-- Name for the overflow menu item for settings [CHAR LIMIT=20] --> <string name="menu_settings">Settings</string> diff --git a/src/com/android/gallery3d/filtershow/pipeline/HighresRenderingRequestTask.java b/src/com/android/gallery3d/filtershow/pipeline/HighresRenderingRequestTask.java index af9f79ce3..5a0eb4d45 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/HighresRenderingRequestTask.java +++ b/src/com/android/gallery3d/filtershow/pipeline/HighresRenderingRequestTask.java @@ -70,7 +70,7 @@ public class HighresRenderingRequestTask extends ProcessingTask { public Result doInBackground(Request message) { RenderingRequest request = ((Render) message).request; RenderResult result = null; - mHighresPreviewPipeline.render(request); + mHighresPreviewPipeline.renderHighres(request); result = new RenderResult(); result.request = request; return result; |