diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-02-07 05:00:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-07 05:00:50 -0800 |
| commit | 1fe48c1cee33fe0284f1eb13efa0f0ddbf4ed78f (patch) | |
| tree | e7fd74aac6e0cad710eb59ad17467a059d5efccc | |
| parent | f7d033f9341ebec8809e65f26b1f85277b06004e (diff) | |
| parent | 60cd8aedee741fc21915ef4083e454ccd56854e6 (diff) | |
| download | packages_apps_Browser-1fe48c1cee33fe0284f1eb13efa0f0ddbf4ed78f.zip packages_apps_Browser-1fe48c1cee33fe0284f1eb13efa0f0ddbf4ed78f.tar.gz packages_apps_Browser-1fe48c1cee33fe0284f1eb13efa0f0ddbf4ed78f.tar.bz2 | |
am 60cd8aed: Merge "Temporarily disable saved pages for Skia update"
* commit '60cd8aedee741fc21915ef4083e454ccd56854e6':
Temporarily disable saved pages for Skia update
| -rw-r--r-- | src/com/android/browser/ComboViewActivity.java | 4 | ||||
| -rw-r--r-- | src/com/android/browser/Controller.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/browser/ComboViewActivity.java b/src/com/android/browser/ComboViewActivity.java index 2d382cb..b6ff244 100644 --- a/src/com/android/browser/ComboViewActivity.java +++ b/src/com/android/browser/ComboViewActivity.java @@ -73,8 +73,8 @@ public class ComboViewActivity extends Activity implements CombinedBookmarksCall BrowserBookmarksPage.class, args); mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_history), BrowserHistoryPage.class, args); - mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_snapshots), - BrowserSnapshotPage.class, args); +// mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_snapshots), +// BrowserSnapshotPage.class, args); if (savedInstanceState != null) { bar.setSelectedNavigationItem( diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index 93fb318..86704d3 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -1258,6 +1258,7 @@ public class Controller } MenuInflater inflater = mActivity.getMenuInflater(); inflater.inflate(R.menu.browser, menu); + menu.findItem(R.id.save_snapshot_menu_id).setEnabled(false); return true; } |