diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/do_not_show_again_dialog.xml | 48 | ||||
| -rw-r--r-- | res/layout/filtershow_actionbar_trueportrait.xml | 46 | ||||
| -rw-r--r-- | res/layout/filtershow_actionbar_trueportrait_fusion.xml | 56 | ||||
| -rw-r--r-- | res/layout/filtershow_actionbar_trueportrait_mask.xml | 80 | ||||
| -rw-r--r-- | res/layout/filtershow_bottom_panel.xml | 10 | ||||
| -rw-r--r-- | res/layout/filtershow_seekbar.xml | 32 | ||||
| -rw-r--r-- | res/layout/filtershow_trueportrait_editor_panel.xml | 96 | ||||
| -rw-r--r-- | res/layout/filtershow_trueportrait_mask_editor.xml | 44 |
8 files changed, 396 insertions, 16 deletions
diff --git a/res/layout/do_not_show_again_dialog.xml b/res/layout/do_not_show_again_dialog.xml new file mode 100644 index 000000000..8ddfdc191 --- /dev/null +++ b/res/layout/do_not_show_again_dialog.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2016, The Linux Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <TextView + android:id="@+id/message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="8dp" /> + + <CheckBox + android:id="@+id/do_not_show_chk" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:text="@string/do_not_show_again" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/filtershow_actionbar_trueportrait.xml b/res/layout/filtershow_actionbar_trueportrait.xml new file mode 100644 index 000000000..11e81a83f --- /dev/null +++ b/res/layout/filtershow_actionbar_trueportrait.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2016, The Linux Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" > + + <ImageButton + android:id="@+id/editMask" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentRight="true" + android:background="@android:color/transparent" + android:paddingEnd="16dp" + android:paddingStart="16dp" + android:src="@drawable/tp_touch_up" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/filtershow_actionbar_trueportrait_fusion.xml b/res/layout/filtershow_actionbar_trueportrait_fusion.xml new file mode 100644 index 000000000..44e151b01 --- /dev/null +++ b/res/layout/filtershow_actionbar_trueportrait_fusion.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2016, The Linux Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" > + + <ImageButton + android:id="@+id/pick_underlay" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentRight="true" + android:background="@android:color/transparent" + android:paddingEnd="16dp" + android:paddingStart="16dp" + android:src="@drawable/tp_bg_select" /> + + <ImageButton + android:id="@+id/editMask" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_toLeftOf="@id/pick_underlay" + android:background="@android:color/transparent" + android:paddingEnd="16dp" + android:paddingStart="16dp" + android:src="@drawable/tp_touch_up" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/filtershow_actionbar_trueportrait_mask.xml b/res/layout/filtershow_actionbar_trueportrait_mask.xml new file mode 100644 index 000000000..b922dbd2d --- /dev/null +++ b/res/layout/filtershow_actionbar_trueportrait_mask.xml @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2016, The Linux Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" > + + <ImageButton + android:id="@+id/maskUndo" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentLeft="true" + android:background="@android:color/transparent" + android:paddingEnd="16dp" + android:paddingStart="16dp" + android:src="@drawable/tp_undo" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_centerInParent="true" > + + <ToggleButton + android:id="@+id/maskForeground" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:paddingEnd="16dp" + android:paddingStart="16dp" + android:textOff="@string/foreground" + android:textOn="@string/foreground" /> + + <ToggleButton + android:id="@+id/maskBackground" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:paddingEnd="16dp" + android:paddingStart="16dp" + android:textOff="@string/background" + android:textOn="@string/background" /> + </LinearLayout> + + <ImageButton + android:id="@+id/maskHelp" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentRight="true" + android:background="@android:color/transparent" + android:paddingEnd="16dp" + android:paddingStart="16dp" + android:src="@drawable/tp_help" /> + +</RelativeLayout> diff --git a/res/layout/filtershow_bottom_panel.xml b/res/layout/filtershow_bottom_panel.xml index 81a9d967b..f7c220833 100644 --- a/res/layout/filtershow_bottom_panel.xml +++ b/res/layout/filtershow_bottom_panel.xml @@ -134,5 +134,15 @@ android:padding="2dip" android:scaleType="centerInside" android:src="@drawable/seestraight" /> + + <ImageButton + android:id="@+id/truePortraitButton" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:background="@android:color/transparent" + android:padding="2dip" + android:scaleType="centerInside" + android:src="@drawable/trueportrait_background" /> </LinearLayout> </com.android.gallery3d.filtershow.CenteredLinearLayout>
\ No newline at end of file diff --git a/res/layout/filtershow_seekbar.xml b/res/layout/filtershow_seekbar.xml index 8cb5cd979..12f8a7cbb 100644 --- a/res/layout/filtershow_seekbar.xml +++ b/res/layout/filtershow_seekbar.xml @@ -15,12 +15,11 @@ limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:theme="@android:style/Theme.DeviceDefault" android:id="@+id/top" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" android:visibility="visible" > <ImageButton @@ -28,26 +27,27 @@ android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/cancel" - android:layout_gravity="center_vertical" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true" android:background="?android:attr/actionBarItemBackground" /> - <SeekBar - android:id="@+id/primarySeekBar" - style="@style/FilterShowSlider" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center_vertical|center_horizontal" - android:layout_toRightOf="@+id/tvFilterName" - android:layout_marginStart="10dp" - android:layout_marginEnd="10dp" - android:layout_weight="1" /> - <ImageButton android:id="@+id/slider_save" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/done" - android:layout_gravity="center_vertical" + android:layout_centerVertical="true" + android:layout_alignParentRight="true" android:background="?android:attr/actionBarItemBackground" /> -</LinearLayout> + <SeekBar + android:id="@+id/primarySeekBar" + style="@style/FilterShowSlider" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_centerVertical="true" + android:layout_toRightOf="@id/slider_cancel" + android:layout_toLeftOf="@id/slider_save" + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp"/> +</RelativeLayout> diff --git a/res/layout/filtershow_trueportrait_editor_panel.xml b/res/layout/filtershow_trueportrait_editor_panel.xml new file mode 100644 index 000000000..13b8212ac --- /dev/null +++ b/res/layout/filtershow_trueportrait_editor_panel.xml @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2016, The Linux Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/transparent" + android:orientation="vertical" > + + <FrameLayout + android:id="@+id/bottom_panel" + android:layout_width="match_parent" + android:layout_height="@dimen/category_actionbar_panel_height" + android:background="@color/edit_actionbar_background" > + + <ImageButton + android:id="@+id/cancel" + android:layout_width="@dimen/category_actionbar_panel_height" + android:layout_height="@dimen/category_actionbar_panel_height" + android:background="@color/edit_actionbar_background" + android:src="@drawable/cancel" /> + + <LinearLayout + android:id="@+id/brush_size" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:clickable="true"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:padding="3dp" + android:text="@string/brush_size" + android:textColor="#fff" + android:textSize="16sp" /> + <ImageView + android:id="@+id/brush_size_sm" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:padding="3dp" + android:src="@drawable/tp_brush_sm" /> + <ImageView + android:id="@+id/brush_size_med" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:padding="3dp" + android:src="@drawable/tp_brush_med" /> + <ImageView + android:id="@+id/brush_size_large" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:padding="3dp" + android:src="@drawable/tp_brush_large" /> + </LinearLayout> + + <ImageButton + android:id="@+id/done" + android:layout_width="@dimen/category_actionbar_panel_height" + android:layout_height="@dimen/category_actionbar_panel_height" + android:layout_gravity="right" + android:background="@color/edit_actionbar_background" + android:src="@drawable/done" /> + </FrameLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/filtershow_trueportrait_mask_editor.xml b/res/layout/filtershow_trueportrait_mask_editor.xml new file mode 100644 index 000000000..1de55d83c --- /dev/null +++ b/res/layout/filtershow_trueportrait_mask_editor.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2016, The Linux Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:iconbutton="http://schemas.android.com/apk/res/com.android.gallery3d" + android:id="@+id/truePortraitMaskEditor" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingBottom="@dimen/category_actionbar_panel_height" + android:paddingTop="@dimen/category_actionbar_panel_height" > + + <com.android.gallery3d.filtershow.imageshow.ImageTruePortraitMask + android:id="@+id/imageTruePortraitMask" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + +</FrameLayout> |