diff options
| author | Likai Ding <likaid@codeaurora.org> | 2016-06-06 15:08:29 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-30 23:56:46 -0700 |
| commit | ce6d1cff610acd77b3383d66b7626244cf803493 (patch) | |
| tree | 23135016476c8028299e6bc716d20235053263d3 | |
| parent | 7362c026871e6ce0bb2a6e9a3de6b55c9a917e96 (diff) | |
| download | android_packages_apps_Gallery2-ce6d1cff610acd77b3383d66b7626244cf803493.tar.gz android_packages_apps_Gallery2-ce6d1cff610acd77b3383d66b7626244cf803493.tar.bz2 android_packages_apps_Gallery2-ce6d1cff610acd77b3383d66b7626244cf803493.zip | |
Gallery: multiple fixes
1. fix malformed manifest
2. enable proguard
3. new app name
CRs-Fixed: 1024516
Change-Id: I1b4cff166173fc396d9d9c7d5fa2737246e9de42
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | res/values-zh-rCN/strings.xml | 2 | ||||
| -rwxr-xr-x | res/values/strings.xml | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk index ebf779268..076efffa7 100644 --- a/Android.mk +++ b/Android.mk @@ -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 diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f3a7a9bf6..add9263e6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -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" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index d2ec99f57..8edde3884 100755..100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -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> diff --git a/res/values/strings.xml b/res/values/strings.xml index 6cc605496..424d89e24 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -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> |