summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-03-19 13:35:21 -0700
committerBrad Fitzpatrick <bradfitz@android.com>2010-03-19 13:35:21 -0700
commitad2f3609e06c459e8095d2c1ca2d6b498eaefbc9 (patch)
tree14a15f3bd5268de93078947de592cf0dcdcfd85e /AndroidManifest.xml
parent13f9aced9c949d452a5cb44ffc55c82f97871c89 (diff)
downloadpackages_apps_Browser-ad2f3609e06c459e8095d2c1ca2d6b498eaefbc9.tar.gz
packages_apps_Browser-ad2f3609e06c459e8095d2c1ca2d6b498eaefbc9.tar.bz2
packages_apps_Browser-ad2f3609e06c459e8095d2c1ca2d6b498eaefbc9.zip
Allow Browser bookmarks from AnyCut; don't NPE without Extras.
Change-Id: I884936ceaeabf76cc8aaf7f1dbfeecd82b5c2fd0
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 798fc3a32..50a7be05c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -121,11 +121,15 @@
android:resource="@xml/searchable" />
</activity>
- <activity android:name="CombinedBookmarkHistoryActivity" android:label=""
+ <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"