diff options
| author | Michael Kolb <kolby@google.com> | 2010-10-04 19:29:01 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2010-10-06 13:13:35 -0700 |
| commit | e421c2472744ca7d35906f86204790ee97b91ca2 (patch) | |
| tree | e30b2732993bec6cef14293fc0b1a794c028b90c /AndroidManifest.xml | |
| parent | 6e147d0bf20820a49f08198703decb71e322e149 (diff) | |
| download | packages_apps_Browser-e421c2472744ca7d35906f86204790ee97b91ca2.zip packages_apps_Browser-e421c2472744ca7d35906f86204790ee97b91ca2.tar.gz packages_apps_Browser-e421c2472744ca7d35906f86204790ee97b91ca2.tar.bz2 | |
update bookmarks & history page
convert combopage from activity to view
embed combopage in main layout
handle callbacks in BrowserActivity
Change-Id: Ie5f092f5de677a960181544e7519c2f7d5cb86c1
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 58ce133..0a69fde 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -140,18 +140,6 @@ <meta-data android:name="android.app.searchable" android:resource="@xml/searchable" /> </activity> - - <activity android:name="CombinedBookmarkHistoryActivity" android:label="@string/bookmarks" - android:excludeFromRecents="true" - android:launchMode="singleTop" android:configChanges="orientation|keyboardHidden" - android:theme="@style/BookmarkTheme" > - <meta-data android:name="android.app.default_searchable" - android:value=".BrowserActivity" /> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - </intent-filter> - </activity> - <activity android:name="BrowserBookmarksPage" android:label="@string/bookmarks" android:launchMode="singleTop" android:configChanges="orientation|keyboardHidden"> </activity> |