diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/Android.bp | 35 | ||||
| -rw-r--r-- | ui/Android.mk | 17 | ||||
| -rw-r--r-- | ui/res/values-vi/strings.xml | 2 | ||||
| -rw-r--r-- | ui/src/com/android/providers/downloads/ui/TrampolineActivity.java | 16 |
4 files changed, 50 insertions, 20 deletions
diff --git a/ui/Android.bp b/ui/Android.bp new file mode 100644 index 00000000..5192eadb --- /dev/null +++ b/ui/Android.bp @@ -0,0 +1,35 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +android_app { + name: "DownloadProviderUi", + + manifest: "AndroidManifest.xml", + + srcs: [ + ":download_provider-files", + "src/**/*.java", + ], + + resource_dirs: [ + "res", + ], + + platform_apis: true, + + certificate: "media", + + privileged: true, +} diff --git a/ui/Android.mk b/ui/Android.mk deleted file mode 100644 index f63d7e3f..00000000 --- a/ui/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-java-files-under, src) \ - ../src/com/android/providers/downloads/OpenHelper.java \ - ../src/com/android/providers/downloads/Constants.java \ - ../src/com/android/providers/downloads/DownloadDrmHelper.java \ - ../src/com/android/providers/downloads/RawDocumentsHelper.java - -LOCAL_PACKAGE_NAME := DownloadProviderUi -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_CERTIFICATE := media -LOCAL_PRIVILEGED_MODULE := true - -include $(BUILD_PACKAGE) diff --git a/ui/res/values-vi/strings.xml b/ui/res/values-vi/strings.xml index 77597861..287fccd1 100644 --- a/ui/res/values-vi/strings.xml +++ b/ui/res/values-vi/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_label" msgid="3070921713463294774">"Nội dung tải xuống"</string> + <string name="app_label" msgid="3070921713463294774">"Tệp đã tải xuống"</string> <string name="download_title_sorted_by_date" msgid="5898014492155434221">"Tải xuống - Sắp xếp theo ngày"</string> <string name="download_title_sorted_by_size" msgid="1417193166677094813">"Tải xuống - Sắp xếp theo kích thước"</string> <string name="no_downloads" msgid="1029667411186146836">"Không có bản tải xuống nào."</string> diff --git a/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java b/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java index 41d7187a..b3c08131 100644 --- a/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java +++ b/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java @@ -23,7 +23,6 @@ import android.app.DialogFragment; import android.app.DownloadManager; import android.app.DownloadManager.Query; import android.app.FragmentManager; -import android.content.ActivityNotFoundException; import android.content.ContentUris; import android.content.Context; import android.content.DialogInterface; @@ -36,6 +35,7 @@ import android.util.Log; import android.widget.Toast; import com.android.providers.downloads.Constants; +import com.android.providers.downloads.MediaStoreDownloadsHelper; import com.android.providers.downloads.OpenHelper; import com.android.providers.downloads.RawDocumentsHelper; @@ -67,6 +67,18 @@ public class TrampolineActivity extends Activity { return; } + if (MediaStoreDownloadsHelper.isMediaStoreDownload( + DocumentsContract.getDocumentId(documentUri))) { + final Intent intent = OpenHelper.buildViewIntentForMediaStoreDownload( + this, documentUri); + if (intent == null || !OpenHelper.startViewIntent(this, intent)) { + Toast.makeText(this, R.string.download_no_application_title, Toast.LENGTH_SHORT) + .show(); + } + finish(); + return; + } + final long id = ContentUris.parseId(documentUri); final DownloadManager dm = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE); dm.setAccessAllDownloads(true); @@ -221,7 +233,7 @@ public class TrampolineActivity extends Activity { builder.setMessage(R.string.dialog_file_already_exists); break; case DownloadManager.ERROR_INSUFFICIENT_SPACE: - builder.setMessage(R.string.dialog_insufficient_space_on_external); + builder.setMessage(R.string.dialog_insufficient_space_on_cache); break; case DownloadManager.ERROR_DEVICE_NOT_FOUND: builder.setMessage(R.string.dialog_media_not_found); |