Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8724b7e9 authored by Chao Zhang's avatar Chao Zhang Committed by Likai Ding
Browse files

Gallery: Modify the layout according to UX design document. 

1. Modify toolbar layout according to UX design document.
2. Add touch effect to all buttons if need.
3. Modify video gesture indicator text color.
4. Don't use createChooser if only one app resolve Intent.
5. Modify export dialog layout in Photo Editor.
6. Modify truescanner icon.
7. Modify filter's label color.

Change-Id: I987966ce76e5cab7bc50e5d2e52d1f7b5bdf2113
CRs-Fixed: 1017208
parent 8788884b

res/drawable/truescanner_background.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?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/truescanner" android:state_selected="false"/>

    <item android:drawable="@drawable/truescanner_select" android:state_selected="true"/>

</selector>
 
 No newline at end of file

res/drawable/truescanner_select.xml

0 → 100644
+63 −0
Original line number Diff line number Diff line 
<!--

  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="32dp"

    android:height="32dp"

    android:viewportWidth="32"

    android:viewportHeight="32">



    <path

        android:fillColor="#FF4F92E9"

        android:pathData="M15.1,23.4c0,0.8,0,1.6,0,2.3c-4,0-7.9,0-11.9,0c0-6.7,0-13.4,0-20c4,0,7.9,0,11.9,0c0,0.8,0,1.5,0,2.3

c-3.2,0-6.4,0-9.6,0c0,5.1,0,10.2,0,15.4C8.7,23.4,11.9,23.4,15.1,23.4z" />

    <path

        android:fillColor="#FF4F92E9"

        android:pathData="M15.1,10c0,0,0,0.1,0,0.1c0,1.9,0,3.7,0,5.6c0,0.1,0,0.2-0.1,0.3c-0.1,0.2-0.2,0.4-0.3,0.6c0,0,0,0.1,0,0.1

c0.1,0,0.3,0,0.4,0c0,0.8,0,1.5,0,2.2c-0.1,0-0.2,0-0.3,0c-0.3,0-0.7,0-1,0c-0.1,0-0.1,0-0.2,0.1c-0.4,0.8-0.7,1.6-1.1,2.4

c0,0.1-0.1,0.1-0.1,0.1c-0.9,0-1.8,0-2.8,0c0,0,0,0-0.1,0C11.4,17.7,13.2,13.9,15.1,10C15.1,10,15.1,10,15.1,10z" />

    <path

        android:fillColor="#FF4F92E9"

        android:pathData="M17,16.4c0,4.2,0,8.4,0,12.5c0,0.3-0.2,0.5-0.4,0.5c-0.3,0-0.5-0.2-0.5-0.4c0,0,0-0.1,0-0.1

c0-8.3,0-16.7,0-25c0-0.1,0-0.2,0-0.2c0.1-0.2,0.3-0.4,0.5-0.3c0.2,0,0.4,0.2,0.4,0.5c0,0,0,0.1,0,0.1C17,8.1,17,12.3,17,16.4z" />

    <path

        android:fillColor="#FF4F92E9"

        android:pathData="M28.7,6.5c0,6.1,0,12.2,0,18.3c-3.4,0-6.9,0-10.3,0c0-0.1,0-0.2,0-0.3c3.3,0,6.7,0,10,0

c0-5.9,0-11.8,0-17.7c-3.3,0-6.6,0-9.9,0c0-0.1,0-0.2,0-0.3C21.9,6.5,25.3,6.5,28.7,6.5z" />

    <path

        android:fillColor="#FF4F92E9"

        android:pathData="M18,9.6c1.9,4,3.8,8,5.7,12.1c-0.1,0-0.1,0-0.1,0c-1,0-2,0-3,0c-0.1,0-0.1,0-0.2-0.1

c-0.4-0.8-0.7-1.6-1.1-2.4c0-0.1-0.1-0.1-0.2-0.1c-0.3,0-0.7,0-1,0c0,0-0.1,0-0.1,0c0-0.1,0-0.2,0-0.3c0,0,0.1,0,0.1,0

c0.4,0,0.9,0,1.3,0c0.1,0,0.1,0,0.2,0.1c0.4,0.8,0.7,1.6,1.1,2.4c0,0.1,0.1,0.1,0.2,0.1c0.8,0,1.5,0,2.3,0c0,0,0.1,0,0.1,0

c-0.1-0.2-0.2-0.5-0.3-0.7c-1.6-3.3-3.1-6.6-4.7-9.9c0,0,0-0.1,0-0.1C17.9,10.4,17.9,10,18,9.6C18,9.7,18,9.6,18,9.6

C18,9.6,18,9.6,18,9.6z" />

    <path

        android:fillColor="#FF4F92E9"

        android:pathData="M18.6,16.8c-0.2,0-0.4,0-0.6,0c0-0.1,0-0.2,0-0.3c0,0,0.1,0,0.1,0c-0.2-0.3-0.1-0.7-0.1-1

C18.2,15.9,18.4,16.4,18.6,16.8z" />

</vector>

res/layout/filtershow_actionbar.xml

+5 −3
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
     limitations under the License.

-->

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:theme="@android:style/Theme.DeviceDefault"

    android:layout_width="match_parent"

    android:layout_height="@dimen/toolbar_height"

    android:orientation="horizontal">
@@ -23,17 +24,18 @@ 
        android:id="@+id/filtershow_exit"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:background="@android:color/transparent"

        android:background="?android:attr/actionBarItemBackground"

        android:scaleType="fitCenter"

        android:src="@drawable/cancel"

        android:layout_gravity="left|center_vertical"

        android:paddingStart="6dp" />

        android:layout_marginStart="@dimen/toolbar_exit_padding_left" />



    <TextView

        android:id="@+id/filtershow_done"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:paddingRight="13dp"

        android:background="?android:attr/selectableItemBackgroundBorderless"

        android:layout_marginEnd="13dp"

        android:textSize="17sp"

        android:text="@string/save"

        android:textAllCaps="true"

res/layout/filtershow_actionbar_effects.xml

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        android:layout_height="fill_parent"

        android:layout_gravity="left|center_vertical"

        android:layout_weight=".1"

        android:background="@android:color/transparent"

        android:background="?android:attr/actionBarItemBackground"

        android:gravity="center"

        android:src="@drawable/cancel"

        android:paddingStart="16dp"
@@ -63,7 +63,7 @@ 
        android:layout_height="fill_parent"

        android:layout_gravity="right|center_vertical"

        android:layout_weight=".1"

        android:background="@android:color/transparent"

        android:background="?android:attr/actionBarItemBackground"

        android:gravity="center"

        android:src="@drawable/done"

        android:paddingEnd="16dp"

res/layout/filtershow_bottom_panel.xml

+11 −10
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
-->



<com.android.gallery3d.filtershow.CenteredLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:theme="@android:style/Theme.DeviceDefault"

    android:id="@+id/bottom_panel"

    android:layout_width="match_parent"

    android:layout_height="match_parent"
@@ -47,7 +48,7 @@ 
            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:background="@android:color/transparent"

            android:background="?android:attr/actionBarItemBackground"

            android:scaleType="centerInside"

            android:src="@drawable/color_background" />
@@ -56,7 +57,7 @@ 
            android:layout_width="@dimen/thumbnail_size"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:background="@android:color/transparent"

            android:background="?android:attr/actionBarItemBackground"

            android:padding="2dip"

            android:scaleType="centerInside"

            android:src="@drawable/frames_background"
@@ -67,7 +68,7 @@ 
            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:background="@android:color/transparent"

            android:background="?android:attr/actionBarItemBackground"

            android:padding="2dip"

            android:scaleType="centerInside"

            android:src="@drawable/crop_background" />
@@ -77,7 +78,7 @@ 
            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:background="@android:color/transparent"

            android:background="?android:attr/actionBarItemBackground"

            android:padding="2dip"

            android:scaleType="centerInside"

            android:src="@drawable/exposure_background" />
@@ -87,7 +88,7 @@ 
            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:background="@android:color/transparent"

            android:background="?android:attr/actionBarItemBackground"

            android:padding="2dip"

            android:scaleType="centerInside"

            android:src="@drawable/beautify_background"
@@ -98,7 +99,7 @@ 
            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:background="@android:color/transparent"

            android:background="?android:attr/actionBarItemBackground"

            android:padding="2dip"

            android:scaleType="centerInside"

            android:src="@drawable/dualcamera_background"
@@ -109,17 +110,17 @@ 
            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:background="@android:color/transparent"

            android:background="?android:attr/actionBarItemBackground"

            android:padding="2dip"

            android:scaleType="centerInside"

            android:src="@drawable/truescanner" />

            android:src="@drawable/truescanner_background" />



        <ImageButton

            android:id="@+id/hazeBusterButton"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:background="@android:color/transparent"

            android:background="?android:attr/actionBarItemBackground"

            android:padding="2dip"

            android:scaleType="centerInside"

            android:src="@drawable/hazebuster" />
@@ -129,7 +130,7 @@ 
            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:background="@android:color/transparent"

            android:background="?android:attr/actionBarItemBackground"

            android:padding="2dip"

            android:scaleType="centerInside"

            android:src="@drawable/seestraight" />