From 7b64ceb98ff06fa66af9fba54579af25d1360f60 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Fri, 24 Apr 2015 20:33:50 +0100
Subject: [PATCH] no action bar in bookmarks activity

Conflicts:
	res/values-v21/styles.xml
	res/values/styles.xml
---
 AndroidManifest.xml         | 2 +-
 AndroidManifest.xml.pattern | 2 +-
 res/values-v11/styles.xml   | 2 ++
 res/values-v14/styles.xml   | 2 ++
 res/values/styles.xml       | 4 +++-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b4cb57dd1..aa5bf1226 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -154,7 +154,7 @@
 		</activity>
 		<activity android:name="org.geometerplus.android.fbreader.PluginListActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
 
-		<activity android:name="org.geometerplus.android.fbreader.bookmark.BookmarksActivity" android:launchMode="singleTask" android:process=":bookmarks" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize">
+		<activity android:name="org.geometerplus.android.fbreader.bookmark.BookmarksActivity" android:launchMode="singleTask" android:process=":bookmarks" android:theme="@style/FBReader.Activity.NoActionBar" android:configChanges="orientation|keyboardHidden|screenSize">
 			<intent-filter>
 				<action android:name="android.intent.action.SEARCH"/>
 			</intent-filter>
diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern
index c79f63c96..e3afb2eb1 100644
--- a/AndroidManifest.xml.pattern
+++ b/AndroidManifest.xml.pattern
@@ -154,7 +154,7 @@
 		</activity>
 		<activity android:name="org.geometerplus.android.fbreader.PluginListActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
 
-		<activity android:name="org.geometerplus.android.fbreader.bookmark.BookmarksActivity" android:launchMode="singleTask" android:process=":bookmarks" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize">
+		<activity android:name="org.geometerplus.android.fbreader.bookmark.BookmarksActivity" android:launchMode="singleTask" android:process=":bookmarks" android:theme="@style/FBReader.Activity.NoActionBar" android:configChanges="orientation|keyboardHidden|screenSize">
 			<intent-filter>
 				<action android:name="android.intent.action.SEARCH"/>
 			</intent-filter>
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
index 7a5fc4c48..687ecd074 100644
--- a/res/values-v11/styles.xml
+++ b/res/values-v11/styles.xml
@@ -1,6 +1,8 @@
 <resources>
   <style name="FBReader.Activity" parent="android:Theme.Holo">
 	</style>
+  <style name="FBReader.Activity.NoActionBar" parent="android:Theme.Holo.NoActionBar">
+	</style>
   <style name="FBReader.Dialog" parent="android:Theme.Holo.Dialog">
 	</style>
 </resources>
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
index 29c51e8d4..9e20c53ee 100644
--- a/res/values-v14/styles.xml
+++ b/res/values-v14/styles.xml
@@ -1,6 +1,8 @@
 <resources>
   <style name="FBReader.Activity" parent="android:Theme.DeviceDefault">
 	</style>
+  <style name="FBReader.Activity.NoActionBar" parent="android:Theme.DeviceDefault.NoActionBar">
+	</style>
   <style name="FBReader.Dialog" parent="android:Theme.DeviceDefault.Dialog">
 	</style>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8a2037903..a5d49f661 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,6 +1,8 @@
 <resources>
   <style name="FBReader.Activity" parent="android:Theme">
-	</style>
+  </style>
+  <style name="FBReader.Activity.NoActionBar" parent="android:Theme">
+  </style>
   <style name="FBReader.Dialog" parent="android:Theme.Dialog">
 	</style>
 	<color name="transparent">#00000000</color>