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

Remove translucent window effect.

Browse Source
This commit is contained in:
akwizgran
2019-01-04 17:25:39 +00:00
parent ef998577db
commit 045fcfc5fa
4 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
View File

@@ -295,6 +295,8 @@ public class ConversationActivity extends BriarActivity
public void onStart() {
super.onStart();
eventBus.addListener(this);
notificationManager.blockContactNotification(contactId);
notificationManager.clearContactNotification(contactId);
displayContactOnlineStatus();
viewModel.getContactDisplayName().observe(this, contactNameObserver);
list.startPeriodicUpdate();
@@ -303,9 +305,6 @@ public class ConversationActivity extends BriarActivity
@Override
public void onResume() {
super.onResume();
// TODO move back to onStart() when we have unread msg indicators
notificationManager.blockContactNotification(contactId);
notificationManager.clearContactNotification(contactId);
// Trigger loading of contact data, noop if data was loaded already.
//
// We can only start loading data *after* we are sure
@@ -313,17 +312,11 @@ public class ConversationActivity extends BriarActivity
if (signedIn()) viewModel.setContactId(contactId);
}
@Override
protected void onPause() {
super.onPause();
// TODO move back to onStop() when we have unread msg indicators
notificationManager.unblockContactNotification(contactId);
}
@Override
public void onStop() {
super.onStop();
eventBus.removeListener(this);
notificationManager.unblockContactNotification(contactId);
viewModel.getContactDisplayName().removeObserver(contactNameObserver);
list.stopPeriodicUpdate();
}

2
briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java
View File

@@ -101,7 +101,6 @@ public class ImageActivity extends BriarActivity
// inflate layout
setContentView(R.layout.activity_image);
layout = findViewById(R.id.layout);
layout.getBackground().setAlpha(255);
layout.setCallback(this);
layout.getViewTreeObserver().addOnGlobalLayoutListener(this);
@@ -196,7 +195,6 @@ public class ImageActivity extends BriarActivity
@Override
public void onPull(float progress) {
layout.getBackground().setAlpha(Math.round((1 - progress) * 255));
}
@Override