diff options
Diffstat (limited to 'res')
26 files changed, 617 insertions, 222 deletions
diff --git a/res/drawable/adjust.xml b/res/drawable/adjust.xml index 3ce4ed243..ac0cff0a6 100644 --- a/res/drawable/adjust.xml +++ b/res/drawable/adjust.xml @@ -34,5 +34,5 @@ android:viewportHeight="12.0"> <path android:pathData="M5.984,6.016m-5.859,0a5.859,5.859 0,1 1,11.718 0a5.859,5.859 0,1 1,-11.718 0" - android:fillColor="#00E3FF"/> + android:fillColor="#4f92e9"/> </vector> diff --git a/res/drawable/crop_1_1.xml b/res/drawable/crop_1_1.xml new file mode 100644 index 000000000..332eff7e7 --- /dev/null +++ b/res/drawable/crop_1_1.xml @@ -0,0 +1,34 @@ +<?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. +--> + +<vector android:height="24dp" android:viewportHeight="90.0" + android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FFFFFFFF" android:pathData="M3,3L3,87L87,87L87,3L3,3ZM78.99,78.99L11.01,78.99L11.01,11.01L78.99,11.01L78.99,78.99Z"/> +</vector> diff --git a/res/drawable/crop_1_1_select.xml b/res/drawable/crop_1_1_select.xml new file mode 100644 index 000000000..892870714 --- /dev/null +++ b/res/drawable/crop_1_1_select.xml @@ -0,0 +1,34 @@ +<?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. +--> + +<vector android:height="24dp" android:viewportHeight="90.0" + android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FF4F92E9" android:pathData="M3,3L3,87L87,87L87,3L3,3ZM78.99,78.99L11.01,78.99L11.01,11.01L78.99,11.01L78.99,78.99Z"/> +</vector> diff --git a/res/drawable/crop_crop.xml b/res/drawable/crop_crop.xml new file mode 100644 index 000000000..0272da20d --- /dev/null +++ b/res/drawable/crop_crop.xml @@ -0,0 +1,34 @@ +<?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. +--> + +<vector android:height="24dp" android:viewportHeight="90.0" + android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FFFFFFFF" android:pathData="M15,67C15,71.42 18.58,75 23,75L23,75L67,75L67,87L75,87L75,75L87,75L87,67L23,67L23,3L15,3L15,15L3,15L3,23L15,23L15,67ZM67,59L75,59L75,23C75,18.58 71.42,15 67,15L31,15L31,23L67,23L67,59Z"/> +</vector> diff --git a/res/drawable/crop_free.xml b/res/drawable/crop_free.xml new file mode 100644 index 000000000..eac62fb24 --- /dev/null +++ b/res/drawable/crop_free.xml @@ -0,0 +1,34 @@ +<?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. +--> + +<vector android:height="24dp" android:viewportHeight="90.0" + android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FFFFFFFF" android:pathData="M11,62L3,62L3,87L28,87L28,79L11,79L11,62ZM79,79L62,79L62,87L87,87L87,62L79,62L79,79ZM3,28L11,28L11,11L28,11L28,3L3,3L3,28ZM62,3L62,11L79,11L79,28L87,28L87,3L62,3Z"/> +</vector> diff --git a/res/drawable/crop_free_background.xml b/res/drawable/crop_free_background.xml new file mode 100644 index 000000000..4404d4e7b --- /dev/null +++ b/res/drawable/crop_free_background.xml @@ -0,0 +1,34 @@ +<?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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/crop_free" android:state_selected="false"></item> + <item android:drawable="@drawable/crop_free_select" android:state_selected="true"></item> +</selector>
\ No newline at end of file diff --git a/res/drawable/crop_free_select.xml b/res/drawable/crop_free_select.xml new file mode 100644 index 000000000..f24699731 --- /dev/null +++ b/res/drawable/crop_free_select.xml @@ -0,0 +1,34 @@ +<?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. +--> + +<vector android:height="24dp" android:viewportHeight="90.0" + android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FF4F92E9" android:pathData="M11,62L3,62L3,87L28,87L28,79L11,79L11,62ZM79,79L62,79L62,87L87,87L87,62L79,62L79,79ZM3,28L11,28L11,11L28,11L28,3L3,3L3,28ZM62,3L62,11L79,11L79,28L87,28L87,3L62,3Z"/> +</vector> diff --git a/res/drawable/crop_one_background.xml b/res/drawable/crop_one_background.xml new file mode 100644 index 000000000..aa035eda8 --- /dev/null +++ b/res/drawable/crop_one_background.xml @@ -0,0 +1,34 @@ +<?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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/crop_1_1" android:state_selected="false"></item> + <item android:drawable="@drawable/crop_1_1_select" android:state_selected="true"></item> +</selector>
\ No newline at end of file diff --git a/res/drawable/crop_original.xml b/res/drawable/crop_original.xml new file mode 100644 index 000000000..91eef6c0c --- /dev/null +++ b/res/drawable/crop_original.xml @@ -0,0 +1,34 @@ +<?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. +--> + +<vector android:height="24dp" android:viewportHeight="90.0" + android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FFFFFFFF" android:pathData="M9,1L9,89L81,89L81,1L9,1ZM17,46L44,46L44,81L17,81L17,46ZM73,81L48,81L48,42L17,42L17,9L73,9L73,81Z"/> +</vector> diff --git a/res/drawable/crop_original_background.xml b/res/drawable/crop_original_background.xml new file mode 100644 index 000000000..eafe86131 --- /dev/null +++ b/res/drawable/crop_original_background.xml @@ -0,0 +1,34 @@ +<?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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/crop_original" android:state_selected="false"></item> + <item android:drawable="@drawable/crop_original_select" android:state_selected="true"></item> +</selector>
\ No newline at end of file diff --git a/res/drawable/crop_original_select.xml b/res/drawable/crop_original_select.xml new file mode 100644 index 000000000..3bb0f7694 --- /dev/null +++ b/res/drawable/crop_original_select.xml @@ -0,0 +1,34 @@ +<?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. +--> + +<vector android:height="24dp" android:viewportHeight="90.0" + android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FF4F92E9" android:pathData="M9,1L9,89L81,89L81,1L9,1ZM17,46L44,46L44,81L17,81L17,46ZM73,81L48,81L48,42L17,42L17,9L73,9L73,81Z"/> +</vector> diff --git a/res/drawable/crop_rotate.xml b/res/drawable/crop_rotate.xml new file mode 100644 index 000000000..8caf459e4 --- /dev/null +++ b/res/drawable/crop_rotate.xml @@ -0,0 +1,34 @@ +<?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. +--> + +<vector android:height="24dp" android:viewportHeight="90.0" + android:viewportWidth="90.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FFFFFFFF" android:pathData="M45,5C32.42,5 21.21,10.81 13.88,19.88L5,11L5.01,33.99L6.55,33.99C6.55,33.99 6.55,34 6.54,34L14.94,34C14.94,34 14.94,33.99 14.95,33.99L27.99,33.99L19.57,25.57C25.42,17.93 34.63,13 45,13C62.67,13 77,27.33 77,45C77,62.67 62.67,77 45,77C27.33,77 13,62.67 13,45L5,45C5,67.09 22.91,85 45,85C67.09,85 85,67.09 85,45C85,22.91 67.09,5 45,5Z"/> +</vector> diff --git a/res/drawable/crop_straighten.xml b/res/drawable/crop_straighten.xml new file mode 100644 index 000000000..9fda1f484 --- /dev/null +++ b/res/drawable/crop_straighten.xml @@ -0,0 +1,34 @@ +<?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. +--> + +<vector android:height="24dp" android:viewportHeight="90.0" + android:viewportWidth="89.844" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FFFFFFFF" android:pathData="M87.85,22.54L73.87,22.54L73.87,29.53L82.86,29.53L82.86,75.44L48.91,75.44L48.91,82.43L87.85,82.43C88.95,82.43 89.84,81.53 89.84,80.43L89.84,24.54C89.84,23.44 88.95,22.54 87.85,22.54ZM74.82,64.32L65.09,9.23C64.9,8.15 63.86,7.42 62.77,7.61L1.66,18.37C0.57,18.56 -0.16,19.6 0.03,20.68L9.77,75.77C9.96,76.86 11,77.59 12.09,77.39L73.2,66.64C74.29,66.45 75.01,65.41 74.82,64.32ZM44.55,36.57L31.7,61L21.53,51.79L14.88,64.43L7.8,24.39L59.06,15.37L66.28,56.22L44.55,36.57Z"/> +</vector> diff --git a/res/drawable/sliderbg.xml b/res/drawable/sliderbg.xml index 974ab918e..efc809f4b 100644 --- a/res/drawable/sliderbg.xml +++ b/res/drawable/sliderbg.xml @@ -35,5 +35,5 @@ <path android:pathData="M0,1h216v2h-216z" android:fillAlpha="0.2" - android:fillColor="#FFFFFF"/> + android:fillColor="#99FFFFFF"/> </vector> diff --git a/res/drawable/sliderprogress.xml b/res/drawable/sliderprogress.xml index 9ca10b6e2..5c2b541ab 100644 --- a/res/drawable/sliderprogress.xml +++ b/res/drawable/sliderprogress.xml @@ -34,5 +34,5 @@ android:viewportHeight="4.0"> <path android:pathData="M0,1h216v2h-216z" - android:fillColor="#00E3FF"/> + android:fillColor="#4f92e9"/> </vector> diff --git a/res/layout-land/filtershow_category_panel_new.xml b/res/layout-land/filtershow_category_panel_new.xml deleted file mode 100644 index 26b92e769..000000000 --- a/res/layout-land/filtershow_category_panel_new.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?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" - xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/edit_actionbar_background" - android:orientation="horizontal" > - - <!-- <com.android.gallery3d.filtershow.category.IconView --> - <!-- android:id="@+id/addButton" --> - <!-- android:layout_width="match_parent" --> - <!-- android:layout_height="@dimen/category_panel_height" --> - <!-- android:src="@drawable/filtershow_add"/> --> - - - <!-- <ListView --> - <!-- android:id="@+id/listItems" --> - <!-- android:orientation="vertical" --> - <!-- android:layout_width="match_parent" --> - <!-- android:layout_height="@dimen/category_panel_height" --> - <!-- android:layout_margin="8dip" --> - <!-- android:divider="@android:color/transparent" --> - <!-- android:dividerHeight="8dip" --> - <!-- android:layout_weight="1"/> --> - - <HorizontalScrollView - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:scrollbars="none" > - - <com.android.gallery3d.filtershow.category.CategoryTrack - android:id="@+id/listItems" - android:layout_width="match_parent" - android:layout_height="@dimen/category_panel_height" - android:divider="@android:color/transparent" - android:dividerPadding="8dip" - custom:iconSize="@dimen/category_panel_icon_size" /> - </HorizontalScrollView> - - <com.android.gallery3d.filtershow.category.IconView - android:id="@+id/addButton" - android:layout_width="@dimen/category_panel_height" - android:layout_height="@dimen/category_panel_height" - android:src="@drawable/filtershow_add" /> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout-land/filtershow_editor_panel.xml b/res/layout-land/filtershow_editor_panel.xml deleted file mode 100644 index 59885e0f0..000000000 --- a/res/layout-land/filtershow_editor_panel.xml +++ /dev/null @@ -1,112 +0,0 @@ -<?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:id="@+id/top" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="visible" > - - <!-- <RelativeLayout --> - <!-- android:layout_width="match_parent" --> - <!-- android:layout_height="match_parent" > --> - - <Button - android:id="@+id/toggle_state" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:background="@color/background_main_toolbar" - android:text="@string/imageState" - android:visibility="gone" /> - - <!-- <LinearLayout --> - <!-- android:id="@+id/applyBar" --> - <!-- android:layout_width="match_parent" --> - <!-- android:layout_height="48dip" --> - <!-- android:layout_above="@id/bottomControlLineBottom" --> - <!-- android:background="@color/background_main_toolbar" --> - <!-- android:baselineAligned="false" --> - <!-- android:orientation="horizontal" --> - <!-- android:visibility="visible" > --> - - - <!-- <ImageButton --> - <!-- android:id="@+id/cancelFilter" --> - <!-- android:layout_width="wrap_content" --> - <!-- android:layout_height="fill_parent" --> - <!-- android:layout_gravity="left|center_vertical" --> - <!-- android:layout_weight=".1" --> - <!-- android:background="@android:color/transparent" --> - <!-- android:gravity="center" --> - <!-- android:src="@drawable/ic_menu_cancel_holo_light" --> - <!-- android:textSize="18dip" /> --> - - - <!-- <LinearLayout --> - <!-- android:id="@+id/panelAccessoryViewList" --> - <!-- android:layout_width="wrap_content" --> - <!-- android:layout_height="match_parent" --> - <!-- android:layout_weight="1" --> - <!-- android:orientation="horizontal" --> - <!-- android:visibility="visible" > --> - - - <!-- <com.android.gallery3d.filtershow.editors.SwapButton --> - <!-- android:id="@+id/applyEffect" --> - <!-- android:layout_width="fill_parent" --> - <!-- android:layout_height="fill_parent" --> - <!-- android:layout_gravity="center" --> - <!-- android:background="@android:color/transparent" --> - <!-- android:drawableEnd="@drawable/filtershow_menu_marker_rtl" --> - <!-- android:text="@string/apply_effect" --> - <!-- android:textSize="18dip" /> --> - <!-- </LinearLayout> --> - - - <!-- <ImageButton --> - <!-- android:id="@+id/applyFilter" --> - <!-- android:layout_width="wrap_content" --> - <!-- android:layout_height="fill_parent" --> - <!-- android:layout_gravity="right|center_vertical" --> - <!-- android:layout_weight=".1" --> - <!-- android:background="@android:color/transparent" --> - <!-- android:gravity="center" --> - <!-- android:src="@drawable/ic_menu_done_holo_light" --> - <!-- android:textSize="18dip" /> --> - <!-- </LinearLayout> --> - - <LinearLayout - android:id="@+id/controlArea" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="bottom" - android:orientation="horizontal" - android:visibility="visible" > - - <SeekBar - android:id="@+id/primarySeekBar" - style="@style/FilterShowSlider" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:visibility="gone" /> - </LinearLayout> - <!-- </RelativeLayout> --> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml index 7e6d62504..a23ca80b7 100644 --- a/res/layout/filtershow_actionbar.xml +++ b/res/layout/filtershow_actionbar.xml @@ -27,7 +27,7 @@ android:scaleType="fitCenter" android:src="@drawable/cancel" android:layout_gravity="left|center_vertical" - android:paddingStart="16dp" /> + android:paddingStart="6dp" /> <TextView android:id="@+id/filtershow_done" @@ -36,6 +36,7 @@ android:paddingRight="13dp" android:textSize="17sp" android:text="@string/save" + android:textAllCaps="true" android:layout_gravity="center_vertical|right" android:textColor="#ffffff" /> diff --git a/res/layout/filtershow_category_geometry_panel.xml b/res/layout/filtershow_category_geometry_panel.xml new file mode 100644 index 000000000..92dc359d6 --- /dev/null +++ b/res/layout/filtershow_category_geometry_panel.xml @@ -0,0 +1,163 @@ +<?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"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="@dimen/category_panel_height" + android:background="@android:color/transparent" + android:clickable="true" + android:orientation="horizontal"> + + <LinearLayout + android:id="@+id/leftPanel" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:background="@android:color/transparent" + android:orientation="vertical" > + + <ImageButton + android:id="@+id/leftButton" + android:layout_width="match_parent" + android:layout_height="@dimen/crop_icon_size" + android:scaleType="centerInside" + android:background="@android:color/transparent" + android:layout_marginTop="@dimen/crop_icon_margin_padding" /> + + <TextView + android:id="@+id/leftText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:clickable="true" + android:background="@android:color/transparent" + android:layout_marginTop="@dimen/crop_text_margin_padding" + android:textColor="#ffffff" + android:textSize="12sp" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/centerPanel" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:clickable="true" + android:background="@android:color/transparent" + android:orientation="vertical"> + + <ImageButton + android:id="@+id/centerButton" + android:layout_width="match_parent" + android:layout_height="@dimen/crop_icon_size" + android:scaleType="centerInside" + android:background="@android:color/transparent" + android:layout_marginTop="@dimen/crop_icon_margin_padding" /> + + <TextView + android:id="@+id/centerText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:clickable="true" + android:background="@android:color/transparent" + android:layout_marginTop="@dimen/crop_text_margin_padding" + android:textColor="#ffffff" + android:textSize="12sp" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/rightPanel" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:clickable="true" + android:background="@android:color/transparent" + android:orientation="vertical"> + + <ImageButton + android:id="@+id/rightButton" + android:layout_width="match_parent" + android:layout_height="@dimen/crop_icon_size" + android:scaleType="centerInside" + android:layout_marginTop="@dimen/crop_icon_margin_padding" + android:background="@android:color/transparent" /> + + <TextView + android:id="@+id/rightText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:clickable="true" + android:background="@android:color/transparent" + android:layout_marginTop="@dimen/crop_text_margin_padding" + android:textColor="#ffffff" + android:textSize="12sp" /> + </LinearLayout> + + </LinearLayout> + + <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" + android:visibility="gone"> + + <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" /> + + <TextView + android:id="@+id/editor_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="16sp" + android:textColor="#fff" + android:layout_gravity="center"/> + + <ImageButton + android:id="@+id/done" + android:layout_width="@dimen/category_actionbar_panel_height" + android:layout_height="@dimen/category_actionbar_panel_height" + android:background="@color/edit_actionbar_background" + android:layout_gravity="right" + android:src="@drawable/done" /> + </FrameLayout> + +</LinearLayout> diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml index 8fc01ecae..b7ec266f2 100644 --- a/res/layout/filtershow_editor_panel.xml +++ b/res/layout/filtershow_editor_panel.xml @@ -22,6 +22,15 @@ android:orientation="vertical" android:visibility="visible" > + <Button + android:id="@+id/toggle_state" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:background="@color/background_main_toolbar" + android:text="@string/imageState" + android:visibility="gone"/> + <!-- <View --> <!-- android:layout_width="match_parent" --> <!-- android:layout_height="1dip" --> diff --git a/res/layout/filtershow_seekbar.xml b/res/layout/filtershow_seekbar.xml index f4d5577d2..5b884ae49 100644 --- a/res/layout/filtershow_seekbar.xml +++ b/res/layout/filtershow_seekbar.xml @@ -22,49 +22,31 @@ android:orientation="horizontal" android:visibility="visible" > - <LinearLayout - android:id="@+id/basicFilterContainer" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <TextView - android:id="@+id/tvFilterValue" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_gravity="left|center_vertical" - android:paddingLeft="23dp" - android:paddingTop="20dp" - android:textColor="#ffffff" - android:textSize="20sp" - android:visibility="gone" /> - - <TextView - android:id="@+id/tvFilterName" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_below="@+id/tvFilterValue" - android:layout_gravity="center_vertical" - android:paddingLeft="12dp" - android:paddingTop="14dp" - android:text="@string/apply_effect" - android:textColor="#ffffff" - android:textSize="14sp" - android:visibility="gone" /> - </LinearLayout> + <ImageButton + android:id="@+id/slider_cancel" + android:layout_width="60dp" + android:layout_height="60dp" + android:src="@drawable/cancel" + android:layout_gravity="center_vertical" + android:background="#000000" /> <SeekBar android:id="@+id/primarySeekBar" style="@style/FilterShowSlider" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_gravity="center_vertical|center_horizontal" - android:layout_marginRight="34dp" android:layout_toRightOf="@+id/tvFilterName" - android:layout_weight="1" - android:paddingTop="20dp" - android:visibility="gone" /> + 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:background="#000000" /> </LinearLayout> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index ea0ced68e..6b5a51584 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -185,6 +185,12 @@ <dimen name="toolbar_height">84dp</dimen> <dimen name="slot_width_album">116dp</dimen> <dimen name="slot_height_album">116dp</dimen> + <dimen name="crop_icon_size">30dp</dimen> + <dimen name="crop_icon_margin_padding">20dp</dimen> + <dimen name="crop_text_margin_padding">6dp</dimen> + <dimen name="crop_rect_stroke">2dp</dimen> + <dimen name="crop_line_stroke">1dp</dimen> + <dimen name="crop_corner_length">14dp</dimen> <!-- configuration for album page in listview --> <integer name="albumlist_cols_land">1</integer> diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml index 8d6bf0404..a768e690e 100644 --- a/res/values/filtershow_color.xml +++ b/res/values/filtershow_color.xml @@ -65,4 +65,5 @@ <color name="iconview_bottom_color">#80000000</color> <color name="crop_panel_background_color">#A5000000</color> + <color name="crop_text_color">#4f92e9</color> </resources>
\ No newline at end of file diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index d3a4e7cee..1a4d2cde5 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -124,7 +124,7 @@ <!-- Label for the aspect 1:1 effect [CHAR LIMIT=15] --> <string name="aspect9to16_effect">16:9</string> <!-- Label for the aspect None effect [CHAR LIMIT=15] --> - <string name="aspectNone_effect">None</string> + <string name="aspectNone_effect">Free</string> <!-- Label for the aspect None effect [CHAR LIMIT=15] --> <string name="aspectOriginal_effect">@string/original</string> <!-- Label for when the aspect ratio is fixed to a value [CHAR LIMIT=15] --> diff --git a/res/values/filtershow_styles.xml b/res/values/filtershow_styles.xml index 1e97acced..974b81318 100644 --- a/res/values/filtershow_styles.xml +++ b/res/values/filtershow_styles.xml @@ -56,13 +56,11 @@ <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:minHeight">4dip</item> + <item name="android:maxHeight">4dip</item> <item name="android:thumb">@drawable/adjust</item> - <item name="android:thumbOffset">16dip</item> + <item name="android:thumbOffset">0dip</item> <item name="android:focusable">true</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> </style> </resources>
\ No newline at end of file diff --git a/res/values/filtershow_values.xml b/res/values/filtershow_values.xml index 1af341ea9..c15df9465 100644 --- a/res/values/filtershow_values.xml +++ b/res/values/filtershow_values.xml @@ -27,6 +27,8 @@ <!-- Category Panel Icon Size --> <dimen name="category_panel_icon_size">80dip</dimen> + <dimen name="category_actionbar_panel_height">60dip</dimen> + <!-- Category Panel Text Size --> <dimen name="category_panel_text_size">11dip</dimen> |