diff options
| author | Chao Zhang <chaoz@codeaurora.org> | 2016-04-15 13:37:08 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-25 00:31:28 -0700 |
| commit | d74a961ac7bf422893645fc281ff208e87ff31b1 (patch) | |
| tree | 31cb14e588b10445a8bf9fe9601ff8f81c9bc925 /res | |
| parent | d2e30f629da3cfa37787bd64facdc1b104a62e14 (diff) | |
| download | android_packages_apps_Gallery2-d74a961ac7bf422893645fc281ff208e87ff31b1.tar.gz android_packages_apps_Gallery2-d74a961ac7bf422893645fc281ff208e87ff31b1.tar.bz2 android_packages_apps_Gallery2-d74a961ac7bf422893645fc281ff208e87ff31b1.zip | |
Gallery2: Add gesture controller in MoviePlayer according to UI spec.
1. Add gesture controller in MoviePlayer according to UI spec,
include adjust brightness, adjust volume, adjust video position.
2. Tap screen when system ui is shown, hide system ui immediately.
Change-Id: I759246baa1efb18cd525716da59a314ecefaf163
CRs-Fixed: 988590
Diffstat (limited to 'res')
23 files changed, 245 insertions, 0 deletions
diff --git a/res/drawable-hdpi/bg_controller_indicator.9.png b/res/drawable-hdpi/bg_controller_indicator.9.png Binary files differnew file mode 100644 index 000000000..e90e9f710 --- /dev/null +++ b/res/drawable-hdpi/bg_controller_indicator.9.png diff --git a/res/drawable-hdpi/ic_menu_disabled_forward.png b/res/drawable-hdpi/ic_menu_disabled_forward.png Binary files differdeleted file mode 100644 index c9683df0a..000000000 --- a/res/drawable-hdpi/ic_menu_disabled_forward.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_disabled_rewind.png b/res/drawable-hdpi/ic_menu_disabled_rewind.png Binary files differdeleted file mode 100644 index 1f74fb8ea..000000000 --- a/res/drawable-hdpi/ic_menu_disabled_rewind.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_forward.png b/res/drawable-hdpi/ic_menu_forward.png Binary files differdeleted file mode 100644 index 468008269..000000000 --- a/res/drawable-hdpi/ic_menu_forward.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_rewind.png b/res/drawable-hdpi/ic_menu_rewind.png Binary files differdeleted file mode 100644 index 37c5708fa..000000000 --- a/res/drawable-hdpi/ic_menu_rewind.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_disabled_forward.png b/res/drawable-mdpi/ic_menu_disabled_forward.png Binary files differdeleted file mode 100644 index bbc8920f0..000000000 --- a/res/drawable-mdpi/ic_menu_disabled_forward.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_disabled_rewind.png b/res/drawable-mdpi/ic_menu_disabled_rewind.png Binary files differdeleted file mode 100644 index 28acd42d8..000000000 --- a/res/drawable-mdpi/ic_menu_disabled_rewind.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_forward.png b/res/drawable-mdpi/ic_menu_forward.png Binary files differdeleted file mode 100644 index 85b7057cb..000000000 --- a/res/drawable-mdpi/ic_menu_forward.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_rewind.png b/res/drawable-mdpi/ic_menu_rewind.png Binary files differdeleted file mode 100644 index 8b46eee7c..000000000 --- a/res/drawable-mdpi/ic_menu_rewind.png +++ /dev/null diff --git a/res/drawable-xhdpi/bg_controller_indicator.9.png b/res/drawable-xhdpi/bg_controller_indicator.9.png Binary files differnew file mode 100644 index 000000000..203a93b01 --- /dev/null +++ b/res/drawable-xhdpi/bg_controller_indicator.9.png diff --git a/res/drawable-xhdpi/ic_menu_disabled_forward.png b/res/drawable-xhdpi/ic_menu_disabled_forward.png Binary files differdeleted file mode 100644 index e73d4d4a5..000000000 --- a/res/drawable-xhdpi/ic_menu_disabled_forward.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_menu_disabled_rewind.png b/res/drawable-xhdpi/ic_menu_disabled_rewind.png Binary files differdeleted file mode 100644 index ad3be649b..000000000 --- a/res/drawable-xhdpi/ic_menu_disabled_rewind.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_menu_forward.png b/res/drawable-xhdpi/ic_menu_forward.png Binary files differdeleted file mode 100644 index f225ffc91..000000000 --- a/res/drawable-xhdpi/ic_menu_forward.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_menu_rewind.png b/res/drawable-xhdpi/ic_menu_rewind.png Binary files differdeleted file mode 100644 index fbfa5cab6..000000000 --- a/res/drawable-xhdpi/ic_menu_rewind.png +++ /dev/null diff --git a/res/drawable-xxhdpi/bg_controller_indicator.9.png b/res/drawable-xxhdpi/bg_controller_indicator.9.png Binary files differnew file mode 100644 index 000000000..093f1368a --- /dev/null +++ b/res/drawable-xxhdpi/bg_controller_indicator.9.png diff --git a/res/drawable/ic_controller_brightness.xml b/res/drawable/ic_controller_brightness.xml new file mode 100644 index 000000000..8c912fc13 --- /dev/null +++ b/res/drawable/ic_controller_brightness.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:height="24dp" + android:width="24dp" + android:viewportHeight="108.0" + android:viewportWidth="108.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M87.94,39.94L87.94,20.06L68.06,20.06L54,6 39.94,20.06L20.06,20.06L20.06,39.94L6,54l14.06,14.06v19.88h19.88L54,102l14.06,-14.06h19.88L87.94,68.06L102,54ZM54,78a24,24 0,1 1,24 -24A24,24 0,0 1,54 78ZM54,36a18,18 0,1 0,18 18A18,18 0,0 0,54 36Z"/> +</vector> diff --git a/res/drawable/ic_controller_volume.xml b/res/drawable/ic_controller_volume.xml new file mode 100644 index 000000000..39b244025 --- /dev/null +++ b/res/drawable/ic_controller_volume.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:height="24dp" + android:width="24dp" + android:viewportHeight="108.0" + android:viewportWidth="108.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M33,32.04L12,32.04a5.99,5.99 0,0 0,-6 5.99v31.93a5.99,5.99 0,0 0,6 5.99L33,75.95v-0.04l23.98,18.63a1.88,1.88 0,0 0,3.03 -1.48L60.01,14.93a1.88,1.88 0,0 0,-3.03 -1.48L33,32.08L33,32.04ZM72.58,26.48 L66.21,32.83a29.89,29.89 0,0 1,0 42.33l6.36,6.35A38.85,38.85 0,0 0,72.58 26.48ZM85.3,13.78 L78.94,20.13a47.82,47.82 0,0 1,0 67.74l6.36,6.35A56.79,56.79 0,0 0,85.3 13.78Z"/> +</vector> diff --git a/res/drawable/ic_menu_disabled_forward.xml b/res/drawable/ic_menu_disabled_forward.xml new file mode 100644 index 000000000..2927aee0f --- /dev/null +++ b/res/drawable/ic_menu_disabled_forward.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:height="24dp" + android:width="24dp" + android:viewportHeight="108.0" + android:viewportWidth="108.0"> + <path + android:fillColor="#FFFFFFFF" + android:fillAlpha="0.30" + android:pathData="M47,22v64l50,-32ZM11,22v64l50,-32Z"/> +</vector> diff --git a/res/drawable/ic_menu_disabled_rewind.xml b/res/drawable/ic_menu_disabled_rewind.xml new file mode 100644 index 000000000..e63a188fb --- /dev/null +++ b/res/drawable/ic_menu_disabled_rewind.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:height="24dp" + android:width="24dp" + android:viewportHeight="108.0" + android:viewportWidth="108.0"> + <path + android:fillColor="#FFFFFFFF" + android:fillAlpha="0.30" + android:pathData="M61,22v64l-50,-32ZM97,22v64l-50,-32Z"/> +</vector> diff --git a/res/drawable/ic_menu_forward.xml b/res/drawable/ic_menu_forward.xml new file mode 100644 index 000000000..da3482afd --- /dev/null +++ b/res/drawable/ic_menu_forward.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:height="24dp" + android:width="24dp" + android:viewportHeight="108.0" + android:viewportWidth="108.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M47,22v64l50,-32ZM11,22v64l50,-32Z"/> +</vector> diff --git a/res/drawable/ic_menu_rewind.xml b/res/drawable/ic_menu_rewind.xml new file mode 100644 index 000000000..a044914e5 --- /dev/null +++ b/res/drawable/ic_menu_rewind.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:height="24dp" + android:width="24dp" + android:viewportHeight="108.0" + android:viewportWidth="108.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M61,22v64l-50,-32ZM97,22v64l-50,-32Z"/> +</vector> diff --git a/res/layout/movie_view.xml b/res/layout/movie_view.xml index 3a412e13e..de9584bb4 100644 --- a/res/layout/movie_view.xml +++ b/res/layout/movie_view.xml @@ -30,6 +30,7 @@ android:id="@+id/img_live" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentTop="true" android:layout_alignParentRight="true" android:src="@drawable/ic_media_live"/> </RelativeLayout> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 6b5a51584..807861102 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -218,4 +218,12 @@ <dimen name="timebar_margin">30dp</dimen> <dimen name="timebar_time_margin">45dp</dimen> <dimen name="livestream_icon_padding">12dp</dimen> + + <!-- configuration for gesture controller indicator. --> + <dimen name="controller_indicator_width">80dp</dimen> + <dimen name="controller_indicator_height">90dp</dimen> + <dimen name="controller_indicator_padding_v">15dp</dimen> + <dimen name="controller_indicator_padding_h">10dp</dimen> + <dimen name="controller_indicator_icon_size">36dp</dimen> + <dimen name="controller_indicator_text_size">16sp</dimen> </resources> |
