commit 5ba8da4dc38036f626deda8d0588a2f4694f3cad
author Teng-Hui Zhu <ztenghui@google.com> Tue Nov 02 16:03:58 2010 -0700
committer Teng-Hui Zhu <ztenghui@google.com> Fri Nov 05 15:10:17 2010 -0700
tree 91d71d8b13a342221c5006eb019d306a199063ac
parent 025d5b0be4d442b773d53b49f67c02e2e4f92360

Remove the web archive UI from the browser

This is a change intended to remove this UI from honeycomb.
On the release after honeycomb, we are supposed to bring this UI back.

http://b/issue?id=3158570

refer to http://b/issue?id=2905874 for more background

Change-Id: Id9f83828f1bc5524c2dd2e46cf09f846f7916aed

res/menu-xlarge/browser.xml

diff --git a/res/menu-xlarge/browser.xml b/res/menu-xlarge/browser.xml
index 3b93835..7af3e8c 100644
--- a/res/menu-xlarge/browser.xml
+++ b/res/menu-xlarge/browser.xml
@@ -44,9 +44,6 @@
             android:title="@string/menu_preferences"
             android:icon="@drawable/ic_menu_settings_normal"
             android:alphabeticShortcut="p" />
-        <item android:id="@+id/save_webarchive_menu_id"
-            android:icon="@drawable/ic_menu_archive_normal"
-            android:title="@string/menu_save_webarchive" />
         <!-- followings are debug only -->
         <item android:id="@+id/dump_nav_menu_id"
             android:title="@string/dump_nav"

res/menu/browser.xml

diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index b5d56c8..e00ee26 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -59,9 +59,6 @@
             android:title="@string/menu_preferences"
             android:icon="@drawable/ic_menu_settings"
             android:alphabeticShortcut="p" />
-        <item android:id="@+id/save_webarchive_menu_id"
-            android:title="@string/menu_save_webarchive"
-             />
         <!-- followings are debug only -->
         <item android:id="@+id/dump_nav_menu_id"
             android:title="@string/dump_nav"

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 4115b92..072a0b1 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -1372,39 +1372,6 @@
                 getTopWindow().showFindDialog(null);
                 break;
 
-            case R.id.save_webarchive_menu_id:
-                if (LOGD_ENABLED) {
-                    Log.d(LOGTAG, "Save as Web Archive");
-                }
-                String state = Environment.getExternalStorageState();
-                if (Environment.MEDIA_MOUNTED.equals(state)) {
-                    String directory = Environment.getExternalStoragePublicDirectory(
-                            Environment.DIRECTORY_DOWNLOADS).getAbsolutePath() + File.separator;
-                    File dir = new File(directory);
-                    if (!dir.exists() && !dir.mkdirs()) {
-                      Log.e(LOGTAG, "Save as Web Archive: mkdirs for " + directory + " failed!");
-                      Toast.makeText(BrowserActivity.this, R.string.webarchive_failed,
-                          Toast.LENGTH_SHORT).show();
-                      break;
-                    }
-                    getTopWindow().saveWebArchive(directory, true, new ValueCallback<String>() {
-                        @Override
-                        public void onReceiveValue(String value) {
-                            if (value != null) {
-                                Toast.makeText(BrowserActivity.this, R.string.webarchive_saved,
-                                        Toast.LENGTH_SHORT).show();
-                            } else {
-                                Toast.makeText(BrowserActivity.this, R.string.webarchive_failed,
-                                        Toast.LENGTH_SHORT).show();
-                            }
-                        }
-                    });
-                } else {
-                    Toast.makeText(BrowserActivity.this, R.string.webarchive_failed,
-                            Toast.LENGTH_SHORT).show();
-                }
-                break;
-
             case R.id.page_info_menu_id:
                 showPageInfo(mTabControl.getCurrentTab(), false);
                 break;