summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-02-10 15:44:04 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-02-10 15:44:04 -0800
commitb7775e1e46a6c8ce0f07747d44c1b1792bb0ce1c (patch)
tree5955e8e4ec01ed58967626e02c703e40a10bd6a8 /AndroidManifest.xml
parentd9effa543b8c81d48b8324aac00410b8c2a355a0 (diff)
downloadpackages_apps_Browser-b7775e1e46a6c8ce0f07747d44c1b1792bb0ce1c.zip
packages_apps_Browser-b7775e1e46a6c8ce0f07747d44c1b1792bb0ce1c.tar.gz
packages_apps_Browser-b7775e1e46a6c8ce0f07747d44c1b1792bb0ce1c.tar.bz2
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml11
1 files changed, 9 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4f28ef0..e58231a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -127,10 +127,17 @@
</intent-filter>
</activity>
+ <activity android:name="CombinedBookmarkHistoryActivity" android:label=""
+ android:launchMode="singleTop" android:configChanges="orientation|keyboardHidden">
+ </activity>
+
<activity android:name="BrowserBookmarksPage" android:label="@string/bookmarks"
android:launchMode="singleTop" android:configChanges="orientation|keyboardHidden">
</activity>
+ <activity android:name="MostVisitedActivity" android:label=""
+ android:launchMode="singleTop" android:configChanges="orientation|keyboardHidden"/>
+
<activity-alias android:name="ShortcutBookmarksPage"
android:targetActivity="BrowserBookmarksPage"
android:label="@string/shortcut_bookmark">
@@ -146,7 +153,7 @@
android:configChanges="orientation|keyboardHidden">
</activity>
- <activity android:name="BrowserPreferencesPage" android:label=""
+ <activity android:name="BrowserPreferencesPage" android:label="@string/menu_preferences"
android:configChanges="orientation|keyboardHidden">
</activity>
@@ -177,7 +184,7 @@
</service>
<activity android:name="AddBookmarkPage" android:label="Save bookmark" android:theme="@android:style/Theme.Dialog"
- android:configChanges="orientation|keyboardHidden">
+ android:configChanges="orientation|keyboardHidden" android:windowSoftInputMode="stateHidden">
<intent-filter>
<action android:name="android.intent.action.INSERT" />
<category android:name="android.intent.category.DEFAULT" />