diff options
author | Vivek Sekhar <vsekhar@codeaurora.org> | 2015-01-05 16:01:07 -0800 |
---|---|---|
committer | Vivek Sekhar <vsekhar@codeaurora.org> | 2015-01-05 17:11:45 -0800 |
commit | efefe6b84fd95e0582f7814951bb5fcebff6f92d (patch) | |
tree | 385206f116e77203b5cd447943764ae995b6faca /src/com/android/browser/DownloadSettings.java | |
parent | 5fb557e8ad3c648f0d5e2e93e7a0b8bd9b5903ab (diff) | |
download | android_packages_apps_Gello-efefe6b84fd95e0582f7814951bb5fcebff6f92d.tar.gz android_packages_apps_Gello-efefe6b84fd95e0582f7814951bb5fcebff6f92d.tar.bz2 android_packages_apps_Gello-efefe6b84fd95e0582f7814951bb5fcebff6f92d.zip |
Use overlay for download path selection
- Query overlay resource for file explorer intent that needs to be
invoked during the download path selection.
Change-Id: I3ed9c41c948dd216a39b561a7b3d75b9f96bc8f7
Diffstat (limited to 'src/com/android/browser/DownloadSettings.java')
-rw-r--r-- | src/com/android/browser/DownloadSettings.java | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/src/com/android/browser/DownloadSettings.java b/src/com/android/browser/DownloadSettings.java index d67d6d60..175f5f98 100644 --- a/src/com/android/browser/DownloadSettings.java +++ b/src/com/android/browser/DownloadSettings.java @@ -156,14 +156,20 @@ public class DownloadSettings extends Activity { @Override public void onClick(View v) { - // start filemanager for getting download path - try { - Intent downloadPathIntent = new Intent("com.android.fileexplorer.action.DIR_SEL"); - DownloadSettings.this.startActivityForResult(downloadPathIntent, DOWNLOAD_PATH); - } catch (Exception e) { - String err_msg = getString(R.string.activity_not_found, - "com.android.fileexplorer.action.DIR_SEL"); - Toast.makeText(DownloadSettings.this, err_msg, Toast.LENGTH_LONG).show(); + final String filemanagerIntent = + getResources().getString(R.string.def_intent_file_manager); + if (!TextUtils.isEmpty(filemanagerIntent)) { + // start filemanager for getting download path + try { + Intent downloadPathIntent = new Intent(filemanagerIntent); + DownloadSettings.this.startActivityForResult(downloadPathIntent, DOWNLOAD_PATH); + } catch (Exception e) { + String err_msg = getString(R.string.activity_not_found, + filemanagerIntent); + Toast.makeText(DownloadSettings.this, err_msg, Toast.LENGTH_LONG).show(); + } + } else { + Log.e(LOGTAG, "File Manager intent not defined !!"); } } @@ -242,9 +248,12 @@ public class DownloadSettings extends Activity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent intent) { + if (DOWNLOAD_PATH == requestCode) { - if (resultCode != Activity.RESULT_CANCELED && intent != null) { - downloadPath = intent.getStringExtra("result_dir_sel"); + if (resultCode == Activity.RESULT_OK && intent != null) { + final String result_dir_sel = + getResources().getString(R.string.def_file_manager_result_dir); + downloadPath = intent.getStringExtra(result_dir_sel); // Fallback logic to stock browser if (downloadPath == null) { Uri uri = intent.getData(); |