aboutsummaryrefslogtreecommitdiff
path: root/platform/android/java/res
diff options
context:
space:
mode:
authorvolzhs2016-05-20 22:57:49 +0900
committervolzhs2016-05-20 22:57:49 +0900
commit160713d4d36ab4bd5f9b53d0d3e0c69d7e4960f7 (patch)
tree78686a17e29b4afd6b331b0d712690e3dc35cc0c /platform/android/java/res
parent926495d8eb11de2878319ba54f30812fa1637d72 (diff)
downloadgodot-160713d4d36ab4bd5f9b53d0d3e0c69d7e4960f7.tar.gz
godot-160713d4d36ab4bd5f9b53d0d3e0c69d7e4960f7.tar.zst
godot-160713d4d36ab4bd5f9b53d0d3e0c69d7e4960f7.zip
Supporting Android API 23 (Android 6.0)
If we update build gradle to use ``compileSdkVersion 23``, ``org.apache.http`` package causes error. (issue #4711) We need to use ``useLibrary 'org.apache.http.legacy'`` to solve this problem. To use ``useLibrary``, we need to use latest gradle also. And now, we faced another problem with ``APK Expansion`` java sources. ``` /platform/android/java/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java 137 : mCurrentNotification.setLatestEventInfo(mContext, mCurrentTitle, mCurrentText, mContentIntent); // causes error ``` So, some of APK Expansion java sources are updated by referencing commits from https://github.com/danikula/Google-Play-Expansion-File And dropped V3CustomNotification.java which was for android 3.0, since godot supports android 14 (4.0) above officially. Unfortunately, another problem, The 'MissingTranslation' error was occurred. So, build.gradle is updated to use ``disable 'MissingTranslation'`` Additionally, I updated ``buildToolsVersion``, ``targetSdkVersion`` to latest version. I tested APK Expansion funtionality on Android 6.0 (Nexus 9, Nexus 6p) and Android 4.4 (Galaxy Note 2) with Google Developer console.
Diffstat (limited to 'platform/android/java/res')
-rw-r--r--platform/android/java/res/layout/downloading_expansion.xml2
-rw-r--r--platform/android/java/res/values-fa/strings.xml1
2 files changed, 1 insertions, 2 deletions
diff --git a/platform/android/java/res/layout/downloading_expansion.xml b/platform/android/java/res/layout/downloading_expansion.xml
index 553155dcd..d678d94ea 100644
--- a/platform/android/java/res/layout/downloading_expansion.xml
+++ b/platform/android/java/res/layout/downloading_expansion.xml
@@ -80,7 +80,7 @@
</RelativeLayout>
<LinearLayout
- android:id="@+id/downloaderDashboard"
+ android:id="@+id/downloadButton"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
diff --git a/platform/android/java/res/values-fa/strings.xml b/platform/android/java/res/values-fa/strings.xml
index 450f9fe21..f1e29013c 100644
--- a/platform/android/java/res/values-fa/strings.xml
+++ b/platform/android/java/res/values-fa/strings.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="godot_project_name_string">godot-project-name-fa</string>
- <string name="testuf8">سلام</string>
<string name="text_paused_cellular">آیا می خواهید بر روی اتصال داده همراه دانلود را شروع کنید؟ بر اساس نوع سطح داده شما این ممکن است برای شما هزینه مالی داشته باشد.</string>
<string name="text_paused_cellular_2">اگر نمی خواهید بر روی اتصال داده همراه دانلود را شروع کنید ، دانلود به صورت خودکار در زمان دسترسی به وای-فای شروع می شود.</string>
<string name="text_button_resume_cellular">ادامه دانلود</string>