mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-27 08:55:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #377 from nextcloud/fix-314

Browse source 
Fix #314
This commit is contained in:
Mario Đanić 2019-01-07 01:45:34 +01:00 committed by GitHub
commit b7a933e917
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View file

@ -54,7 +54,6 @@
<activity <activity
android:name=".activities.MainActivity" android:name=".activities.MainActivity"
android:label="@string/nc_app_name" android:label="@string/nc_app_name"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustPan"> android:windowSoftInputMode="adjustPan">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>

6
app/src/main/res/menu/menu_conversation.xml
View file

@ -26,19 +26,19 @@
android:icon="@drawable/ic_call_white_24dp" android:icon="@drawable/ic_call_white_24dp"
android:orderInCategory="0" android:orderInCategory="0"
android:title="@string/nc_conversation_menu_voice_call" android:title="@string/nc_conversation_menu_voice_call"
app:showAsAction="ifRoom|withText" /> app:showAsAction="ifRoom" />
<item <item
android:id="@+id/conversation_video_call" android:id="@+id/conversation_video_call"
android:icon="@drawable/ic_videocam_white_24px" android:icon="@drawable/ic_videocam_white_24px"
android:orderInCategory="1" android:orderInCategory="1"
android:title="@string/nc_conversation_menu_video_call" android:title="@string/nc_conversation_menu_video_call"
app:showAsAction="ifRoom|withText" /> app:showAsAction="ifRoom" />
<item <item
android:id="@+id/conversation_info" android:id="@+id/conversation_info"
android:icon="@drawable/ic_info_white_24dp" android:icon="@drawable/ic_info_white_24dp"
android:orderInCategory="1" android:orderInCategory="1"
android:title="@string/nc_conversation_menu_conversation_info" android:title="@string/nc_conversation_menu_conversation_info"
app:showAsAction="never|withText" /> app:showAsAction="never" />
</menu> </menu>