Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
579
Issues
579
List
Boards
Labels
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
briar
briar
Commits
8183b7b2
Commit
8183b7b2
authored
Jan 11, 2019
by
akwizgran
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1469-hide-ui-without-flashing' into 'master'
Hide UI without flashing Closes
#1469
See merge request
!1030
parents
bd48c97e
91777fd9
Pipeline
#2959
passed with stage
in 8 minutes and 40 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
26 deletions
+22
-26
AndroidManifest.xml
briar-android/src/main/AndroidManifest.xml
+4
-4
ExitActivity.java
...a/org/briarproject/briar/android/logout/ExitActivity.java
+5
-11
HideUiActivity.java
...org/briarproject/briar/android/logout/HideUiActivity.java
+2
-9
PanicResponderActivity.java
...arproject/briar/android/panic/PanicResponderActivity.java
+2
-2
themes.xml
briar-android/src/main/res/values/themes.xml
+9
-0
No files found.
briar-android/src/main/AndroidManifest.xml
View file @
8183b7b2
...
...
@@ -157,7 +157,7 @@
android:value=
"org.briarproject.briar.android.navdrawer.NavDrawerActivity"
/>
</activity>
<activity
<activity
android:name=
"org.briarproject.briar.android.privategroup.memberlist.GroupMemberListActivity"
android:label=
"@string/groups_member_list"
android:parentActivityName=
"org.briarproject.briar.android.privategroup.conversation.GroupActivity"
...
...
@@ -400,7 +400,7 @@
<activity
android:name=
"org.briarproject.briar.android.panic.PanicResponderActivity"
android:noHistory=
"true"
android:theme=
"@style/T
heme.AppCompat.NoActionBar
"
>
android:theme=
"@style/T
ranslucentTheme
"
>
<!-- this can never have launchMode singleTask or singleInstance! -->
<intent-filter>
<action
android:name=
"info.guardianproject.panic.action.TRIGGER"
/>
...
...
@@ -410,12 +410,12 @@
<activity
android:name=
"org.briarproject.briar.android.logout.ExitActivity"
android:theme=
"@
style/Theme.AppCompat.NoActionBar
"
>
android:theme=
"@
android:style/Theme.NoDisplay
"
>
</activity>
<activity
android:name=
".android.logout.HideUiActivity"
android:theme=
"@
style/Theme.AppCompat.NoActionBar
"
>
android:theme=
"@
android:style/Theme.NoDisplay
"
>
</activity>
<activity
...
...
briar-android/src/main/java/org/briarproject/briar/android/logout/ExitActivity.java
View file @
8183b7b2
package
org
.
briarproject
.
briar
.
android
.
logout
;
import
android.
os.Build
;
import
android.
app.Activity
;
import
android.os.Bundle
;
import
org.briarproject.briar.android.activity.ActivityComponent
;
import
org.briarproject.briar.android.activity.BaseActivity
;
import
java.util.logging.Logger
;
public
class
ExitActivity
extends
BaseActivity
{
import
static
android
.
os
.
Build
.
VERSION
.
SDK_INT
;
public
class
ExitActivity
extends
Activity
{
private
static
final
Logger
LOG
=
Logger
.
getLogger
(
ExitActivity
.
class
.
getName
());
...
...
@@ -16,14 +15,9 @@ public class ExitActivity extends BaseActivity {
@Override
public
void
onCreate
(
Bundle
state
)
{
super
.
onCreate
(
state
);
if
(
Build
.
VERSION
.
SDK_INT
>=
21
)
finishAndRemoveTask
();
if
(
SDK_INT
>=
21
)
finishAndRemoveTask
();
else
finish
();
LOG
.
info
(
"Exiting"
);
System
.
exit
(
0
);
}
@Override
public
void
injectActivity
(
ActivityComponent
component
)
{
}
}
\ No newline at end of file
briar-android/src/main/java/org/briarproject/briar/android/logout/HideUiActivity.java
View file @
8183b7b2
package
org
.
briarproject
.
briar
.
android
.
logout
;
import
android.app.Activity
;
import
android.os.Bundle
;
import
org.briarproject.briar.android.activity.ActivityComponent
;
import
org.briarproject.briar.android.activity.BaseActivity
;
public
class
HideUiActivity
extends
BaseActivity
{
public
class
HideUiActivity
extends
Activity
{
@Override
public
void
onCreate
(
Bundle
state
)
{
super
.
onCreate
(
state
);
finish
();
}
@Override
public
void
injectActivity
(
ActivityComponent
component
)
{
}
}
briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java
View file @
8183b7b2
...
...
@@ -2,7 +2,6 @@ package org.briarproject.briar.android.panic;
import
android.content.Intent
;
import
android.content.SharedPreferences
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.support.v7.preference.PreferenceManager
;
...
...
@@ -20,6 +19,7 @@ import info.guardianproject.panic.Panic;
import
info.guardianproject.panic.PanicResponder
;
import
info.guardianproject.trustedintents.TrustedIntents
;
import
static
android
.
os
.
Build
.
VERSION
.
SDK_INT
;
import
static
org
.
briarproject
.
briar
.
android
.
panic
.
PanicPreferencesFragment
.
KEY_LOCK
;
import
static
org
.
briarproject
.
briar
.
android
.
panic
.
PanicPreferencesFragment
.
KEY_PURGE
;
...
...
@@ -69,7 +69,7 @@ public class PanicResponderActivity extends BriarActivity {
}
}
if
(
Build
.
VERSION
.
SDK_INT
>=
21
)
{
if
(
SDK_INT
>=
21
)
{
finishAndRemoveTask
();
}
else
{
finish
();
...
...
briar-android/src/main/res/values/themes.xml
View file @
8183b7b2
...
...
@@ -66,4 +66,13 @@
<item
name=
"buttonBarNeutralButtonStyle"
>
@style/Widget.AppCompat.Button.Borderless
</item>
</style>
<style
name=
"TranslucentTheme"
parent=
"Theme.AppCompat.NoActionBar"
>
<item
name=
"android:colorBackgroundCacheHint"
>
@null
</item>
<item
name=
"android:windowAnimationStyle"
>
@android:style/Animation
</item>
<item
name=
"android:windowBackground"
>
@android:color/transparent
</item>
<item
name=
"android:windowContentOverlay"
>
@null
</item>
<item
name=
"android:windowIsTranslucent"
>
true
</item>
<item
name=
"android:windowNoTitle"
>
true
</item>
</style>
</resources>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment