sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

do not use theme in uri activity

This commit is contained in:
Daniel Gultsch 2017-12-19 12:50:19 +01:00
parent b7cadcf9f6
commit 97bc93aeb0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/AndroidManifest.xml
View File

@ -59,8 +59,7 @@
<activity <activity
android:name=".ui.UriHandlerActivity" android:name=".ui.UriHandlerActivity"
android:label="@string/title_activity_start_conversation" android:label="@string/title_activity_start_conversation"
android:launchMode="singleTop" android:launchMode="singleTop">
android:theme="@android:style/Theme.Translucent.NoTitleBar">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />

1
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View File

@ -625,6 +625,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
case R.id.action_scan_qr_code: case R.id.action_scan_qr_code:
Intent intent = new Intent(this, UriHandlerActivity.class); Intent intent = new Intent(this, UriHandlerActivity.class);
intent.setAction(UriHandlerActivity.ACTION_SCAN_QR_CODE); intent.setAction(UriHandlerActivity.ACTION_SCAN_QR_CODE);
intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
startActivity(intent); startActivity(intent);
return true; return true;
case R.id.action_hide_offline: case R.id.action_hide_offline: