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

Commit 98e2574f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Gallery: multiple fixes"

parents 8604e358 ce6d1cff

Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ LOCAL_SRC_FILES += $(call all-java-files-under, src_pd) 


# $(warning Anand Commend LOCAL_RENDERSCRIPT_SKIP_INSTALL is $(LOCAL_RENDERSCRIPT_SKIP_INSTALL))



LOCAL_PROGUARD_ENABLED := disabled



LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res



LOCAL_AAPT_FLAGS := --auto-add-overlay
@@ -41,8 +39,6 @@ LOCAL_PRIVILEGED_MODULE := true 


LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D Gallery2



LOCAL_PROGUARD_ENABLED := disabled



LOCAL_SDK_VERSION := current



LOCAL_JNI_SHARED_LIBRARIES := libjni_gallery_eglfence libjni_gallery_filters libjni_gallery_jpegstream

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
    <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE"/>

    <uses-permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER" />

    <uses-permission android:name="android.permission.BLUETOOTH" />

    //add for guest to set system property

    <!-- add for guest to set system property -->

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />



    <supports-screens android:smallScreens="false"
@@ -61,7 +61,7 @@ 
            android:largeHeap="true"

            android:restoreAnyVersion="true"

            android:supportsRtl="true"

            usesCleartextHttp="true">

            android:usesCleartextTraffic="true">

        <uses-library android:name="com.google.android.media.effects" android:required="false" />

        <uses-library android:name="org.apache.http.legacy" android:required="false" />

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

res/values-zh-rCN/strings.xml

100755 → 100644
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name" msgid="1928079047368929634">"图库"</string>

    <string name="app_name" msgid="1928079047368929634">"骁龙图库"</string>

    <string name="gadget_title" msgid="259405922673466798">"相框"</string>

    <string name="details_ms" msgid="940634969189855292">"%1$02d:%2$02d"</string>

    <string name="details_hms" msgid="3215779248094151255">"%1$d:%2$02d:%3$02d"</string>

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
-->



<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name">Gallery</string>

    <string name="app_name">Snapdragon Gallery</string>

    <!-- Title for picture frame gadget to show in list of all available gadgets -->

    <string name="gadget_title">Picture frame</string>