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

Commit abddd175 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android_ui.lnx.2.1-00009. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1062655   I1a3553d6d93d949b6884d3f3301d6f1f53348393   SnapdragonGallery: check for valid background before sav
1063256   I880ad0c55615e4fca39759280e858e5fde1337b7   SnapdragonGallery: Fix display "Deselect all" when leavi
1043964   I7ba9879103ab6b065c394deaa17dd38f8d2361bf   Gallery: fix CTS failure
1062659   I963cc91888217f00e9aceb820962ecc4f043a693   SnapdragonGallery: Check for dialog before creating new
1066553   If5cf78af60daf81a4abf76e8d85534322760ccc8   SnapdragonGallery: Update UI for TruePortrait effects
962597   I688a158dff0c03aca2d7f063df6134b0ffc0b08a   Gallery: speed up TileImageView

Change-Id: If0bc4f176d839f40687e44e0e321517eff1c832a
CRs-Fixed: 1063256, 1043964, 1066553, 1062659, 962597, 1062655
parents 31565ddd b74a2063

AndroidManifest.xml

+1 −8
Original line number Diff line number Diff line
@@ -167,14 +167,7 @@ 
                <data android:scheme="https" />

                <data android:scheme="content" />

                <data android:scheme="file" />

                <data android:mimeType="image/bmp" />

                <data android:mimeType="image/jpeg" />

                <data android:mimeType="image/gif" />

                <data android:mimeType="image/png" />

                <data android:mimeType="image/webp" />

                <data android:mimeType="image/x-ms-bmp" />

                <data android:mimeType="image/x-MS-bmp" />

                <data android:mimeType="image/vnd.wap.wbmp" />

                <data android:mimeType="image/*" />

                <data android:mimeType="application/vnd.google.panorama360+jpg" />

            </intent-filter>

            <intent-filter>

res/drawable/tp_mask_toggle.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="@android:color/holo_blue_light" android:state_checked="true"></item>

    <item android:drawable="@color/cache_placeholder" android:state_checked="false"></item>

</selector>
 
 No newline at end of file

res/layout/do_not_show_again_dialog.xml

+10 −2
Original line number Diff line number Diff line
@@ -30,19 +30,27 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="8dip"

    android:paddingBottom="8dip"

    android:paddingEnd="?android:attr/dialogPreferredPadding"

    android:paddingStart="?android:attr/dialogPreferredPadding"

    android:orientation="vertical" >



    <TextView

        android:id="@+id/message"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_margin="8dp" />

        style="@android:style/TextAppearance.Material.Subhead" />



    <Space

        android:layout_width="0dp"

        android:layout_height="5dp"/>



    <CheckBox

        android:id="@+id/do_not_show_chk"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_margin="8dp"

        style="@android:style/TextAppearance.Material.Subhead"

        android:text="@string/do_not_show_again" />



</LinearLayout>
 
 No newline at end of file

res/layout/filtershow_actionbar_trueportrait_mask.xml

+8 −0
Original line number Diff line number Diff line
@@ -52,15 +52,23 @@ 
            android:id="@+id/maskForeground"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:background="@drawable/tp_mask_toggle"

            android:textColor="@color/primary_text"

            android:paddingEnd="16dp"

            android:paddingStart="16dp"

            android:textOff="@string/foreground"

            android:textOn="@string/foreground" />



        <Space

	        android:layout_width="5dp"

	        android:layout_height="0dp"/>



        <ToggleButton

            android:id="@+id/maskBackground"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:background="@drawable/tp_mask_toggle"

            android:textColor="@color/primary_text"

            android:paddingEnd="16dp"

            android:paddingStart="16dp"

            android:textOff="@string/background"

res/values/filtershow_strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ 
    <string name="fusion_pick_underlay">Pick Underlay</string>

    <string name="dualcam_no_segment_toast">No segment found at this point</string>

    <string name="dualcam_filter_not_supported">Dual camera filters not supported for this image</string>

    <string name="trueportrait_intro">Allows you to enhance photos of people. You can apply effects to the background, such "blur" and "sketch". You can also merge two photos together to create interesting backgrounds for your portrait photos.</string>

    <string name="trueportrait_intro">Allows you to enhance photos of people. You can apply effects to the background, such as \"blur\" and \"sketch\". You can also merge two photos together to create interesting backgrounds for your portrait photos.</string>

    <string name="trueportrait_no_face">True Portrait effects cannot be applied to this photo. Face not detected.</string>

    <string name="trueportrait_edit_intro">With the Touch-Up tool, you can edit the foreground and the background. You can user your finger to paint in any areas of the foreground or background that were missed.</string>

    <string name="trueportrait_edit_foreground_toast">Use your finger to paint in any areas of the foreground that were missed.</string>