diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-02-16 12:10:39 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2012-02-27 10:04:37 -0500 |
| commit | 913a13f5bbf126d4f668736617868427a60654ca (patch) | |
| tree | 7212d0079a1956b133afdf510b68d0c4628d2e6d /src | |
| parent | a4befac241ec69791fd30e11355ed3dc10d7fb37 (diff) | |
| download | packages_apps_browser-913a13f5bbf126d4f668736617868427a60654ca.zip packages_apps_browser-913a13f5bbf126d4f668736617868427a60654ca.tar.gz packages_apps_browser-913a13f5bbf126d4f668736617868427a60654ca.tar.bz2 | |
Revert "Temporarily disable saved pages for Skia update"
This reverts commit efe667469ef06277ad95699c365fe9ba6b44f4d5.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/ComboViewActivity.java | 4 | ||||
| -rw-r--r-- | src/com/android/browser/Controller.java | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/browser/ComboViewActivity.java b/src/com/android/browser/ComboViewActivity.java index b6ff244..2d382cb 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 ec7cb66..f8811b2 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -1257,7 +1257,6 @@ 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; } |