From e421c2472744ca7d35906f86204790ee97b91ca2 Mon Sep 17 00:00:00 2001 From: Michael Kolb Date: Mon, 4 Oct 2010 19:29:01 -0700 Subject: update bookmarks & history page convert combopage from activity to view embed combopage in main layout handle callbacks in BrowserActivity Change-Id: Ie5f092f5de677a960181544e7519c2f7d5cb86c1 --- src/com/android/browser/ShortcutActivity.java | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'src/com/android/browser/ShortcutActivity.java') diff --git a/src/com/android/browser/ShortcutActivity.java b/src/com/android/browser/ShortcutActivity.java index 7994d0a77..1d970ea9b 100644 --- a/src/com/android/browser/ShortcutActivity.java +++ b/src/com/android/browser/ShortcutActivity.java @@ -35,16 +35,11 @@ public class ShortcutActivity extends Activity Bundle extras = new Bundle(); extras.putBoolean(BrowserBookmarksPage.EXTRA_SHORTCUT, true); extras.putBoolean(BrowserBookmarksPage.EXTRA_DISABLE_WINDOW, true); - Fragment frag = Fragment.instantiate(this, BrowserBookmarksPage.class.getName(), extras); + Fragment frag = BrowserBookmarksPage.newInstance(this, extras); transaction.add(android.R.id.content, frag); transaction.commit(); } - /** - * not used for shortcuts - */ - @Override - public void onRemoveParentChildRelationShips() {} /** * handle fragment startActivity @@ -60,6 +55,20 @@ public class ShortcutActivity extends Activity super.finish(); } + // BookmarksHistoryCallbacks + + /** + * not used for shortcuts + */ + @Override + public void onRemoveParentChildRelationships() {} + + @Override + public void onComboCanceled() { + setResult(RESULT_CANCELED); + finish(); + } + /** * not used for shortcuts */ -- cgit v1.2.3