diff options
Diffstat (limited to 'res')
41 files changed, 307 insertions, 336 deletions
diff --git a/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png b/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png Binary files differdeleted file mode 100644 index 06e5b4730..000000000 --- a/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_media_bigscreen.png b/res/drawable-hdpi/ic_media_bigscreen.png Binary files differdeleted file mode 100644 index b68002df8..000000000 --- a/res/drawable-hdpi/ic_media_bigscreen.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_media_cropscreen.png b/res/drawable-hdpi/ic_media_cropscreen.png Binary files differdeleted file mode 100644 index d6e4e7009..000000000 --- a/res/drawable-hdpi/ic_media_cropscreen.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_media_fullscreen.png b/res/drawable-hdpi/ic_media_fullscreen.png Binary files differdeleted file mode 100644 index a4569fb6e..000000000 --- a/res/drawable-hdpi/ic_media_fullscreen.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_vidcontrol_pause.png b/res/drawable-hdpi/ic_vidcontrol_pause.png Binary files differdeleted file mode 100644 index 3d1a8bf5c..000000000 --- a/res/drawable-hdpi/ic_vidcontrol_pause.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_vidcontrol_play.png b/res/drawable-hdpi/ic_vidcontrol_play.png Binary files differdeleted file mode 100644 index cc021667a..000000000 --- a/res/drawable-hdpi/ic_vidcontrol_play.png +++ /dev/null diff --git a/res/drawable-hdpi/scrubber_knob.png b/res/drawable-hdpi/scrubber_knob.png Binary files differindex 426e3daff..817fd3aa4 100644 --- a/res/drawable-hdpi/scrubber_knob.png +++ b/res/drawable-hdpi/scrubber_knob.png diff --git a/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png b/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png Binary files differdeleted file mode 100644 index 81de1bb46..000000000 --- a/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_media_bigscreen.png b/res/drawable-mdpi/ic_media_bigscreen.png Binary files differdeleted file mode 100644 index f04026ead..000000000 --- a/res/drawable-mdpi/ic_media_bigscreen.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_media_cropscreen.png b/res/drawable-mdpi/ic_media_cropscreen.png Binary files differdeleted file mode 100644 index a2517bd3d..000000000 --- a/res/drawable-mdpi/ic_media_cropscreen.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_media_fullscreen.png b/res/drawable-mdpi/ic_media_fullscreen.png Binary files differdeleted file mode 100644 index a53cb3ddd..000000000 --- a/res/drawable-mdpi/ic_media_fullscreen.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_vidcontrol_pause.png b/res/drawable-mdpi/ic_vidcontrol_pause.png Binary files differdeleted file mode 100644 index 931907929..000000000 --- a/res/drawable-mdpi/ic_vidcontrol_pause.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_vidcontrol_play.png b/res/drawable-mdpi/ic_vidcontrol_play.png Binary files differdeleted file mode 100644 index 8d7cd837b..000000000 --- a/res/drawable-mdpi/ic_vidcontrol_play.png +++ /dev/null diff --git a/res/drawable-mdpi/scrubber_knob.png b/res/drawable-mdpi/scrubber_knob.png Binary files differindex 9205d9c21..43d1b3fe7 100644 --- a/res/drawable-mdpi/scrubber_knob.png +++ b/res/drawable-mdpi/scrubber_knob.png diff --git a/res/drawable-sw600dp/ic_vidcontrol_pause.png b/res/drawable-sw600dp/ic_vidcontrol_pause.png Binary files differdeleted file mode 100644 index 3d1a8bf5c..000000000 --- a/res/drawable-sw600dp/ic_vidcontrol_pause.png +++ /dev/null diff --git a/res/drawable-sw600dp/ic_vidcontrol_play.png b/res/drawable-sw600dp/ic_vidcontrol_play.png Binary files differdeleted file mode 100644 index cc021667a..000000000 --- a/res/drawable-sw600dp/ic_vidcontrol_play.png +++ /dev/null diff --git a/res/drawable-sw600dp/scrubber_knob.png b/res/drawable-sw600dp/scrubber_knob.png Binary files differindex 426e3daff..817fd3aa4 100644 --- a/res/drawable-sw600dp/scrubber_knob.png +++ b/res/drawable-sw600dp/scrubber_knob.png diff --git a/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png b/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png Binary files differdeleted file mode 100644 index 36d8cf47e..000000000 --- a/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_media_bigscreen.png b/res/drawable-xhdpi/ic_media_bigscreen.png Binary files differdeleted file mode 100644 index ba367097e..000000000 --- a/res/drawable-xhdpi/ic_media_bigscreen.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_media_cropscreen.png b/res/drawable-xhdpi/ic_media_cropscreen.png Binary files differdeleted file mode 100644 index e08c1db60..000000000 --- a/res/drawable-xhdpi/ic_media_cropscreen.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_media_fullscreen.png b/res/drawable-xhdpi/ic_media_fullscreen.png Binary files differdeleted file mode 100644 index ffcb4de7c..000000000 --- a/res/drawable-xhdpi/ic_media_fullscreen.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_vidcontrol_pause.png b/res/drawable-xhdpi/ic_vidcontrol_pause.png Binary files differdeleted file mode 100644 index 4d274c058..000000000 --- a/res/drawable-xhdpi/ic_vidcontrol_pause.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_vidcontrol_play.png b/res/drawable-xhdpi/ic_vidcontrol_play.png Binary files differdeleted file mode 100644 index 6f97a6407..000000000 --- a/res/drawable-xhdpi/ic_vidcontrol_play.png +++ /dev/null diff --git a/res/drawable-xhdpi/scrubber_knob.png b/res/drawable-xhdpi/scrubber_knob.png Binary files differindex 4e415a2a7..225488e55 100644 --- a/res/drawable-xhdpi/scrubber_knob.png +++ b/res/drawable-xhdpi/scrubber_knob.png diff --git a/res/drawable/comparison_before.xml b/res/drawable/comparison_before.xml index b846e03aa..9dd01fc9f 100644 --- a/res/drawable/comparison_before.xml +++ b/res/drawable/comparison_before.xml @@ -34,8 +34,8 @@ android:viewportHeight="36.0"> <path android:pathData="M18,1c9.389,0 17,7.611 17,17c0,9.388 -7.611,17 -17,17C8.612,35 1,27.388 1,18C1,8.611 8.612,1 18,1z" - android:fillAlpha="0.26" - android:fillColor="#FFFFFF"/> + android:fillAlpha="0.50" + android:fillColor="#000000"/> <path android:pathData="M9.258,16h1.333v-1.333H9.258V16zM10.591,23.999v-1.333H9.258C9.258,23.402 9.854,23.999 10.591,23.999zM9.258,13.334h1.333v-1.333C9.854,12.001 9.258,12.598 9.258,13.334zM9.258,21.333h1.333V20H9.258V21.333zM9.258,18.667h1.333v-1.334H9.258V18.667zM14.667,23.999H16v-1.333h-1.333V23.999zM25.408,12.001h-5.37v1.333h5.37v9.332h-5.37v1.333h5.37c0.737,0 1.334,-0.597 1.334,-1.333v-9.332C26.742,12.598 26.146,12.001 25.408,12.001zM17.334,25.332h1.333V10.667h-1.333V25.332zM15.97,12.001h-1.333v1.333h1.333V12.001zM11.955,13.334h1.334v-1.333h-1.334V13.334zM11.955,23.999h1.334v-1.333h-1.334V23.999z" android:fillColor="#FFFFFF"/> diff --git a/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml b/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml new file mode 100644 index 000000000..6f9216205 --- /dev/null +++ b/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml @@ -0,0 +1,40 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path + android:fillAlpha="0.54" + android:fillColor="#FF000000" + android:pathData="M0,5h24l-12,14L0,5z" /> +</vector>
\ No newline at end of file diff --git a/res/drawable/ic_media_bigscreen.xml b/res/drawable/ic_media_bigscreen.xml new file mode 100644 index 000000000..5413f8599 --- /dev/null +++ b/res/drawable/ic_media_bigscreen.xml @@ -0,0 +1,39 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + android:width="60dp" + android:height="60dp" + android:viewportHeight="180.0" + android:viewportWidth="180.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M112.9,72.9l7.1,-7.1l-5.8,-5.8l-7.1,7.1L100,60v20h20L112.9,72.9zM67.1,107.1l-7.1,7.1l5.8,5.8l7.1,-7.1L80,120v-20H60L67.1,107.1zM120,100h-20v20l7.1,-7.1l7.1,7.1l5.8,-5.8l-7.1,-7.1L120,100zM65.8,60L60,65.8l7.1,7.1L60,80h20V60l-7.1,7.1L65.8,60z" /> +</vector> diff --git a/res/drawable/ic_media_cropscreen.xml b/res/drawable/ic_media_cropscreen.xml new file mode 100644 index 000000000..66a24e335 --- /dev/null +++ b/res/drawable/ic_media_cropscreen.xml @@ -0,0 +1,39 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + android:width="60dp" + android:height="60dp" + android:viewportHeight="180.0" + android:viewportWidth="180.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M60,76h6V66h10v-6H60V76zM66,104h-6v16h16v-6H66V104zM104,60v6h10v10h6V60H104zM114,114h-10v6h16v-16h-6V114zM70,80L60,90l10,10V80zM110,100l10,-10l-10,-10V100zM90,120l10,-10H80L90,120zM80,70h20L90,60L80,70z" /> +</vector> diff --git a/res/drawable/ic_media_fullscreen.xml b/res/drawable/ic_media_fullscreen.xml new file mode 100644 index 000000000..104a8b68b --- /dev/null +++ b/res/drawable/ic_media_fullscreen.xml @@ -0,0 +1,39 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + android:width="60dp" + android:height="60dp" + android:viewportHeight="180.0" + android:viewportWidth="180.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M80,60H60v20l7.1,-7.1l7.1,7.1l5.8,-5.8l-7.1,-7.1L80,60zM100,60l7.1,7.1l-7.1,7.1l5.8,5.8l7.1,-7.1L120,80V60H100zM74.2,100l-7.1,7.1L60,100v20h20l-7.1,-7.1l7.1,-7.1L74.2,100zM105.8,100l-5.8,5.8l7.1,7.1L100,120h20v-20l-7.1,7.1L105.8,100z" /> +</vector> diff --git a/res/drawable/ic_vidcontrol_pause.xml b/res/drawable/ic_vidcontrol_pause.xml new file mode 100644 index 000000000..f3b6d0111 --- /dev/null +++ b/res/drawable/ic_vidcontrol_pause.xml @@ -0,0 +1,39 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + android:width="60dp" + android:height="60dp" + android:viewportHeight="180.0" + android:viewportWidth="180.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M66,58h16v64H66V58zM98,58h16v64H98V58z" /> +</vector> diff --git a/res/drawable/ic_vidcontrol_play.xml b/res/drawable/ic_vidcontrol_play.xml new file mode 100644 index 000000000..e58e93283 --- /dev/null +++ b/res/drawable/ic_vidcontrol_play.xml @@ -0,0 +1,39 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + android:width="60dp" + android:height="60dp" + android:viewportHeight="180.0" + android:viewportWidth="180.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M70,58v64l50,-32L70,58z" /> +</vector> diff --git a/res/drawable/multiselect_delete.xml b/res/drawable/multiselect_delete.xml index aade6c28b..6ac9b0f35 100644 --- a/res/drawable/multiselect_delete.xml +++ b/res/drawable/multiselect_delete.xml @@ -1,5 +1,5 @@ <!-- - Copyright (c) 2015, The Linux Foundation. All rights reserved. + Copyright (c) 2015-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 @@ -28,12 +28,12 @@ --> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:width="24dp" + android:height="24dp" + android:viewportWidth="72.0" + android:viewportHeight="72.0"> <path android:fillColor="#FF000000" - android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6V19zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" + android:pathData="M59,10L46.92,10l-2.16,-4L27,6l-2.16,4L13,10a1,1 0,0 0,-1 1v4a1,1 0,0 0,1 1h46a1,1 0,0 0,1 -1L60,11A1,1 0,0 0,59 10ZM16,60a6,6 0,0 0,6 6h28a6,6 0,0 0,6 -6L56,20L16,20v40Z" android:fillAlpha="0.54"/> </vector> diff --git a/res/drawable/multiselect_share.xml b/res/drawable/multiselect_share.xml index 1cf741806..30f50c026 100644 --- a/res/drawable/multiselect_share.xml +++ b/res/drawable/multiselect_share.xml @@ -1,5 +1,5 @@ <!-- - Copyright (c) 2015, The Linux Foundation. All rights reserved. + Copyright (c) 2015-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 @@ -28,12 +28,12 @@ --> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:width="24dp" + android:height="24dp" + android:viewportWidth="72.0" + android:viewportHeight="72.0"> <path android:fillColor="#FF000000" - android:pathData="M18,16.12c-0.76,0 -1.439,0.3 -1.96,0.77L8.91,12.74C8.96,12.51 9,12.28 9,12.04s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81c1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3s-3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.85C7.5,9.35 6.79,9.04 6,9.04c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.311 2.04,-0.811l7.12,4.16c-0.051,0.211 -0.08,0.43 -0.08,0.65c0,1.609 1.311,2.92 2.92,2.92s2.92,-1.311 2.92,-2.92S19.609,16.12 18,16.12z" + android:pathData="M54,48c-2.4,0 -4.5,0.9 -6.1,2.4L26.7,38.3c0.2,-0.8 0.3,-1.5 0.3,-2.4c0,-0.8 -0.1,-1.6 -0.3,-2.4l21.2,-12.1c1.6,1.7 3.7,2.6 6.1,2.6c5,0 9,-4 9,-9s-4,-9 -9,-9s-9,4 -9,9c0,0.8 0.1,1.6 0.3,2.3L24.1,29.4C22.5,27.9 20.4,27 18,27c-5,0 -9,4 -9,9s4,9 9,9c2.4,0 4.5,-0.9 6.1,-2.4l21.2,12.1C45.1,55.4 45,56.2 45,57c0,5 4,9 9,9s9,-4 9,-9S59,48 54,48z" android:fillAlpha="0.54"/> </vector> diff --git a/res/layout-land/filtershow_main_panel.xml b/res/layout-land/filtershow_main_panel.xml deleted file mode 100644 index 2d20df12e..000000000 --- a/res/layout-land/filtershow_main_panel.xml +++ /dev/null @@ -1,180 +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:layout_width="match_parent" - android:layout_height="80dp" - android:animateLayoutChanges="true" - android:baselineAligned="false" - android:orientation="vertical" - android:visibility="visible" > - - - <com.android.gallery3d.filtershow.CenteredLinearLayout - xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center|bottom" - android:orientation="vertical" - android:background="@color/edit_actionbar_background" - custom:max_width="400dip" > - - <FrameLayout - android:id="@+id/category_panel_container" - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1" - android:visibility="gone" /> - - <LinearLayout - android:id="@+id/effectsContainer" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="10dp" > - - <ImageButton - android:id="@+id/fxButton" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="match_parent" - android:layout_weight="1" - android:background="@android:color/transparent" - android:scaleType="centerInside" - android:src="@drawable/color" /> - - <ImageButton - android:id="@+id/borderButton" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="match_parent" - android:layout_weight="1" - android:background="@android:color/transparent" - android:padding="2dip" - android:scaleType="centerInside" - android:src="@drawable/frames" /> - - <ImageButton - android:id="@+id/geometryButton" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="match_parent" - android:layout_weight="1" - android:background="@android:color/transparent" - android:padding="2dip" - android:scaleType="centerInside" - android:src="@drawable/crop" /> - - <ImageButton - android:id="@+id/colorsButton" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="match_parent" - android:layout_weight="1" - android:background="@android:color/transparent" - android:padding="2dip" - android:scaleType="centerInside" - android:src="@drawable/exposure" /> - - <ImageButton - android:id="@+id/makeupButton" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="match_parent" - android:layout_weight="1" - android:background="@android:color/transparent" - android:padding="2dip" - android:scaleType="centerInside" - android:src="@drawable/beautify" - android:visibility="gone" /> - <ImageButton - android:id="@+id/dualCamButton" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="match_parent" - android:layout_weight="1" - android:background="@android:color/transparent" - android:padding="2dip" - android:scaleType="centerInside" - android:src="@drawable/dualcamera"/> - </LinearLayout> - - <LinearLayout - android:id="@+id/effectsText" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/tvColor" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="match_parent" - android:layout_weight="1" - android:text="@string/color" - android:textColor="#ffffff" - android:gravity="center" - android:textSize="@dimen/edit_main_font" /> - - <TextView - android:id="@+id/tvFrames" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="match_parent" - android:layout_weight="1" - android:text="@string/frames" - android:textColor="#ffffff" - android:gravity="center" - android:textSize="@dimen/edit_main_font" /> - - <TextView - android:id="@+id/tvCrop" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="match_parent" - android:layout_weight="1" - android:paddingLeft="12dp" - android:text="@string/crop" - android:textColor="#ffffff" - android:gravity="center" - android:textSize="@dimen/edit_main_font" /> - - <TextView - android:id="@+id/tvExposure" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="match_parent" - android:layout_weight="1" - android:text="@string/exposure" - android:textColor="#ffffff" - android:gravity="center" - android:textSize="@dimen/edit_main_font" /> - - <TextView - android:id="@+id/tvBeautify" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="match_parent" - android:layout_weight="1" - android:text="@string/beautify" - android:textColor="#ffffff" - android:gravity="center" - android:textSize="@dimen/edit_main_font" - android:visibility="gone" /> - - <TextView - android:id="@+id/tvDualCam" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/dualcam" - android:gravity="center" - android:textColor="#ffffff" - android:textSize="@dimen/edit_main_font" - android:visibility="gone" /> - </LinearLayout> - </com.android.gallery3d.filtershow.CenteredLinearLayout> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/action_mode.xml b/res/layout/action_mode.xml index a8f5fc2e7..f941b6427 100644 --- a/res/layout/action_mode.xml +++ b/res/layout/action_mode.xml @@ -24,9 +24,9 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="match_parent"> - <ImageView android:layout_gravity="right" - android:layout_width="wrap_content" - android:layout_height="match_parent" + <ImageView android:layout_gravity="right|center_vertical" + android:layout_width="8dp" + android:layout_height="8dp" android:src="@drawable/dropdown_ic_arrow_normal_holo_dark" /> <Button android:id="@+id/selection_menu" style="?android:attr/actionButtonStyle" diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index d89f6b264..4663ce517 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -19,7 +19,7 @@ android:id="@+id/mainView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#212121" > + android:background="@color/background_screen" > <FrameLayout android:layout_width="match_parent" @@ -62,7 +62,7 @@ xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" android:id="@+id/mainPanel" android:layout_width="match_parent" - android:layout_height="80dp" + android:layout_height="wrap_content" android:layout_gravity="center|bottom" android:orientation="vertical" custom:max_width="650dip" > diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml index 00d63c154..bc42be25b 100644 --- a/res/layout/filtershow_main_panel.xml +++ b/res/layout/filtershow_main_panel.xml @@ -20,51 +20,63 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="80dp" + android:layout_height="wrap_content" android:animateLayoutChanges="false" android:baselineAligned="false" android:orientation="vertical" - android:visibility="visible" > + android:visibility="visible" + android:background="@color/background_main_toolbar" > + + <FrameLayout android:id="@+id/state_panel_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="visible" + android:layout_gravity="top" + android:layout_weight="1" /> + + <FrameLayout android:id="@+id/category_panel_container" + android:layout_width="match_parent" + android:visibility="visible" + android:layout_height="0dip" + android:layout_gravity="center" + android:layout_weight="1"/> + + <View + android:background="@color/toolbar_separation_line" + android:layout_height="1dip" + android:layout_width="match_parent"/> <com.android.gallery3d.filtershow.CenteredLinearLayout xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" android:id="@+id/bottom_panel" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="48dip" android:layout_gravity="center|bottom" - android:background="@color/edit_actionbar_background" android:orientation="vertical" custom:max_width="400dip" > - <FrameLayout - android:id="@+id/category_panel_container" - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_gravity="center" - android:layout_weight="1" - android:visibility="gone" /> - <LinearLayout android:id="@+id/effectsContainer" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" + android:background="@color/background_main_toolbar" android:paddingTop="10dp" > <ImageButton android:id="@+id/fxButton" android:layout_width="0dp" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_weight="1" - android:background="@android:color/transparent" + android:background="@drawable/filtershow_button_background" android:scaleType="centerInside" android:src="@drawable/color" /> <ImageButton android:id="@+id/borderButton" android:layout_width="@dimen/thumbnail_size" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_weight="1" - android:background="@android:color/transparent" + android:background="@drawable/filtershow_button_background" android:padding="2dip" android:scaleType="centerInside" android:visibility="gone" @@ -73,9 +85,9 @@ <ImageButton android:id="@+id/geometryButton" android:layout_width="0dp" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_weight="1" - android:background="@android:color/transparent" + android:background="@drawable/filtershow_button_background" android:padding="2dip" android:scaleType="centerInside" android:src="@drawable/crop" /> @@ -83,19 +95,19 @@ <ImageButton android:id="@+id/colorsButton" android:layout_width="0dp" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_weight="1" - android:background="@android:color/transparent" + android:background="@drawable/filtershow_button_background" android:padding="2dip" android:scaleType="centerInside" android:src="@drawable/exposure" /> <ImageButton android:id="@+id/makeupButton" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="wrap_content" + android:layout_width="0dp" + android:layout_height="match_parent" android:layout_weight="1" - android:background="@android:color/transparent" + android:background="@drawable/filtershow_button_background" android:padding="2dip" android:scaleType="centerInside" android:src="@drawable/beautify" @@ -103,10 +115,10 @@ <ImageButton android:id="@+id/dualCamButton" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="wrap_content" + android:layout_width="0dp" + android:layout_height="match_parent" android:layout_weight="1" - android:background="@android:color/transparent" + android:background="@drawable/filtershow_button_background" android:padding="2dip" android:scaleType="centerInside" android:visibility="gone" @@ -114,7 +126,7 @@ <ImageButton android:id="@+id/trueScannerButton" - android:layout_width="@dimen/thumbnail_size" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:background="@android:color/transparent" @@ -124,7 +136,7 @@ <ImageButton android:id="@+id/hazeBusterButton" - android:layout_width="@dimen/thumbnail_size" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:background="@android:color/transparent" @@ -134,7 +146,7 @@ <ImageButton android:id="@+id/seeStraightButton" - android:layout_width="@dimen/thumbnail_size" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:background="@drawable/filtershow_button_background" @@ -142,105 +154,5 @@ android:scaleType="centerInside" android:src="@drawable/seestraight"/> </LinearLayout> - - <LinearLayout - android:id="@+id/effectsText" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/tvColor" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/color" - android:textColor="#ffffff" - android:gravity="center" - android:textSize="@dimen/edit_main_font" /> - - <TextView - android:id="@+id/tvFrames" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/frames" - android:textColor="#ffffff" - android:gravity="center" - android:visibility="gone" - android:textSize="@dimen/edit_main_font" /> - - <TextView - android:id="@+id/tvCrop" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/crop" - android:textColor="#ffffff" - android:gravity="center" - android:textSize="@dimen/edit_main_font" /> - - <TextView - android:id="@+id/tvExposure" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/exposure" - android:gravity="center" - android:textColor="#ffffff" - android:textSize="@dimen/edit_main_font" /> - - <TextView - android:id="@+id/tvBeautify" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/beautify" - android:textColor="#ffffff" - android:gravity="center" - android:textSize="@dimen/edit_main_font" - android:visibility="gone" /> - - <TextView - android:id="@+id/tvDualCam" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/dualcam" - android:gravity="center" - android:textColor="#ffffff" - android:textSize="@dimen/edit_main_font" - android:visibility="gone" /> - - <TextView - android:id="@+id/tvTrueScanner" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/trueScanner" - android:gravity="center" - android:textColor="#ffffff" - android:textSize="@dimen/edit_main_font" /> - - <TextView - android:id="@+id/tvHazeBuster" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/hazeBuster" - android:gravity="center" - android:textColor="#ffffff" - android:textSize="@dimen/edit_main_font" /> - - <TextView - android:id="@+id/tvSeeStraight" - android:layout_width="@dimen/thumbnail_size" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/seeStraight" - android:gravity="center" - android:textColor="#ffffff" - android:textSize="@dimen/edit_main_font" /> - </LinearLayout> </com.android.gallery3d.filtershow.CenteredLinearLayout> </LinearLayout> diff --git a/res/menu/operation.xml b/res/menu/operation.xml index b34cd6803..2403f09fc 100644 --- a/res/menu/operation.xml +++ b/res/menu/operation.xml @@ -33,7 +33,6 @@ android:icon="@drawable/multiselect_share" android:title="@string/share" android:visible="false" - android:actionProviderClass="android.widget.ShareActionProvider" android:showAsAction="never"> </item> <item android:id="@+id/action_delete" diff --git a/res/values-zh-rCN/filtershow_strings.xml b/res/values-zh-rCN/filtershow_strings.xml index ccde8d3f8..c3e37e697 100644 --- a/res/values-zh-rCN/filtershow_strings.xml +++ b/res/values-zh-rCN/filtershow_strings.xml @@ -38,11 +38,12 @@ <string name="size" msgid="4639404642236356037">"大小"</string> <string name="x" msgid="6810256999024563662">"x"</string> <string name="menu_settings" msgid="6428291655769260831">"设置"</string> - <string name="unsaved" msgid="8704442449002374375">"此图片的更改尚未保存。"</string> - <string name="save_before_exit" msgid="2680660633675916712">"要在退出之前保存更改吗？"</string> + <string name="unsaved" msgid="8704442449002374375">"是否放弃当前图片的操作？"</string> + <string name="save_before_exit" msgid="2680660633675916712">"放弃更改？"</string> <string name="save_and_exit" msgid="3628425023766687419">"保存并退出"</string> + <string name="discard">"放弃"</string> <string name="save_and_processing" msgid="6371565035837463194">"正在处理完整分辨率图片…"</string> - <string name="exit" msgid="242642957038770113">"退出"</string> + <string name="exit" msgid="242642957038770113">"取消"</string> <string name="history" msgid="455767361472692409">"历史记录"</string> <string name="reset" msgid="9013181350779592937">"重置"</string> <!-- no translation found for history_original (150973253194312841) --> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index d636a9aac..ee181e939 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -207,4 +207,6 @@ <dimen name="timeline_port_margin">3dp</dimen> <dimen name="timeline_title_height">48dp</dimen> <dimen name="timeline_title_font_size">14sp</dimen> + + <dimen name="timebar_height">60dp</dimen> </resources> diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index 01f667efa..53a5b5c23 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -73,15 +73,17 @@ <!-- Exit Dialog --> <!-- String displayed when exiting with unsaved changes [CHAR LIMIT=NONE] --> - <string name="unsaved">There are unsaved changes to this image.</string> + <string name="unsaved">Discrad the changes you\'ve made to this image?</string> <!-- String displayed when exiting with unsaved changes [CHAR LIMIT=NONE] --> - <string name="save_before_exit">Do you want to save before exiting?</string> + <string name="save_before_exit">Discard changes?</string> <!-- String displayed when saving and exiting editor [CHAR LIMIT=NONE] --> <string name="save_and_exit">Save and Exit</string> + <!-- String displayed when discard editor [CHAR LIMIT=NONE] --> + <string name="discard">Discard</string> <!-- String displayed when saving and exiting editor [CHAR LIMIT=NONE] --> <string name="save_and_processing">Processing full resolution image...</string> <!-- String displayed when exiting editor[CHAR LIMIT=NONE] --> - <string name="exit">Exit</string> + <string name="exit">Cancel</string> <!-- History Panel --> |
