From 63a520bae45e8601d07f13b8abc22f1131e8263d Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Sat, 2 Mar 2013 00:32:13 +0000
Subject: [PATCH] Show spinner when quitting, don't show time in ongoing
notification.
---
.../src/net/sf/briar/android/BriarService.java | 1 +
.../net/sf/briar/android/HomeScreenActivity.java | 16 ++++++++--------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/briar-android/src/net/sf/briar/android/BriarService.java b/briar-android/src/net/sf/briar/android/BriarService.java
index ba9cf7fbea..0a1bfa11e3 100644
--- a/briar-android/src/net/sf/briar/android/BriarService.java
+++ b/briar-android/src/net/sf/briar/android/BriarService.java
@@ -47,6 +47,7 @@ public class BriarService extends RoboService {
b.setSmallIcon(R.drawable.notification_icon);
b.setContentTitle(getText(R.string.notification_title));
b.setContentText(getText(R.string.notification_text));
+ b.setWhen(0); // Don't show the time
// Touch the notification to quit
Intent i = new Intent(this, HomeScreenActivity.class);
i.addFlags(FLAG_ACTIVITY_CLEAR_TOP);
diff --git a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
index 4d597ce7cd..38e5c6206f 100644
--- a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
+++ b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java
@@ -46,14 +46,6 @@ public class HomeScreenActivity extends BriarActivity {
// If this activity was launched from the notification bar, quit
if(getIntent().getBooleanExtra("net.sf.briar.QUIT", false)) {
- LinearLayout layout = new LinearLayout(this);
- layout.setLayoutParams(new LinearLayout.LayoutParams(MATCH_PARENT,
- MATCH_PARENT));
- layout.setGravity(CENTER);
- ProgressBar spinner = new ProgressBar(this);
- spinner.setIndeterminate(true);
- layout.addView(spinner);
- setContentView(layout);
quit();
} else {
ListView.LayoutParams matchParent = new ListView.LayoutParams(
@@ -173,6 +165,14 @@ public class HomeScreenActivity extends BriarActivity {
}
private void quit() {
+ LinearLayout layout = new LinearLayout(this);
+ layout.setLayoutParams(new LinearLayout.LayoutParams(MATCH_PARENT,
+ MATCH_PARENT));
+ layout.setGravity(CENTER);
+ ProgressBar spinner = new ProgressBar(this);
+ spinner.setIndeterminate(true);
+ layout.addView(spinner);
+ setContentView(layout);
new Thread() {
@Override
public void run() {
--
GitLab