2014-08-02 03:10:38 +02:00
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="match_parent"
|
|
|
|
android:orientation="vertical" >
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_weight="0"
|
|
|
|
android:orientation="vertical" >
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/statusText"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_marginBottom="10dp"
|
|
|
|
android:layout_marginLeft="5dp"
|
|
|
|
android:layout_marginTop="10dp"
|
|
|
|
android:textStyle="bold" />
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
android:id="@+id/downloaderDashboard"
|
|
|
|
android:layout_width="fill_parent"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_below="@id/statusText"
|
|
|
|
android:orientation="vertical" >
|
|
|
|
|
|
|
|
<RelativeLayout
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_weight="1" >
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/progressAsFraction"
|
|
|
|
style="@android:style/TextAppearance.Small"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_alignParentLeft="true"
|
|
|
|
android:layout_marginLeft="5dp"
|
|
|
|
android:text="0MB / 0MB" >
|
|
|
|
</TextView>
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/progressAsPercentage"
|
|
|
|
style="@android:style/TextAppearance.Small"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_alignRight="@+id/progressBar"
|
|
|
|
android:text="0%" />
|
|
|
|
|
|
|
|
<ProgressBar
|
|
|
|
android:id="@+id/progressBar"
|
|
|
|
style="?android:attr/progressBarStyleHorizontal"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_below="@+id/progressAsFraction"
|
|
|
|
android:layout_marginBottom="10dp"
|
|
|
|
android:layout_marginLeft="10dp"
|
|
|
|
android:layout_marginRight="10dp"
|
|
|
|
android:layout_marginTop="10dp"
|
|
|
|
android:layout_weight="1" />
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/progressAverageSpeed"
|
|
|
|
style="@android:style/TextAppearance.Small"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_alignParentLeft="true"
|
|
|
|
android:layout_below="@+id/progressBar"
|
|
|
|
android:layout_marginLeft="5dp" />
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/progressTimeRemaining"
|
|
|
|
style="@android:style/TextAppearance.Small"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_alignRight="@+id/progressBar"
|
|
|
|
android:layout_below="@+id/progressBar" />
|
|
|
|
</RelativeLayout>
|
|
|
|
|
|
|
|
<LinearLayout
|
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.
2016-05-20 15:57:49 +02:00
|
|
|
android:id="@+id/downloadButton"
|
2014-08-02 03:10:38 +02:00
|
|
|
android:layout_width="fill_parent"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:orientation="horizontal" >
|
|
|
|
|
|
|
|
<Button
|
|
|
|
android:id="@+id/pauseButton"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="center_vertical"
|
|
|
|
android:layout_marginBottom="10dp"
|
|
|
|
android:layout_marginLeft="10dp"
|
|
|
|
android:layout_marginRight="5dp"
|
|
|
|
android:layout_marginTop="10dp"
|
|
|
|
android:layout_weight="0"
|
|
|
|
android:minHeight="40dp"
|
|
|
|
android:minWidth="94dp"
|
|
|
|
android:text="@string/text_button_pause" />
|
|
|
|
|
|
|
|
<Button
|
|
|
|
android:id="@+id/cancelButton"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="center_vertical"
|
|
|
|
android:layout_marginBottom="10dp"
|
|
|
|
android:layout_marginLeft="5dp"
|
|
|
|
android:layout_marginRight="5dp"
|
|
|
|
android:layout_marginTop="10dp"
|
|
|
|
android:layout_weight="0"
|
|
|
|
android:minHeight="40dp"
|
|
|
|
android:minWidth="94dp"
|
|
|
|
android:text="@string/text_button_cancel"
|
|
|
|
android:visibility="gone" />
|
|
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
android:id="@+id/approveCellular"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="match_parent"
|
|
|
|
android:layout_weight="1"
|
|
|
|
android:orientation="vertical"
|
|
|
|
android:visibility="gone" >
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_margin="10dp"
|
|
|
|
android:id="@+id/textPausedParagraph1"
|
|
|
|
android:text="@string/text_paused_cellular" />
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_margin="10dp"
|
|
|
|
android:id="@+id/textPausedParagraph2"
|
|
|
|
android:text="@string/text_paused_cellular_2" />
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
android:id="@+id/buttonRow"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:orientation="horizontal" >
|
|
|
|
|
|
|
|
<Button
|
|
|
|
android:id="@+id/resumeOverCellular"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="center"
|
|
|
|
android:layout_margin="10dp"
|
|
|
|
android:text="@string/text_button_resume_cellular" />
|
|
|
|
|
|
|
|
<Button
|
|
|
|
android:id="@+id/wifiSettingsButton"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="center"
|
|
|
|
android:layout_margin="10dp"
|
|
|
|
android:text="@string/text_button_wifi_settings" />
|
|
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
</LinearLayout>
|