From 19e93966c55828b8e078831c573c30ef3c0cd3a7 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Fri, 7 Jun 2013 14:32:04 +0800
Subject: [PATCH] update stat

---
 src/main/res/values/strings.xml                          | 2 +-
 .../com/github/shadowsocks/ShadowsocksService.scala      | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index b432572c..98360ce9 100755
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -44,7 +44,7 @@
   <!-- notification category -->
   <string name="forward_success">Shadowsocks started.</string>
   <string name="service_running">Running in the background.</string>
-  <string name="service_status" formatted="false">TX Rate: %d KB/s, RX Rate: %d KB/s</string>
+  <string name="service_status" formatted="false">Upload: %d KB/s, Download: %d KB/s</string>
   <string name="forward_fail">Shadowsocks failed to start.</string>
   <string name="service_stopped">Shadowsocks stopped.</string>
   <string name="forward_stop">Shadowsocks stopped.</string>
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
index 2e1667d6..c04e5ba4 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
@@ -310,11 +310,10 @@ class ShadowsocksService extends Service {
 
     val icon = getResources.getDrawable(R.drawable.ic_stat_shadowsocks)
     if (rate >= 0) {
-      val bitmap = Bitmap.createBitmap(icon.getIntrinsicWidth * 2,
-        icon.getIntrinsicHeight * 2, Bitmap.Config.ARGB_8888)
+      val bitmap = Bitmap.createBitmap(icon.getIntrinsicWidth * 4,
+        icon.getIntrinsicHeight * 4, Bitmap.Config.ARGB_8888)
       val r = rate.toString
-      val padding = bitmap.getHeight / 4
-      val size = bitmap.getHeight / 2
+      val size = bitmap.getHeight / 3
       val canvas = new Canvas(bitmap)
       val paint = new Paint()
       paint.setColor(Color.WHITE)
@@ -322,7 +321,7 @@ class ShadowsocksService extends Service {
       val bounds = new Rect()
       paint.getTextBounds(r, 0, r.length, bounds)
       canvas.drawText(r, (bitmap.getWidth - bounds.width()) / 2,
-        bitmap.getHeight - padding, paint)
+        bitmap.getHeight - (bitmap.getHeight - bounds.height()) / 2, paint)
       builder.setLargeIcon(bitmap)
 
       if (rate < 1000) {