From fa296a4c9001ed62fd4570f97c59433eccff1c82 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 18 May 2010 16:16:40 +0100
Subject: [PATCH] Add a string for the no file chosen label, shown on a file
 upload control when the user has not yet picked a file.

Requires external/webkit change.

Change-Id: Idb1039a7c39b18249579794df523afb6144fba47
---
 core/java/android/webkit/BrowserFrame.java | 5 +++++
 core/res/res/values/strings.xml            | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java
index 219a469c2de9b..6ec43f1645212 100644
--- a/core/java/android/webkit/BrowserFrame.java
+++ b/core/java/android/webkit/BrowserFrame.java
@@ -846,6 +846,7 @@ class BrowserFrame extends Handler {
     private static final int FILE_UPLOAD_LABEL = 4;
     private static final int RESET_LABEL = 5;
     private static final int SUBMIT_LABEL = 6;
+    private static final int FILE_UPLOAD_NO_FILE_CHOSEN = 7;
 
     String getRawResFilename(int id) {
         int resid;
@@ -875,6 +876,10 @@ class BrowserFrame extends Handler {
                 return mContext.getResources().getString(
                         com.android.internal.R.string.submit);
 
+            case FILE_UPLOAD_NO_FILE_CHOSEN:
+                return mContext.getResources().getString(
+                        com.android.internal.R.string.no_file_chosen);
+
             default:
                 Log.e(LOGTAG, "getRawResFilename got incompatible resource ID");
                 return "";
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 0071ea27e65d6..a9f1485564427 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2267,6 +2267,8 @@
     <!-- Localized strings for WebView -->
     <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
     <string name="upload_file">Choose file</string>
+    <!-- Label for the file upload control when no file has been chosen yet -->
+    <string name="no_file_chosen">No file chosen</string>
     <!-- Label for <input type="reset"> button in html -->
     <string name="reset">Reset</string>
     <!-- Label for <input type="submit"> button in html -->