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

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

Gallery: Modify some layout according to UX. 

1. change MovieActivity Theme.
2. change toolbar's theme.
3. modify Straighten editor layout.
4. modify click effect of "Video Snapshot" and "Editor Comparison".
5. modify layout of trim video's timebar.
6. change video gesture's max to 1min.
7. fix the selected picture is not selected after onPause() in AlbumPage.

Change-Id: Ief77f0efa3c9c1134eb3032992c797218a46db46
CRs-Fixed: 1032085
parent 8724b7e9

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
        <uses-library android:name="org.apache.http.legacy" android:required="false" />

        <activity android:name="com.android.gallery3d.app.MovieActivity"

                android:label="@string/movie_view_label"

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

                android:configChanges="orientation|keyboardHidden|screenSize|keyboard">

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />
@@ -262,6 +263,7 @@ 
        </activity>

        <activity android:name="com.android.gallery3d.app.TrimVideo"

                android:label="@string/trim_label"

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

                android:configChanges="keyboardHidden|orientation|screenSize">

            <intent-filter android:label="@string/crop_label">

                <action android:name="com.android.camera.action.TRIM" />

res/drawable/comparison.xml

0 → 100644
+35 −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:state_pressed="true" android:drawable="@drawable/comparison_after" />

    <item android:drawable="@drawable/comparison_before" />

</selector>

res/drawable/ic_video_snapshot.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
        android:viewportWidth="108.0">

    <path

            android:fillColor="#FF000000"

            android:fillAlpha="0.30"

            android:fillAlpha="0.50"

            android:pathData="M54,54m-54,0a54,54 0,1 1,108 0a54,54 0,1 1,-108 0"/>

    <path

            android:fillColor="#FFFFFFFF"

res/drawable/ic_video_snapshot_padding_pressed.xml

0 → 100644
+38 −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.

-->



<inset

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

        android:drawable="@drawable/ic_video_snapshot_pressed"

        android:insetTop="12dp"

        android:insetRight="12dp"

        android:insetBottom="12dp"

        android:insetLeft="12dp"/>

res/drawable/ic_video_snapshot_pressed.xml

0 → 100644
+43 −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.

-->



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

        android:height="36dp"

        android:width="36dp"

        android:viewportHeight="108.0"

        android:viewportWidth="108.0">

    <path

            android:fillColor="#FF000000"

            android:fillAlpha="0.26"

            android:pathData="M54,54m-54,0a54,54 0,1 1,108 0a54,54 0,1 1,-108 0"/>

    <path

            android:fillColor="#FFFFFFFF"

            android:pathData="M42,36h6v-6h-6V36zM30,72h6v-6h-6V72zM72,30h-6v6h6V30zM60,30h-6v6h6V30zM72,42h-6v6h6V42zM30,60h6v-6h-6V60zM72,66V54h-6v12H54v6h12v10h6V72h10v-6H72zM42,72h6v-6h-6V72zM30,48h6v-6h-6V48zM30,36h6v-6h-6V36z"/>

</vector>