Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '738-older-devices-show-overflow-icon-on-some-screens-but-not-others' into 'master'

Browse Source 
Also show overflow icon on devices with menu key by using Toolbar

Closes #738

See merge request !463
This commit is contained in:
akwizgran
2016-12-16 11:58:18 +00:00
parent 3ce0131b8c db71472501
commit cc5c000278
14 changed files with 100 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-android/src/main/AndroidManifest.xml
View File

@@ -111,6 +111,7 @@
android:name=".android.privategroup.conversation.GroupActivity"
android:label="@string/app_name"
android:parentActivityName=".android.navdrawer.NavDrawerActivity"
android:theme="@style/BriarThemeNoActionBar.Default"
android:windowSoftInputMode="adjustResize|stateHidden">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
@@ -194,6 +195,7 @@
android:name=".android.forum.ForumActivity"
android:label="@string/app_name"
android:parentActivityName=".android.navdrawer.NavDrawerActivity"
android:theme="@style/BriarThemeNoActionBar.Default"
android:windowSoftInputMode="adjustResize|stateHidden">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
@@ -245,11 +247,11 @@
<activity
android:name=".android.blog.BlogActivity"
android:parentActivityName=".android.navdrawer.NavDrawerActivity">
android:parentActivityName=".android.navdrawer.NavDrawerActivity"
android:theme="@style/BriarThemeNoActionBar.Default">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".android.navdrawer.NavDrawerActivity"
/>
android:value=".android.navdrawer.NavDrawerActivity"/>
</activity>
<activity