mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-14 11:49:04 +01:00
Remove translucent window effect.
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest
|
<manifest
|
||||||
package="org.briarproject.briar"
|
package="org.briarproject.briar"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
<uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
|
<uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
|
||||||
@@ -29,7 +30,8 @@
|
|||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:logo="@mipmap/ic_launcher_round"
|
android:logo="@mipmap/ic_launcher_round"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/BriarTheme">
|
android:theme="@style/BriarTheme"
|
||||||
|
tools:ignore="GoogleAppIndexingWarning">
|
||||||
|
|
||||||
<receiver
|
<receiver
|
||||||
android:name="org.briarproject.briar.android.login.SignInReminderReceiver"
|
android:name="org.briarproject.briar.android.login.SignInReminderReceiver"
|
||||||
@@ -117,7 +119,7 @@
|
|||||||
<activity
|
<activity
|
||||||
android:name=".android.conversation.ImageActivity"
|
android:name=".android.conversation.ImageActivity"
|
||||||
android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity"
|
android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity"
|
||||||
android:theme="@style/BriarTheme.Transparent.NoActionBar">
|
android:theme="@style/BriarTheme.ActionBarOverlay">
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="android.support.PARENT_ACTIVITY"
|
android:name="android.support.PARENT_ACTIVITY"
|
||||||
android:value="org.briarproject.briar.android.conversation.ConversationActivity"/>
|
android:value="org.briarproject.briar.android.conversation.ConversationActivity"/>
|
||||||
|
|||||||
@@ -295,6 +295,8 @@ public class ConversationActivity extends BriarActivity
|
|||||||
public void onStart() {
|
public void onStart() {
|
||||||
super.onStart();
|
super.onStart();
|
||||||
eventBus.addListener(this);
|
eventBus.addListener(this);
|
||||||
|
notificationManager.blockContactNotification(contactId);
|
||||||
|
notificationManager.clearContactNotification(contactId);
|
||||||
displayContactOnlineStatus();
|
displayContactOnlineStatus();
|
||||||
viewModel.getContactDisplayName().observe(this, contactNameObserver);
|
viewModel.getContactDisplayName().observe(this, contactNameObserver);
|
||||||
list.startPeriodicUpdate();
|
list.startPeriodicUpdate();
|
||||||
@@ -303,9 +305,6 @@ public class ConversationActivity extends BriarActivity
|
|||||||
@Override
|
@Override
|
||||||
public void onResume() {
|
public void onResume() {
|
||||||
super.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.
|
// Trigger loading of contact data, noop if data was loaded already.
|
||||||
//
|
//
|
||||||
// We can only start loading data *after* we are sure
|
// We can only start loading data *after* we are sure
|
||||||
@@ -313,17 +312,11 @@ public class ConversationActivity extends BriarActivity
|
|||||||
if (signedIn()) viewModel.setContactId(contactId);
|
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
|
@Override
|
||||||
public void onStop() {
|
public void onStop() {
|
||||||
super.onStop();
|
super.onStop();
|
||||||
eventBus.removeListener(this);
|
eventBus.removeListener(this);
|
||||||
|
notificationManager.unblockContactNotification(contactId);
|
||||||
viewModel.getContactDisplayName().removeObserver(contactNameObserver);
|
viewModel.getContactDisplayName().removeObserver(contactNameObserver);
|
||||||
list.stopPeriodicUpdate();
|
list.stopPeriodicUpdate();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -101,7 +101,6 @@ public class ImageActivity extends BriarActivity
|
|||||||
// inflate layout
|
// inflate layout
|
||||||
setContentView(R.layout.activity_image);
|
setContentView(R.layout.activity_image);
|
||||||
layout = findViewById(R.id.layout);
|
layout = findViewById(R.id.layout);
|
||||||
layout.getBackground().setAlpha(255);
|
|
||||||
layout.setCallback(this);
|
layout.setCallback(this);
|
||||||
layout.getViewTreeObserver().addOnGlobalLayoutListener(this);
|
layout.getViewTreeObserver().addOnGlobalLayoutListener(this);
|
||||||
|
|
||||||
@@ -196,7 +195,6 @@ public class ImageActivity extends BriarActivity
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPull(float progress) {
|
public void onPull(float progress) {
|
||||||
layout.getBackground().setAlpha(Math.round((1 - progress) * 255));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -18,9 +18,7 @@
|
|||||||
<item name="toolbarStyle">@style/BriarToolbar</item>
|
<item name="toolbarStyle">@style/BriarToolbar</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="BriarTheme.Transparent.NoActionBar" parent="BriarTheme.NoActionBar">
|
<style name="BriarTheme.ActionBarOverlay" parent="BriarTheme.NoActionBar">
|
||||||
<item name="android:windowBackground">@android:color/transparent</item>
|
|
||||||
<item name="android:windowIsTranslucent">true</item>
|
|
||||||
<item name="android:windowActionBarOverlay">true</item>
|
<item name="android:windowActionBarOverlay">true</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user