diff options
| author | Joey Rizzoli <joey@cyanogenmoditalia.it> | 2016-06-11 14:54:50 +0200 |
|---|---|---|
| committer | Joey Rizzoli <joey@cyanogenmoditalia.it> | 2016-06-11 15:11:38 +0200 |
| commit | 00da1b0964172c9fc612dd036232349e3b587d9f (patch) | |
| tree | 4028ff84f7d165e57af2c43bb418c09912e5e007 | |
| parent | 64df2e40a66493704d5398d1bd953c378b3bdee4 (diff) | |
| download | android_packages_apps_Gallery2-staging/cm-13.0.tar.gz android_packages_apps_Gallery2-staging/cm-13.0.tar.bz2 android_packages_apps_Gallery2-staging/cm-13.0.zip | |
Gallery2: update editor icons and layoutsstaging/cm-13.0
Also make frames avaiable back because frames are cool.
Everyone loves frames.
Change-Id: If9fa3ac8e4d76be6a19feae501b4ac241776ce58
Signed-off-by: Joey Rizzoli <joey@cyanogenmoditalia.it>
78 files changed, 172 insertions, 287 deletions
diff --git a/res/drawable-hdpi/filtershow_button_colors.png b/res/drawable-hdpi/filtershow_button_colors.png Binary files differnew file mode 100644 index 000000000..c8aa20ca2 --- /dev/null +++ b/res/drawable-hdpi/filtershow_button_colors.png diff --git a/res/drawable-hdpi/filtershow_button_colors_sharpen.png b/res/drawable-hdpi/filtershow_button_colors_sharpen.png Binary files differindex 2835b9589..113e63c47 100644 --- a/res/drawable-hdpi/filtershow_button_colors_sharpen.png +++ b/res/drawable-hdpi/filtershow_button_colors_sharpen.png diff --git a/res/drawable-hdpi/filtershow_button_contrast.png b/res/drawable-hdpi/filtershow_button_contrast.png Binary files differnew file mode 100644 index 000000000..61abd2782 --- /dev/null +++ b/res/drawable-hdpi/filtershow_button_contrast.png diff --git a/res/drawable-hdpi/filtershow_button_exposure.png b/res/drawable-hdpi/filtershow_button_exposure.png Binary files differnew file mode 100644 index 000000000..3ec16e4ea --- /dev/null +++ b/res/drawable-hdpi/filtershow_button_exposure.png diff --git a/res/drawable-hdpi/filtershow_button_geometry_crop.png b/res/drawable-hdpi/filtershow_button_geometry_crop.png Binary files differnew file mode 100644 index 000000000..9bfca3581 --- /dev/null +++ b/res/drawable-hdpi/filtershow_button_geometry_crop.png diff --git a/res/drawable-hdpi/filtershow_button_geometry_flip.png b/res/drawable-hdpi/filtershow_button_geometry_flip.png Binary files differnew file mode 100644 index 000000000..ae3b9dbfb --- /dev/null +++ b/res/drawable-hdpi/filtershow_button_geometry_flip.png diff --git a/res/drawable-hdpi/filtershow_button_geometry_rotate.png b/res/drawable-hdpi/filtershow_button_geometry_rotate.png Binary files differnew file mode 100644 index 000000000..729423cef --- /dev/null +++ b/res/drawable-hdpi/filtershow_button_geometry_rotate.png diff --git a/res/drawable-hdpi/filtershow_button_geometry_straighten.png b/res/drawable-hdpi/filtershow_button_geometry_straighten.png Binary files differnew file mode 100644 index 000000000..8ec61b1de --- /dev/null +++ b/res/drawable-hdpi/filtershow_button_geometry_straighten.png diff --git a/res/drawable-hdpi/filtershow_button_vibrance.png b/res/drawable-hdpi/filtershow_button_vibrance.png Binary files differnew file mode 100644 index 000000000..c531ee797 --- /dev/null +++ b/res/drawable-hdpi/filtershow_button_vibrance.png diff --git a/res/drawable-hdpi/filtershow_button_wbalance.png b/res/drawable-hdpi/filtershow_button_wbalance.png Binary files differnew file mode 100644 index 000000000..fff837d35 --- /dev/null +++ b/res/drawable-hdpi/filtershow_button_wbalance.png diff --git a/res/drawable-hdpi/filtershow_drawing.png b/res/drawable-hdpi/filtershow_drawing.png Binary files differnew file mode 100644 index 000000000..c8aa20ca2 --- /dev/null +++ b/res/drawable-hdpi/filtershow_drawing.png diff --git a/res/drawable-mdpi/filtershow_button_colors.png b/res/drawable-mdpi/filtershow_button_colors.png Binary files differnew file mode 100644 index 000000000..ae4dd03dc --- /dev/null +++ b/res/drawable-mdpi/filtershow_button_colors.png diff --git a/res/drawable-mdpi/filtershow_button_colors_sharpen.png b/res/drawable-mdpi/filtershow_button_colors_sharpen.png Binary files differindex 9b7152dc8..2fddcc70c 100644 --- a/res/drawable-mdpi/filtershow_button_colors_sharpen.png +++ b/res/drawable-mdpi/filtershow_button_colors_sharpen.png diff --git a/res/drawable-mdpi/filtershow_button_contrast.png b/res/drawable-mdpi/filtershow_button_contrast.png Binary files differnew file mode 100644 index 000000000..b69d51efc --- /dev/null +++ b/res/drawable-mdpi/filtershow_button_contrast.png diff --git a/res/drawable-mdpi/filtershow_button_exposure.png b/res/drawable-mdpi/filtershow_button_exposure.png Binary files differnew file mode 100644 index 000000000..7467987de --- /dev/null +++ b/res/drawable-mdpi/filtershow_button_exposure.png diff --git a/res/drawable-mdpi/filtershow_button_geometry_crop.png b/res/drawable-mdpi/filtershow_button_geometry_crop.png Binary files differnew file mode 100644 index 000000000..8e78d8e9e --- /dev/null +++ b/res/drawable-mdpi/filtershow_button_geometry_crop.png diff --git a/res/drawable-mdpi/filtershow_button_geometry_flip.png b/res/drawable-mdpi/filtershow_button_geometry_flip.png Binary files differnew file mode 100644 index 000000000..ec776f6eb --- /dev/null +++ b/res/drawable-mdpi/filtershow_button_geometry_flip.png diff --git a/res/drawable-mdpi/filtershow_button_geometry_rotate.png b/res/drawable-mdpi/filtershow_button_geometry_rotate.png Binary files differnew file mode 100644 index 000000000..78ba6a2dd --- /dev/null +++ b/res/drawable-mdpi/filtershow_button_geometry_rotate.png diff --git a/res/drawable-mdpi/filtershow_button_geometry_straighten.png b/res/drawable-mdpi/filtershow_button_geometry_straighten.png Binary files differnew file mode 100644 index 000000000..17bfb30f1 --- /dev/null +++ b/res/drawable-mdpi/filtershow_button_geometry_straighten.png diff --git a/res/drawable-mdpi/filtershow_button_vibrance.png b/res/drawable-mdpi/filtershow_button_vibrance.png Binary files differnew file mode 100644 index 000000000..68dfa3b75 --- /dev/null +++ b/res/drawable-mdpi/filtershow_button_vibrance.png diff --git a/res/drawable-mdpi/filtershow_button_wbalance.png b/res/drawable-mdpi/filtershow_button_wbalance.png Binary files differnew file mode 100644 index 000000000..88b3aa757 --- /dev/null +++ b/res/drawable-mdpi/filtershow_button_wbalance.png diff --git a/res/drawable-mdpi/filtershow_drawing.png b/res/drawable-mdpi/filtershow_drawing.png Binary files differnew file mode 100644 index 000000000..ae4dd03dc --- /dev/null +++ b/res/drawable-mdpi/filtershow_drawing.png diff --git a/res/drawable-xhdpi/filtershow_button_colors.png b/res/drawable-xhdpi/filtershow_button_colors.png Binary files differnew file mode 100644 index 000000000..6a7239478 --- /dev/null +++ b/res/drawable-xhdpi/filtershow_button_colors.png diff --git a/res/drawable-xhdpi/filtershow_button_colors_sharpen.png b/res/drawable-xhdpi/filtershow_button_colors_sharpen.png Binary files differindex 951de4e10..206cdd7a6 100644 --- a/res/drawable-xhdpi/filtershow_button_colors_sharpen.png +++ b/res/drawable-xhdpi/filtershow_button_colors_sharpen.png diff --git a/res/drawable-xhdpi/filtershow_button_contrast.png b/res/drawable-xhdpi/filtershow_button_contrast.png Binary files differnew file mode 100644 index 000000000..04e3ca7fc --- /dev/null +++ b/res/drawable-xhdpi/filtershow_button_contrast.png diff --git a/res/drawable-xhdpi/filtershow_button_exposure.png b/res/drawable-xhdpi/filtershow_button_exposure.png Binary files differnew file mode 100644 index 000000000..f6f789a86 --- /dev/null +++ b/res/drawable-xhdpi/filtershow_button_exposure.png diff --git a/res/drawable-xhdpi/filtershow_button_geometry_crop.png b/res/drawable-xhdpi/filtershow_button_geometry_crop.png Binary files differnew file mode 100644 index 000000000..859cdf78b --- /dev/null +++ b/res/drawable-xhdpi/filtershow_button_geometry_crop.png diff --git a/res/drawable-xhdpi/filtershow_button_geometry_flip.png b/res/drawable-xhdpi/filtershow_button_geometry_flip.png Binary files differnew file mode 100644 index 000000000..5717ef76a --- /dev/null +++ b/res/drawable-xhdpi/filtershow_button_geometry_flip.png diff --git a/res/drawable-xhdpi/filtershow_button_geometry_rotate.png b/res/drawable-xhdpi/filtershow_button_geometry_rotate.png Binary files differnew file mode 100644 index 000000000..1f03dc60c --- /dev/null +++ b/res/drawable-xhdpi/filtershow_button_geometry_rotate.png diff --git a/res/drawable-xhdpi/filtershow_button_geometry_straighten.png b/res/drawable-xhdpi/filtershow_button_geometry_straighten.png Binary files differnew file mode 100644 index 000000000..84aa26261 --- /dev/null +++ b/res/drawable-xhdpi/filtershow_button_geometry_straighten.png diff --git a/res/drawable-xhdpi/filtershow_button_vibrance.png b/res/drawable-xhdpi/filtershow_button_vibrance.png Binary files differnew file mode 100644 index 000000000..c6c995bbf --- /dev/null +++ b/res/drawable-xhdpi/filtershow_button_vibrance.png diff --git a/res/drawable-xhdpi/filtershow_button_wbalance.png b/res/drawable-xhdpi/filtershow_button_wbalance.png Binary files differnew file mode 100644 index 000000000..cc94a4cdf --- /dev/null +++ b/res/drawable-xhdpi/filtershow_button_wbalance.png diff --git a/res/drawable-xhdpi/filtershow_drawing.png b/res/drawable-xhdpi/filtershow_drawing.png Binary files differnew file mode 100644 index 000000000..6a7239478 --- /dev/null +++ b/res/drawable-xhdpi/filtershow_drawing.png diff --git a/res/drawable-xxhdpi/filtershow_button_colors.png b/res/drawable-xxhdpi/filtershow_button_colors.png Binary files differnew file mode 100644 index 000000000..300529d20 --- /dev/null +++ b/res/drawable-xxhdpi/filtershow_button_colors.png diff --git a/res/drawable-xxhdpi/filtershow_button_colors_sharpen.png b/res/drawable-xxhdpi/filtershow_button_colors_sharpen.png Binary files differnew file mode 100644 index 000000000..9a80a4cfb --- /dev/null +++ b/res/drawable-xxhdpi/filtershow_button_colors_sharpen.png diff --git a/res/drawable-xxhdpi/filtershow_button_contrast.png b/res/drawable-xxhdpi/filtershow_button_contrast.png Binary files differnew file mode 100644 index 000000000..97645330c --- /dev/null +++ b/res/drawable-xxhdpi/filtershow_button_contrast.png diff --git a/res/drawable-xxhdpi/filtershow_button_exposure.png b/res/drawable-xxhdpi/filtershow_button_exposure.png Binary files differnew file mode 100644 index 000000000..711d8b1e8 --- /dev/null +++ b/res/drawable-xxhdpi/filtershow_button_exposure.png diff --git a/res/drawable-xxhdpi/filtershow_button_geometry_crop.png b/res/drawable-xxhdpi/filtershow_button_geometry_crop.png Binary files differnew file mode 100644 index 000000000..c0246cf2a --- /dev/null +++ b/res/drawable-xxhdpi/filtershow_button_geometry_crop.png diff --git a/res/drawable-xxhdpi/filtershow_button_geometry_flip.png b/res/drawable-xxhdpi/filtershow_button_geometry_flip.png Binary files differnew file mode 100644 index 000000000..79910ffe0 --- /dev/null +++ b/res/drawable-xxhdpi/filtershow_button_geometry_flip.png diff --git a/res/drawable-xxhdpi/filtershow_button_geometry_rotate.png b/res/drawable-xxhdpi/filtershow_button_geometry_rotate.png Binary files differnew file mode 100644 index 000000000..ef39c171c --- /dev/null +++ b/res/drawable-xxhdpi/filtershow_button_geometry_rotate.png diff --git a/res/drawable-xxhdpi/filtershow_button_geometry_straighten.png b/res/drawable-xxhdpi/filtershow_button_geometry_straighten.png Binary files differnew file mode 100644 index 000000000..1e6c2721f --- /dev/null +++ b/res/drawable-xxhdpi/filtershow_button_geometry_straighten.png diff --git a/res/drawable-xxhdpi/filtershow_button_vibrance.png b/res/drawable-xxhdpi/filtershow_button_vibrance.png Binary files differnew file mode 100644 index 000000000..aa0607777 --- /dev/null +++ b/res/drawable-xxhdpi/filtershow_button_vibrance.png diff --git a/res/drawable-xxhdpi/filtershow_button_wbalance.png b/res/drawable-xxhdpi/filtershow_button_wbalance.png Binary files differnew file mode 100644 index 000000000..8636f5ead --- /dev/null +++ b/res/drawable-xxhdpi/filtershow_button_wbalance.png diff --git a/res/drawable-xxhdpi/filtershow_drawing.png b/res/drawable-xxhdpi/filtershow_drawing.png Binary files differnew file mode 100644 index 000000000..300529d20 --- /dev/null +++ b/res/drawable-xxhdpi/filtershow_drawing.png diff --git a/res/drawable-xxxhdpi/filtershow_button_colors.png b/res/drawable-xxxhdpi/filtershow_button_colors.png Binary files differnew file mode 100644 index 000000000..8297819ff --- /dev/null +++ b/res/drawable-xxxhdpi/filtershow_button_colors.png diff --git a/res/drawable-xxxhdpi/filtershow_button_colors_sharpen.png b/res/drawable-xxxhdpi/filtershow_button_colors_sharpen.png Binary files differnew file mode 100644 index 000000000..9d072f77d --- /dev/null +++ b/res/drawable-xxxhdpi/filtershow_button_colors_sharpen.png diff --git a/res/drawable-xxxhdpi/filtershow_button_contrast.png b/res/drawable-xxxhdpi/filtershow_button_contrast.png Binary files differnew file mode 100644 index 000000000..1b9a02f3b --- /dev/null +++ b/res/drawable-xxxhdpi/filtershow_button_contrast.png diff --git a/res/drawable-xxxhdpi/filtershow_button_exposure.png b/res/drawable-xxxhdpi/filtershow_button_exposure.png Binary files differnew file mode 100644 index 000000000..66014de15 --- /dev/null +++ b/res/drawable-xxxhdpi/filtershow_button_exposure.png diff --git a/res/drawable-xxxhdpi/filtershow_button_geometry_crop.png b/res/drawable-xxxhdpi/filtershow_button_geometry_crop.png Binary files differnew file mode 100644 index 000000000..3c027ef29 --- /dev/null +++ b/res/drawable-xxxhdpi/filtershow_button_geometry_crop.png diff --git a/res/drawable-xxxhdpi/filtershow_button_geometry_flip.png b/res/drawable-xxxhdpi/filtershow_button_geometry_flip.png Binary files differnew file mode 100644 index 000000000..d47ba4a7e --- /dev/null +++ b/res/drawable-xxxhdpi/filtershow_button_geometry_flip.png diff --git a/res/drawable-xxxhdpi/filtershow_button_geometry_rotate.png b/res/drawable-xxxhdpi/filtershow_button_geometry_rotate.png Binary files differnew file mode 100644 index 000000000..adfd6457f --- /dev/null +++ b/res/drawable-xxxhdpi/filtershow_button_geometry_rotate.png diff --git a/res/drawable-xxxhdpi/filtershow_button_geometry_straighten.png b/res/drawable-xxxhdpi/filtershow_button_geometry_straighten.png Binary files differnew file mode 100644 index 000000000..02785ff7a --- /dev/null +++ b/res/drawable-xxxhdpi/filtershow_button_geometry_straighten.png diff --git a/res/drawable-xxxhdpi/filtershow_button_vibrance.png b/res/drawable-xxxhdpi/filtershow_button_vibrance.png Binary files differnew file mode 100644 index 000000000..043d03ebe --- /dev/null +++ b/res/drawable-xxxhdpi/filtershow_button_vibrance.png diff --git a/res/drawable-xxxhdpi/filtershow_button_wbalance.png b/res/drawable-xxxhdpi/filtershow_button_wbalance.png Binary files differnew file mode 100644 index 000000000..3c60bcc9b --- /dev/null +++ b/res/drawable-xxxhdpi/filtershow_button_wbalance.png diff --git a/res/drawable-xxxhdpi/filtershow_drawing.png b/res/drawable-xxxhdpi/filtershow_drawing.png Binary files differnew file mode 100644 index 000000000..8297819ff --- /dev/null +++ b/res/drawable-xxxhdpi/filtershow_drawing.png diff --git a/res/drawable/color.xml b/res/drawable/color.xml deleted file mode 100644 index d2dc37e26..000000000 --- a/res/drawable/color.xml +++ /dev/null @@ -1,38 +0,0 @@ -<!-- - Copyright (c) 2015, 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. ---> - -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="32dp" - android:height="32dp" - android:viewportWidth="32.0" - android:viewportHeight="32.0"> - <path - android:pathData="M16,4.951C9.898,4.951 4.951,9.898 4.951,16c0,6.102 4.947,11.049 11.049,11.049c1.02,0 1.842,-0.822 1.842,-1.842c0,-0.479 -0.178,-0.908 -0.479,-1.232c-0.289,-0.326 -0.461,-0.75 -0.461,-1.223c0,-1.02 0.822,-1.842 1.842,-1.842h2.166c3.389,0 6.139,-2.75 6.139,-6.138C27.049,9.347 22.102,4.951 16,4.951zM9.248,16c-1.02,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.822,-1.841 1.842,-1.841s1.842,0.822 1.842,1.841C11.09,15.178 10.268,16 9.248,16zM12.932,11.09c-1.02,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.822,-1.842 1.842,-1.842c1.018,0 1.84,0.823 1.84,1.842C14.771,10.268 13.949,11.09 12.932,11.09zM19.068,11.09c-1.021,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.821,-1.842 1.842,-1.842c1.02,0 1.842,0.823 1.842,1.842C20.91,10.268 20.088,11.09 19.068,11.09zM22.752,16c-1.02,0 -1.842,-0.822 -1.842,-1.842c0,-1.019 0.822,-1.841 1.842,-1.841s1.842,0.822 1.842,1.841C24.594,15.178 23.771,16 22.752,16z" - android:fillColor="@color/white"/> -</vector> diff --git a/res/drawable/crop.xml b/res/drawable/crop.xml deleted file mode 100644 index 25ff64968..000000000 --- a/res/drawable/crop.xml +++ /dev/null @@ -1,38 +0,0 @@ -<!-- - Copyright (c) 2015, 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. ---> - -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="32dp" - android:height="32dp" - android:viewportWidth="32.0" - android:viewportHeight="32.0"> - <path - android:pathData="M20.911,19.324h2.28v-8.26c0,-1.127 -0.945,-2.438 -2.073,-2.438h-8.262v2.312h8.055V19.324zM11.117,21.008v-16.4H8.809v4.019h-4.02l-0.031,2.315l4.051,-0.004V21.27c0,1.127 0.914,2.041 2.041,2.041h10.03v4.082h2.312v-4.082h4.052v-2.303H11.117z" - android:fillColor="@color/white"/> -</vector> diff --git a/res/drawable/exposure.xml b/res/drawable/exposure.xml deleted file mode 100644 index ad0a64f4f..000000000 --- a/res/drawable/exposure.xml +++ /dev/null @@ -1,38 +0,0 @@ -<!-- - Copyright (c) 2015, 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. ---> - -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="32dp" - android:height="32dp" - android:viewportWidth="32.0" - android:viewportHeight="32.0"> - <path - android:pathData="M19.514,21.201v2.357h1.644l0.045,-2.357h2.313v-1.688h-2.357V17.2h-1.643v2.313h-2.357v1.688H19.514zM24.85,4.793H7.061c-1.228,0 -2.223,0.995 -2.223,2.224v17.788c0,1.229 0.995,2.402 2.223,2.402H24.85c1.229,0 2.313,-1.174 2.313,-2.402V7.017C27.161,5.789 26.077,4.793 24.85,4.793zM8.173,8.173h6.671v2H8.173V8.173zM25.161,25.162h-18.1l18.1,-18.541V25.162z" - android:fillColor="@color/white"/> -</vector> diff --git a/res/drawable/filtershow_button_colors.png b/res/drawable/filtershow_button_colors.png Binary files differdeleted file mode 100644 index 566773dbe..000000000 --- a/res/drawable/filtershow_button_colors.png +++ /dev/null diff --git a/res/drawable/filtershow_button_geometry_crop.png b/res/drawable/filtershow_button_geometry_crop.png Binary files differdeleted file mode 100644 index eb7da1b21..000000000 --- a/res/drawable/filtershow_button_geometry_crop.png +++ /dev/null diff --git a/res/drawable/filtershow_button_geometry_flip.png b/res/drawable/filtershow_button_geometry_flip.png Binary files differdeleted file mode 100644 index dd74813a7..000000000 --- a/res/drawable/filtershow_button_geometry_flip.png +++ /dev/null diff --git a/res/drawable/filtershow_button_geometry_rotate.png b/res/drawable/filtershow_button_geometry_rotate.png Binary files differdeleted file mode 100644 index fa50ce26f..000000000 --- a/res/drawable/filtershow_button_geometry_rotate.png +++ /dev/null diff --git a/res/drawable/filtershow_button_geometry_straighten.png b/res/drawable/filtershow_button_geometry_straighten.png Binary files differdeleted file mode 100644 index 309eb5ae2..000000000 --- a/res/drawable/filtershow_button_geometry_straighten.png +++ /dev/null diff --git a/res/drawable/ic_editor_colors.xml b/res/drawable/ic_editor_colors.xml new file mode 100644 index 000000000..df1828e53 --- /dev/null +++ b/res/drawable/ic_editor_colors.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="@color/white" + android:pathData="M19 2H5c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2 2h4l3 3 3-3h4c1.1 0 2-.9 +2-2V4c0-1.1-.9-2-2-2zm-5.12 10.88L12 17l-1.88-4.12L6 11l4.12-1.88L12 5l1.88 +4.12L18 11l-4.12 1.88z" /> +</vector> diff --git a/res/drawable/frames.xml b/res/drawable/ic_editor_frame.xml index f668e4dce..f668e4dce 100644 --- a/res/drawable/frames.xml +++ b/res/drawable/ic_editor_frame.xml diff --git a/res/drawable/ic_editor_fx.xml b/res/drawable/ic_editor_fx.xml new file mode 100644 index 000000000..9f0e4ed77 --- /dev/null +++ b/res/drawable/ic_editor_fx.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="@color/white" + android:pathData="M2.53 19.65l1.34 .56 v-9.03l-2.43 5.86c-.41 1.02 .08 2.19 1.09 +2.61zm19.5-3.7L17.07 3.98c-.31-.75-1.04-1.21-1.81-1.23-.26 0-.53 .04 -.79 .15 +L7.1 5.95c-.75 .31 -1.21 1.03-1.23 1.8-.01 .27 .04 .54 .15 .8 l4.96 11.97c.31 +.76 1.05 1.22 1.83 1.23 .26 0 .52-.05 .77 -.15l7.36-3.05c1.02-.42 1.51-1.59 +1.09-2.6zM7.88 8.75c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1zm-2 11c0 1.1 +.9 2 2 2h1.45l-3.45-8.34v6.34z" /> +</vector> diff --git a/res/drawable/ic_editor_geometry.xml b/res/drawable/ic_editor_geometry.xml new file mode 100644 index 000000000..95144cbde --- /dev/null +++ b/res/drawable/ic_editor_geometry.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="@color/white" + android:pathData="M22 18v-2H8V4h2L7 1 4 4h2v2H2v2h4v8c0 1.1 .9 2 2 2h8v2h-2l3 3 3-3h-2v-2h4zM10 +8h6v6h2V8c0-1.1-.9-2-2-2h-6v2z" /> +</vector> diff --git a/res/layout-land/filtershow_color_border_ui.xml b/res/layout-land/filtershow_color_border_ui.xml index 82fe14a7d..ca9932ce7 100644 --- a/res/layout-land/filtershow_color_border_ui.xml +++ b/res/layout-land/filtershow_color_border_ui.xml @@ -159,87 +159,62 @@ </FrameLayout> <LinearLayout - android:layout_width="match_parent" + android:id="@+id/listColors" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_weight="6" + android:layout_marginBottom="20dp" + android:layout_marginTop="20dp" + android:layout_marginStart="2dp" + android:layout_marginEnd="2dp"> + + <Button + android:id="@+id/draw_color_button01" + android:layout_width="0dp" + android:layout_weight="1" android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_marginBottom="10dp" - android:layout_marginTop="10dp" - android:layout_marginStart="1dp" - android:layout_marginEnd="1dp"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_marginBottom="10dp" - android:layout_marginTop="10dp" - android:layout_marginStart="1dp" - android:layout_marginEnd="1dp"> - - <LinearLayout - android:id="@+id/listColors" - android:layout_weight="5" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <Button - android:id="@+id/draw_color_button01" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:background="@drawable/filtershow_color_picker_circle" - android:layout_marginEnd="4dp"/> - - <Button - android:id="@+id/draw_color_button02" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:background="@drawable/filtershow_color_picker_circle" - android:layout_marginEnd="4dp"/> - - <Button - android:id="@+id/draw_color_button03" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:background="@drawable/filtershow_color_picker_circle" - android:layout_marginEnd="4dp"/> - - <Button - android:id="@+id/draw_color_button04" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:background="@drawable/filtershow_color_picker_circle" - android:layout_marginEnd="4dp"/> + android:background="@drawable/filtershow_color_picker_circle" + android:layout_marginEnd="4dp"/> - <Button - android:id="@+id/draw_color_button05" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:background="@drawable/filtershow_color_picker_circle" - android:layout_marginEnd="4dp"/> + <Button + android:id="@+id/draw_color_button02" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content" + android:background="@drawable/filtershow_color_picker_circle" + android:layout_marginEnd="4dp"/> - </LinearLayout> - <FrameLayout - android:background="@color/background_main_toolbar" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center"> - <Button - android:id="@+id/draw_color_popupbutton" - android:layout_width="48dp" - android:layout_gravity="center" - android:layout_height="wrap_content" - android:background="@drawable/ic_action_overflow" - /> - </FrameLayout> - </LinearLayout> + <Button + android:id="@+id/draw_color_button03" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content" + android:background="@drawable/filtershow_color_picker_circle" + android:layout_marginEnd="4dp"/> + <Button + android:id="@+id/draw_color_button04" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content" + android:background="@drawable/filtershow_color_picker_circle" + android:layout_marginEnd="4dp"/> + <Button + android:id="@+id/draw_color_button05" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content" + android:background="@drawable/filtershow_color_picker_circle" + android:layout_marginEnd="4dp"/> + <Button + android:id="@+id/draw_color_popupbutton" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content" + android:background="@drawable/ic_action_overflow" + android:layout_marginEnd="4dp"/> </LinearLayout> </LinearLayout> diff --git a/res/layout-land/filtershow_draw_ui.xml b/res/layout-land/filtershow_draw_ui.xml index 642a7bdb6..46e214a5e 100644 --- a/res/layout-land/filtershow_draw_ui.xml +++ b/res/layout-land/filtershow_draw_ui.xml @@ -144,78 +144,61 @@ </FrameLayout> <LinearLayout - android:layout_width="match_parent" + android:id="@+id/listColors" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_weight="6" + android:layout_marginBottom="10dp" + android:layout_marginTop="10dp" + android:layout_marginStart="1dp" + android:layout_marginEnd="1dp"> + + <Button + android:id="@+id/draw_color_button01" + android:layout_width="0dp" + android:layout_weight="1" android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_marginBottom="10dp" - android:layout_marginTop="10dp" - android:layout_marginStart="1dp" - android:layout_marginEnd="1dp"> - - - <LinearLayout - android:id="@+id/listColors" - android:layout_weight="5" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal"> + android:background="@drawable/filtershow_color_picker_circle" + android:layout_marginEnd="4dp"/> - <Button - android:id="@+id/draw_color_button01" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:background="@drawable/filtershow_color_picker_circle" - android:layout_marginEnd="4dp"/> - - <Button - android:id="@+id/draw_color_button02" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:background="@drawable/filtershow_color_picker_circle" - android:layout_marginEnd="4dp"/> - - <Button - android:id="@+id/draw_color_button03" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:background="@drawable/filtershow_color_picker_circle" - android:layout_marginEnd="4dp"/> + <Button + android:id="@+id/draw_color_button02" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content" + android:background="@drawable/filtershow_color_picker_circle" + android:layout_marginEnd="4dp"/> - <Button - android:id="@+id/draw_color_button04" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:background="@drawable/filtershow_color_picker_circle" - android:layout_marginEnd="4dp"/> + <Button + android:id="@+id/draw_color_button03" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content" + android:background="@drawable/filtershow_color_picker_circle" + android:layout_marginEnd="4dp"/> - <Button - android:id="@+id/draw_color_button05" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:background="@drawable/filtershow_color_picker_circle" - android:layout_marginEnd="4dp"/> + <Button + android:id="@+id/draw_color_button04" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content" + android:background="@drawable/filtershow_color_picker_circle" + android:layout_marginEnd="4dp"/> - </LinearLayout> + <Button + android:id="@+id/draw_color_button05" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content" + android:background="@drawable/filtershow_color_picker_circle" + android:layout_marginEnd="4dp"/> - <FrameLayout - android:background="@color/background_main_toolbar" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center"> - <Button - android:id="@+id/draw_color_popupbutton" - android:layout_width="48dp" - android:layout_gravity="center" - android:layout_height="wrap_content" - android:background="@drawable/ic_action_overflow" - /> - </FrameLayout> - <!--@drawable/ic_action_overflow - @android:drawable/ic_menu_more--> - </LinearLayout> + <Button + android:id="@+id/draw_color_popupbutton" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:background="@drawable/ic_action_overflow" + android:layout_marginEnd="4dp"/> + </LinearLayout> </LinearLayout> diff --git a/res/layout/filtershow_control_color_chooser.xml b/res/layout/filtershow_control_color_chooser.xml index 18ac83d10..03eb7a7b8 100644 --- a/res/layout/filtershow_control_color_chooser.xml +++ b/res/layout/filtershow_control_color_chooser.xml @@ -24,15 +24,19 @@ <LinearLayout android:id="@+id/listColors" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="16dp" + android:layout_gravity="center" + android:layout_marginTop="12dp" + android:layout_marginBottom="12dp" + android:elevation="8dp" android:orientation="horizontal" > <Button android:id="@+id/draw_color_button01" android:layout_width="@dimen/color_button_width" android:layout_height="@dimen/color_button_height" + android:layout_marginStart="22dp" android:layout_marginEnd="22dp" android:background="@drawable/filtershow_color_picker_circle" /> @@ -63,20 +67,12 @@ android:layout_height="@dimen/color_button_height" android:layout_marginEnd="22dp" android:background="@drawable/filtershow_color_picker_circle" /> - </LinearLayout> - - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginRight="16dp" > <Button android:id="@+id/draw_color_popupbutton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" + android:layout_width="@dimen/color_button_width" + android:layout_height="@dimen/color_button_height" + android:layout_marginEnd="22dp" android:background="@drawable/more2" /> - </FrameLayout> - -</LinearLayout>
\ No newline at end of file + </LinearLayout> +</LinearLayout> diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml index bc42be25b..771c873ca 100644 --- a/res/layout/filtershow_main_panel.xml +++ b/res/layout/filtershow_main_panel.xml @@ -69,18 +69,17 @@ android:layout_weight="1" android:background="@drawable/filtershow_button_background" android:scaleType="centerInside" - android:src="@drawable/color" /> + android:src="@drawable/ic_editor_fx" /> <ImageButton android:id="@+id/borderButton" - android:layout_width="@dimen/thumbnail_size" + android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:background="@drawable/filtershow_button_background" android:padding="2dip" android:scaleType="centerInside" - android:visibility="gone" - android:src="@drawable/frames" /> + android:src="@drawable/ic_editor_frame" /> <ImageButton android:id="@+id/geometryButton" @@ -90,7 +89,7 @@ android:background="@drawable/filtershow_button_background" android:padding="2dip" android:scaleType="centerInside" - android:src="@drawable/crop" /> + android:src="@drawable/ic_editor_geometry" /> <ImageButton android:id="@+id/colorsButton" @@ -100,7 +99,7 @@ android:background="@drawable/filtershow_button_background" android:padding="2dip" android:scaleType="centerInside" - android:src="@drawable/exposure" /> + android:src="@drawable/ic_editor_colors" /> <ImageButton android:id="@+id/makeupButton" diff --git a/res/layout/photopage_progress_bar.xml b/res/layout/photopage_progress_bar.xml index 1acbd77cb..6ac192e07 100644 --- a/res/layout/photopage_progress_bar.xml +++ b/res/layout/photopage_progress_bar.xml @@ -16,7 +16,7 @@ android:visibility="visible"/> <View android:id="@+id/photopage_progress_foreground" - android:background="#ff33b5e5" + android:background="@color/accent" android:layout_width="10dp" android:layout_height="8dp" android:layout_alignParentStart="true" diff --git a/res/values/filtershow_styles.xml b/res/values/filtershow_styles.xml index 1e97acced..14661ea6a 100644 --- a/res/values/filtershow_styles.xml +++ b/res/values/filtershow_styles.xml @@ -54,8 +54,6 @@ <style name="FilterShowSlider"> <item name="android:indeterminateOnly">false</item> - <item name="android:progressDrawable">@drawable/filtershow_slider</item> - <item name="android:indeterminateDrawable">@drawable/filtershow_slider</item> <item name="android:minHeight">13dip</item> <item name="android:maxHeight">13dip</item> <item name="android:thumb">@drawable/adjust</item> @@ -65,4 +63,4 @@ <item name="android:paddingEnd">16dip</item> </style> -</resources>
\ No newline at end of file +</resources> diff --git a/src/com/android/gallery3d/filtershow/category/Action.java b/src/com/android/gallery3d/filtershow/category/Action.java index b3a4148eb..54eb18019 100644 --- a/src/com/android/gallery3d/filtershow/category/Action.java +++ b/src/com/android/gallery3d/filtershow/category/Action.java @@ -161,13 +161,16 @@ public class Action implements RenderingRequestCaller { private void drawCenteredImage(Bitmap source, Bitmap destination, boolean scale) { int minSide = Math.min(destination.getWidth(), destination.getHeight()); Matrix m = new Matrix(); - float scaleFactor = minSide / (float) Math.min(source.getWidth(), source.getHeight()); + float scaleFactor = minSide / (1.25f * + (float) Math.min(source.getWidth(), source.getHeight())); - float dx = (destination.getWidth() - source.getWidth() * scaleFactor) / 2.0f; - float dy = (destination.getHeight() - source.getHeight() * scaleFactor) / 2.0f; + float dx = (destination.getWidth() - source.getWidth() + * scaleFactor) / 3.0f; + float dy = (destination.getHeight() - source.getHeight() + * scaleFactor) / 3.0f; if (mImageFrame.height() > mImageFrame.width()) { // if portrait - dy -= mTextSize; + dy -= mTextSize * 0.75; } m.setScale(scaleFactor, scaleFactor); m.postTranslate(dx, dy); diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java index 27c0e0877..b307591cd 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java @@ -35,6 +35,7 @@ public class ImageFilterContrast extends SimpleImageFilter { representation.setFilterClass(ImageFilterContrast.class); representation.setTextId(R.string.contrast); + representation.setOverlayId(R.drawable.filtershow_button_contrast); representation.setMinimum(-100); representation.setMaximum(100); representation.setDefaultValue(0); diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java index 69eab7330..df7b966f6 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java @@ -33,6 +33,7 @@ public class ImageFilterExposure extends SimpleImageFilter { representation.setSerializationName(SERIALIZATION_NAME); representation.setFilterClass(ImageFilterExposure.class); representation.setTextId(R.string.exposure); + representation.setOverlayId(R.drawable.filtershow_button_exposure); representation.setMinimum(-100); representation.setMaximum(100); representation.setDefaultValue(0); diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java index 86be9a155..c39a256ea 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java @@ -33,6 +33,7 @@ public class ImageFilterVibrance extends SimpleImageFilter { representation.setSerializationName(SERIALIZATION_NAME); representation.setFilterClass(ImageFilterVibrance.class); representation.setTextId(R.string.vibrance); + representation.setOverlayId(R.drawable.filtershow_button_vibrance); representation.setMinimum(-100); representation.setMaximum(100); representation.setDefaultValue(0); diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java index 7aa19a4a9..6769c018b 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java @@ -37,6 +37,7 @@ public class ImageFilterWBalance extends ImageFilter { representation.setTextId(R.string.wbalance); representation.setShowParameterValue(false); representation.setEditorId(ImageOnlyEditor.ID); + representation.setOverlayId(R.drawable.filtershow_button_wbalance); representation.setSupportsPartialRendering(true); representation.setIsBooleanFilter(true); return representation; |
