diff options
| author | Selim Gurun <sgurun@google.com> | 2014-06-17 19:52:30 -0700 |
|---|---|---|
| committer | Selim Gurun <sgurun@google.com> | 2014-06-18 13:28:54 -0700 |
| commit | 4d59434c396e3d414ed4266103d6990a340331e1 (patch) | |
| tree | 466f90b3181b9216a129d81183376103e78729a6 /src/com/android/browser/Controller.java | |
| parent | bdad2c0837e47926bddfc21980bd0b900fdc37d4 (diff) | |
| download | packages_apps_Browser-4d59434c396e3d414ed4266103d6990a340331e1.zip packages_apps_Browser-4d59434c396e3d414ed4266103d6990a340331e1.tar.gz packages_apps_Browser-4d59434c396e3d414ed4266103d6990a340331e1.tar.bz2 | |
Modify AOSP browser to take advantage of new filechooser API.
Bug: 6930981
Change-Id: Id73512cd6e859ea9316f02e8f0d973b6e15d969b
Diffstat (limited to 'src/com/android/browser/Controller.java')
| -rw-r--r-- | src/com/android/browser/Controller.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index 70f4383..3e4ae66 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -75,6 +75,7 @@ import android.webkit.MimeTypeMap; import android.webkit.SslErrorHandler; import android.webkit.ValueCallback; import android.webkit.WebChromeClient; +import android.webkit.WebChromeClient.FileChooserParams; import android.webkit.WebIconDatabase; import android.webkit.WebSettings; import android.webkit.WebView; @@ -1922,9 +1923,9 @@ public class Controller // file chooser @Override - public void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType, String capture) { + public void showFileChooser(ValueCallback<Uri[]> callback, FileChooserParams params) { mUploadHandler = new UploadHandler(this); - mUploadHandler.openFileChooser(uploadMsg, acceptType, capture); + mUploadHandler.openFileChooser(callback, params); } // thumbnails @@ -2709,7 +2710,7 @@ public class Controller @Override public void startVoiceRecognizer() { Intent voice = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH); - voice.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, + voice.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM); voice.putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, 1); mActivity.startActivityForResult(voice, VOICE_RESULT); |