diff options
author | zdi <zdi@codeaurora.org> | 2016-03-24 19:51:13 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-14 22:12:31 -0700 |
commit | 18d26cb32c2051ac38de63c9cf79fbee63d048a5 (patch) | |
tree | 5da4966b950fcb10da2d2ee30b59263f0a05824c /res | |
parent | 0e760ee5222ade8f3d0aaa4321d707fb76b90552 (diff) | |
download | android_packages_apps_Gallery2-18d26cb32c2051ac38de63c9cf79fbee63d048a5.tar.gz android_packages_apps_Gallery2-18d26cb32c2051ac38de63c9cf79fbee63d048a5.tar.bz2 android_packages_apps_Gallery2-18d26cb32c2051ac38de63c9cf79fbee63d048a5.zip |
Gallery2: Modify live stream view according to UI spec.
Modify the UI of live stream according to UX specification document.
Change-Id: Ibe13499288ab1896c0901825c556b4e9ad01bcd2
CRs-Fixed: 988695
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ic_menu_disabled_stop.png | bin | 2863 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_menu_stop.png | bin | 2864 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_menu_disabled_stop.png | bin | 2850 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_menu_stop.png | bin | 2841 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_menu_disabled_stop.png | bin | 2904 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_menu_stop.png | bin | 2904 -> 0 bytes | |||
-rw-r--r-- | res/drawable/ic_media_live.xml | 43 | ||||
-rw-r--r-- | res/drawable/ic_menu_disabled_stop.xml | 39 | ||||
-rw-r--r-- | res/drawable/ic_menu_stop.xml | 39 | ||||
-rw-r--r-- | res/layout/movie_view.xml | 8 | ||||
-rw-r--r-- | res/values/dimens.xml | 1 |
11 files changed, 130 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_menu_disabled_stop.png b/res/drawable-hdpi/ic_menu_disabled_stop.png Binary files differdeleted file mode 100644 index 292c49241..000000000 --- a/res/drawable-hdpi/ic_menu_disabled_stop.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_stop.png b/res/drawable-hdpi/ic_menu_stop.png Binary files differdeleted file mode 100644 index aea1c458a..000000000 --- a/res/drawable-hdpi/ic_menu_stop.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_disabled_stop.png b/res/drawable-mdpi/ic_menu_disabled_stop.png Binary files differdeleted file mode 100644 index 0532cea84..000000000 --- a/res/drawable-mdpi/ic_menu_disabled_stop.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_stop.png b/res/drawable-mdpi/ic_menu_stop.png Binary files differdeleted file mode 100644 index 96cf8f46d..000000000 --- a/res/drawable-mdpi/ic_menu_stop.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_menu_disabled_stop.png b/res/drawable-xhdpi/ic_menu_disabled_stop.png Binary files differdeleted file mode 100644 index ba0fc5f61..000000000 --- a/res/drawable-xhdpi/ic_menu_disabled_stop.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_menu_stop.png b/res/drawable-xhdpi/ic_menu_stop.png Binary files differdeleted file mode 100644 index 43e77bee4..000000000 --- a/res/drawable-xhdpi/ic_menu_stop.png +++ /dev/null diff --git a/res/drawable/ic_media_live.xml b/res/drawable/ic_media_live.xml new file mode 100644 index 000000000..d21ce7d0e --- /dev/null +++ b/res/drawable/ic_media_live.xml @@ -0,0 +1,43 @@ +<?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="36dp" + android:height="24dp" + android:viewportHeight="72.0" + android:viewportWidth="108.0"> + <path + android:fillColor="#FFFFFFFF" + android:fillAlpha="0.5" + android:pathData="M15,0h78c8.3,0 15,6.7 15,15v42c0,8.3 -6.7,15 -15,15H15C6.7,72 0,65.3 0,57V15C0,6.7 6.7,0 15,0z" /> + <path + android:fillColor="#FF000000" + android:pathData="M24.6,23.2h-5.1v25.6H36v-3.9H24.6V23.2zM44.7,23.2h-5.1v25.6h5.1L44.7,23.2L44.7,23.2zM52.8,23.2h-5.4l8.7,25.6h5.3l8.7,-25.6h-5.4l-5.6,18.7l-0.3,1.4h-0.1l-0.3,-1.4L52.8,23.2zM87,33.6h-9.5v-6.4h11.2v-4H72.4v25.6h16.4v-3.9H77.5v-7.3H87L87,33.6L87,33.6z" /> +</vector> diff --git a/res/drawable/ic_menu_disabled_stop.xml b/res/drawable/ic_menu_disabled_stop.xml new file mode 100644 index 000000000..ee062f208 --- /dev/null +++ b/res/drawable/ic_menu_disabled_stop.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="48dp" + android:height="48dp" + android:viewportHeight="180.0" + android:viewportWidth="180.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M58,58h64v64h-64z" /> +</vector> diff --git a/res/drawable/ic_menu_stop.xml b/res/drawable/ic_menu_stop.xml new file mode 100644 index 000000000..ee062f208 --- /dev/null +++ b/res/drawable/ic_menu_stop.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="48dp" + android:height="48dp" + android:viewportHeight="180.0" + android:viewportWidth="180.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M58,58h64v64h-64z" /> +</vector> diff --git a/res/layout/movie_view.xml b/res/layout/movie_view.xml index a08679280..3a412e13e 100644 --- a/res/layout/movie_view.xml +++ b/res/layout/movie_view.xml @@ -19,9 +19,17 @@ android:background="@android:color/black" android:layout_width="match_parent" android:layout_height="match_parent"> + <org.codeaurora.gallery3d.video.CodeauroraVideoView android:id="@+id/surface_view" android:visibility="invisible" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_centerInParent="true" /> + + <ImageView + android:id="@+id/img_live" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:src="@drawable/ic_media_live"/> </RelativeLayout> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index ee181e939..87e00eea8 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -209,4 +209,5 @@ <dimen name="timeline_title_font_size">14sp</dimen> <dimen name="timebar_height">60dp</dimen> + <dimen name="livestream_icon_padding">12dp</dimen> </resources> |