yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

no action bar in bookmarks activity

Browse source 
Conflicts:
	res/values-v21/styles.xml
	res/values/styles.xml
This commit is contained in:
Nikolay Pultsin 2015-04-24 20:33:50 +01:00
parent 7c0ff1d3e7
commit 7b64ceb98f
5 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -154,7 +154,7 @@
</activity> </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.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> <intent-filter>
<action android:name="android.intent.action.SEARCH"/> <action android:name="android.intent.action.SEARCH"/>
</intent-filter> </intent-filter>

2
AndroidManifest.xml.pattern
View file

@ -154,7 +154,7 @@
</activity> </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.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> <intent-filter>
<action android:name="android.intent.action.SEARCH"/> <action android:name="android.intent.action.SEARCH"/>
</intent-filter> </intent-filter>

2
res/values-v11/styles.xml
View file

@ -1,6 +1,8 @@
<resources> <resources>
<style name="FBReader.Activity" parent="android:Theme.Holo"> <style name="FBReader.Activity" parent="android:Theme.Holo">
</style> </style>
<style name="FBReader.Activity.NoActionBar" parent="android:Theme.Holo.NoActionBar">
</style>
<style name="FBReader.Dialog" parent="android:Theme.Holo.Dialog"> <style name="FBReader.Dialog" parent="android:Theme.Holo.Dialog">
</style> </style>
</resources> </resources>

2
res/values-v14/styles.xml
View file

@ -1,6 +1,8 @@
<resources> <resources>
<style name="FBReader.Activity" parent="android:Theme.DeviceDefault"> <style name="FBReader.Activity" parent="android:Theme.DeviceDefault">
</style> </style>
<style name="FBReader.Activity.NoActionBar" parent="android:Theme.DeviceDefault.NoActionBar">
</style>
<style name="FBReader.Dialog" parent="android:Theme.DeviceDefault.Dialog"> <style name="FBReader.Dialog" parent="android:Theme.DeviceDefault.Dialog">
</style> </style>
</resources> </resources>

4
res/values/styles.xml
View file

@ -1,6 +1,8 @@
<resources> <resources>
<style name="FBReader.Activity" parent="android:Theme"> <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 name="FBReader.Dialog" parent="android:Theme.Dialog">
</style> </style>
<color name="transparent">#00000000</color> <color name="transparent">#00000000</color>