1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-29 07:41:17 +00:00

Use normal theme instead of dialog theme for repo/node settings.

This caused problems as dialogs don't have an ActionBar, and adding
ActionBar explicitly gives problems with old API levels. Closes #51.
This commit is contained in:
Felix Ableitner 2014-07-04 23:03:58 +02:00
parent 3ce26dafb2
commit d46d1d4e48
3 changed files with 2 additions and 18 deletions

View file

@ -46,11 +46,9 @@
<service android:name=".syncthing.SyncthingService" /> <service android:name=".syncthing.SyncthingService" />
<activity <activity
android:name=".gui.RepoSettingsActivity" android:name=".gui.RepoSettingsActivity" />
android:theme="@style/DialogWhenLarge" />
<activity <activity
android:name=".gui.NodeSettingsActivity" android:name=".gui.NodeSettingsActivity" />
android:theme="@style/DialogWhenLarge" />
<activity <activity
android:name=".gui.FolderPickerActivity" android:name=".gui.FolderPickerActivity"
android:label="@string/folder_picker_title" > android:label="@string/folder_picker_title" >

View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="DialogWhenLarge" parent="android:Theme.Holo.DialogWhenLarge" />
</resources>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="DialogWhenLargeCompat" parent="DialogWhenLarge">
<item name="android:windowIsFloating">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowSoftInputMode">stateAlwaysHidden</item>
<!--<item name="android:windowActionModeOverlay">true</item>-->
<item name="android:windowIsTranslucent">true</item>
</style>
</resources>