mirror of
https://github.com/syncthing/syncthing-android.git
synced 2024-11-23 12:51:16 +00:00
Merge pull request #303 from Zillode/fix-back-arrow
Fix back arrow in actionbar for Android 4.1+
This commit is contained in:
commit
0a07f4546b
1 changed files with 5 additions and 2 deletions
|
@ -31,12 +31,15 @@
|
||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
android:name=".activities.WebGuiActivity"
|
android:name=".activities.WebGuiActivity"
|
||||||
android:label="@string/web_gui_title">
|
android:label="@string/web_gui_title"
|
||||||
|
android:parentActivityName=".activities.MainActivity">
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="android.support.PARENT_ACTIVITY"
|
android:name="android.support.PARENT_ACTIVITY"
|
||||||
android:value=".activities.MainActivity" />
|
android:value=".activities.MainActivity" />
|
||||||
</activity>
|
</activity>
|
||||||
<activity android:name=".activities.SettingsActivity">
|
<activity android:name=".activities.SettingsActivity"
|
||||||
|
android:label="@string/settings_title"
|
||||||
|
android:parentActivityName=".activities.MainActivity">
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="android.support.PARENT_ACTIVITY"
|
android:name="android.support.PARENT_ACTIVITY"
|
||||||
android:value=".activities.MainActivity" />
|
android:value=".activities.MainActivity" />
|
||||||
|
|
Loading…
Reference in a new issue