From 416fa180e82e0fa3a6e7c763637bfe2a0fe0f6aa Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Mon, 8 Jul 2013 14:41:39 +0800
Subject: [PATCH] try to fix OOM in system ui. #24

---
 src/main/res/drawable/ic_stat_speed.xml                       | 4 ++--
 .../scala/com/github/shadowsocks/ShadowsocksService.scala     | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/res/drawable/ic_stat_speed.xml b/src/main/res/drawable/ic_stat_speed.xml
index fff08acc..261da952 100644
--- a/src/main/res/drawable/ic_stat_speed.xml
+++ b/src/main/res/drawable/ic_stat_speed.xml
@@ -2,7 +2,7 @@
 
 <level-list
     xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/ic_stat_kb000" android:maxLevel="0"/>
+  <item android:drawable="@drawable/ic_stat_shadowsocks" android:maxLevel="0"/>
   <item android:drawable="@drawable/ic_stat_kb001" android:maxLevel="1"/>
   <item android:drawable="@drawable/ic_stat_kb002" android:maxLevel="2"/>
   <item android:drawable="@drawable/ic_stat_kb003" android:maxLevel="3"/>
@@ -1094,4 +1094,4 @@
   <item android:drawable="@drawable/ic_stat_mb099" android:maxLevel="1089"/>
   <item android:drawable="@drawable/ic_stat_mb100" android:maxLevel="1090"/>
   <item android:drawable="@drawable/ic_stat_mb101" android:maxLevel="1091"/>
-</level-list>
\ No newline at end of file
+</level-list>
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
index 3271461e..a4b9fd4d 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
@@ -335,9 +335,7 @@ class ShadowsocksService extends Service {
         bitmap.getHeight - (bitmap.getHeight - bounds.height()) / 2, paint)
       builder.setLargeIcon(bitmap)
 
-      if (rate == 0) {
-        builder.setSmallIcon(R.drawable.ic_stat_shadowsocks)
-      } else if (rate < 1000) {
+      if (rate < 1000) {
         builder.setSmallIcon(R.drawable.ic_stat_speed, rate)
       } else if (rate <= 10000) {
         val mb = rate / 100 - 10 + 1000