diff options
| author | John Reck <jreck@google.com> | 2011-01-20 10:33:50 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-01-20 10:33:50 -0800 |
| commit | 91c83a0ffb0d33a614fefa6ee81ead47ec0d114b (patch) | |
| tree | 999ef2e219ee00a4000b9695ead91d15ae929cd5 | |
| parent | f90ca690e640340527b972b55132c5c418b3cc4c (diff) | |
| download | packages_apps_Browser-91c83a0ffb0d33a614fefa6ee81ead47ec0d114b.tar.gz packages_apps_Browser-91c83a0ffb0d33a614fefa6ee81ead47ec0d114b.tar.bz2 packages_apps_Browser-91c83a0ffb0d33a614fefa6ee81ead47ec0d114b.zip | |
Launch settings directly from combined view
Bug: 3368917
Launch settings directly from combined view rather than letting controller
handle it. Prevents controller from removing the combined view before launching
settings.
Change-Id: I2b78ab0f737337024d8cdb9fc400cda56e4db5ca
| -rw-r--r-- | src/com/android/browser/CombinedBookmarkHistoryView.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/browser/CombinedBookmarkHistoryView.java b/src/com/android/browser/CombinedBookmarkHistoryView.java index 6c03746b1..734adddcf 100644 --- a/src/com/android/browser/CombinedBookmarkHistoryView.java +++ b/src/com/android/browser/CombinedBookmarkHistoryView.java @@ -23,6 +23,7 @@ import android.app.ActionBar.TabListener; import android.app.Activity; import android.app.FragmentManager; import android.app.FragmentTransaction; +import android.content.Intent; import android.content.res.Configuration; import android.content.res.Resources; import android.database.Cursor; @@ -318,6 +319,12 @@ public class CombinedBookmarkHistoryView extends LinearLayout case R.id.add_bookmark: mUiController.bookmarkCurrentPage(mBookmarks.getFolderId()); return true; + case R.id.preferences_menu_id: + Intent intent = new Intent(mActivity, BrowserPreferencesPage.class); + intent.putExtra(BrowserPreferencesPage.CURRENT_PAGE, + mUiController.getCurrentTopWebView().getUrl()); + mActivity.startActivityForResult(intent, Controller.PREFERENCES_PAGE); + return true; } switch (mCurrentFragment) { |