Move the StatusBarPhone package into a new catch-all SystemUI.apk.

61 files changed, 47 insertions, 44 deletions

diff --git a/packages/StatusBarPhone/Android.mk b/packages/SystemUI/Android.mk
index b3d0558..4c83768 100644
--- a/packages/StatusBarPhone/Android.mk
+++ b/packages/SystemUI/Android.mk
@@ -7,7 +7,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_JAVA_LIBRARIES := services
 
-LOCAL_PACKAGE_NAME := StatusBarPhone
+LOCAL_PACKAGE_NAME := SystemUI
 LOCAL_CERTIFICATE := platform
 
 include $(BUILD_PACKAGE)
diff --git a/packages/StatusBarPhone/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index f3643a3..3f5b69d 100644
--- a/packages/StatusBarPhone/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.policy.statusbar.phone"
+        package="com.android.systemui"
         android:sharedUserId="android.uid.system">
 
     <application
@@ -8,14 +8,14 @@
         android:icon="@drawable/ic_launcher_settings">
                  
         <receiver
-            android:name="StatusBarStarter"
+            android:name=".statusbar.StatusBarStarter"
             >
             <intent-filter>
                 <action android:name="com.android.internal.policy.statusbar.START" />
             </intent-filter>
         </receiver>
         <service
-            android:name="PhoneStatusBarService"
+            android:name=".statusbar.PhoneStatusBarService"
             android:exported="false"
             />
     </application>
diff --git a/packages/StatusBarPhone/MODULE_LICENSE_APACHE2 b/packages/SystemUI/MODULE_LICENSE_APACHE2
index e69de29..e69de29 100644
--- a/packages/StatusBarPhone/MODULE_LICENSE_APACHE2
+++ b/packages/SystemUI/MODULE_LICENSE_APACHE2
diff --git a/packages/StatusBarPhone/NOTICE b/packages/SystemUI/NOTICE
index c5b1efa..c5b1efa 100644
--- a/packages/StatusBarPhone/NOTICE
+++ b/packages/SystemUI/NOTICE
diff --git a/packages/StatusBarPhone/res/drawable-hdpi/btn_default_small_normal.9.png b/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal.9.png
index baafed6..baafed6 100644
--- a/packages/StatusBarPhone/res/drawable-hdpi/btn_default_small_normal.9.png
+++ b/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal.9.png
diff --git a/packages/StatusBarPhone/res/drawable-hdpi/btn_default_small_normal_disable.9.png b/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable.9.png
index 175197b..175197b 100644
--- a/packages/StatusBarPhone/res/drawable-hdpi/btn_default_small_normal_disable.9.png
+++ b/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable.9.png
diff --git a/packages/StatusBarPhone/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png b/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png
index ec1feff..ec1feff 100644
--- a/packages/StatusBarPhone/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png
+++ b/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png
diff --git a/packages/StatusBarPhone/res/drawable-hdpi/btn_default_small_pressed.9.png b/packages/SystemUI/res/drawable-hdpi/btn_default_small_pressed.9.png
index c1f9a0f..c1f9a0f 100644
--- a/packages/StatusBarPhone/res/drawable-hdpi/btn_default_small_pressed.9.png
+++ b/packages/SystemUI/res/drawable-hdpi/btn_default_small_pressed.9.png
diff --git a/packages/StatusBarPhone/res/drawable-hdpi/btn_default_small_selected.9.png b/packages/SystemUI/res/drawable-hdpi/btn_default_small_selected.9.png
index 0ea3f40..0ea3f40 100644
--- a/packages/StatusBarPhone/res/drawable-hdpi/btn_default_small_selected.9.png
+++ b/packages/SystemUI/res/drawable-hdpi/btn_default_small_selected.9.png
diff --git a/packages/StatusBarPhone/res/drawable-hdpi/ic_launcher_settings.png b/packages/SystemUI/res/drawable-hdpi/ic_launcher_settings.png
index ff34a7f..ff34a7f 100644
--- a/packages/StatusBarPhone/res/drawable-hdpi/ic_launcher_settings.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_launcher_settings.png
diff --git a/packages/StatusBarPhone/res/drawable-hdpi/ic_notification_overlay.9.png b/packages/SystemUI/res/drawable-hdpi/ic_notification_overlay.9.png
index 744178f..744178f 100644
--- a/packages/StatusBarPhone/res/drawable-hdpi/ic_notification_overlay.9.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_notification_overlay.9.png
diff --git a/packages/StatusBarPhone/res/drawable-hdpi/stat_notify_more.png b/packages/SystemUI/res/drawable-hdpi/stat_notify_more.png
index 1c7f9db..1c7f9db 100755
--- a/packages/StatusBarPhone/res/drawable-hdpi/stat_notify_more.png
+++ b/packages/SystemUI/res/drawable-hdpi/stat_notify_more.png
diff --git a/packages/StatusBarPhone/res/drawable-hdpi/status_bar_close_on.9.png b/packages/SystemUI/res/drawable-hdpi/status_bar_close_on.9.png
index 5acf638..5acf638 100644
--- a/packages/StatusBarPhone/res/drawable-hdpi/status_bar_close_on.9.png
+++ b/packages/SystemUI/res/drawable-hdpi/status_bar_close_on.9.png
diff --git a/packages/StatusBarPhone/res/drawable-hdpi/status_bar_header_background.9.png b/packages/SystemUI/res/drawable-hdpi/status_bar_header_background.9.png
index be36ff2..be36ff2 100644
--- a/packages/StatusBarPhone/res/drawable-hdpi/status_bar_header_background.9.png
+++ b/packages/SystemUI/res/drawable-hdpi/status_bar_header_background.9.png
diff --git a/packages/StatusBarPhone/res/drawable-hdpi/statusbar_background.9.png b/packages/SystemUI/res/drawable-hdpi/statusbar_background.9.png
index dcca695..dcca695 100644
--- a/packages/StatusBarPhone/res/drawable-hdpi/statusbar_background.9.png
+++ b/packages/SystemUI/res/drawable-hdpi/statusbar_background.9.png
diff --git a/packages/StatusBarPhone/res/drawable-hdpi/title_bar_portrait.9.png b/packages/SystemUI/res/drawable-hdpi/title_bar_portrait.9.png
index 70f7cc2..70f7cc2 100644
--- a/packages/StatusBarPhone/res/drawable-hdpi/title_bar_portrait.9.png
+++ b/packages/SystemUI/res/drawable-hdpi/title_bar_portrait.9.png
diff --git a/packages/StatusBarPhone/res/drawable-hdpi/title_bar_shadow.9.png b/packages/SystemUI/res/drawable-hdpi/title_bar_shadow.9.png
index e6dab63..e6dab63 100644
--- a/packages/StatusBarPhone/res/drawable-hdpi/title_bar_shadow.9.png
+++ b/packages/SystemUI/res/drawable-hdpi/title_bar_shadow.9.png
diff --git a/packages/StatusBarPhone/res/drawable-mdpi/btn_default_small_normal.9.png b/packages/SystemUI/res/drawable-mdpi/btn_default_small_normal.9.png
index bcedd5f..bcedd5f 100644
--- a/packages/StatusBarPhone/res/drawable-mdpi/btn_default_small_normal.9.png
+++ b/packages/SystemUI/res/drawable-mdpi/btn_default_small_normal.9.png
diff --git a/packages/StatusBarPhone/res/drawable-mdpi/btn_default_small_normal_disable.9.png b/packages/SystemUI/res/drawable-mdpi/btn_default_small_normal_disable.9.png
index ac6260f..ac6260f 100644
--- a/packages/StatusBarPhone/res/drawable-mdpi/btn_default_small_normal_disable.9.png
+++ b/packages/SystemUI/res/drawable-mdpi/btn_default_small_normal_disable.9.png
diff --git a/packages/StatusBarPhone/res/drawable-mdpi/btn_default_small_normal_disable_focused.9.png b/packages/SystemUI/res/drawable-mdpi/btn_default_small_normal_disable_focused.9.png
index 4ee1b3f..4ee1b3f 100644
--- a/packages/StatusBarPhone/res/drawable-mdpi/btn_default_small_normal_disable_focused.9.png
+++ b/packages/SystemUI/res/drawable-mdpi/btn_default_small_normal_disable_focused.9.png
diff --git a/packages/StatusBarPhone/res/drawable-mdpi/btn_default_small_pressed.9.png b/packages/SystemUI/res/drawable-mdpi/btn_default_small_pressed.9.png
index 25e38f4..25e38f4 100644
--- a/packages/StatusBarPhone/res/drawable-mdpi/btn_default_small_pressed.9.png
+++ b/packages/SystemUI/res/drawable-mdpi/btn_default_small_pressed.9.png
diff --git a/packages/StatusBarPhone/res/drawable-mdpi/btn_default_small_selected.9.png b/packages/SystemUI/res/drawable-mdpi/btn_default_small_selected.9.png
index cc209c6..cc209c6 100644
--- a/packages/StatusBarPhone/res/drawable-mdpi/btn_default_small_selected.9.png
+++ b/packages/SystemUI/res/drawable-mdpi/btn_default_small_selected.9.png
diff --git a/packages/StatusBarPhone/res/drawable-mdpi/ic_launcher_settings.png b/packages/SystemUI/res/drawable-mdpi/ic_launcher_settings.png
index b08ad3b..b08ad3b 100644
--- a/packages/StatusBarPhone/res/drawable-mdpi/ic_launcher_settings.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_launcher_settings.png
diff --git a/packages/StatusBarPhone/res/drawable-mdpi/ic_notification_overlay.9.png b/packages/SystemUI/res/drawable-mdpi/ic_notification_overlay.9.png
index 1a3063c..1a3063c 100644
--- a/packages/StatusBarPhone/res/drawable-mdpi/ic_notification_overlay.9.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_notification_overlay.9.png
diff --git a/packages/StatusBarPhone/res/drawable-mdpi/stat_notify_more.png b/packages/SystemUI/res/drawable-mdpi/stat_notify_more.png
index e129ba9..e129ba9 100644
--- a/packages/StatusBarPhone/res/drawable-mdpi/stat_notify_more.png
+++ b/packages/SystemUI/res/drawable-mdpi/stat_notify_more.png
diff --git a/packages/StatusBarPhone/res/drawable-mdpi/status_bar_close_on.9.png b/packages/SystemUI/res/drawable-mdpi/status_bar_close_on.9.png
index 9cbd9fe..9cbd9fe 100644
--- a/packages/StatusBarPhone/res/drawable-mdpi/status_bar_close_on.9.png
+++ b/packages/SystemUI/res/drawable-mdpi/status_bar_close_on.9.png
diff --git a/packages/StatusBarPhone/res/drawable-mdpi/status_bar_header_background.9.png b/packages/SystemUI/res/drawable-mdpi/status_bar_header_background.9.png
index fa9a90c..fa9a90c 100644
--- a/packages/StatusBarPhone/res/drawable-mdpi/status_bar_header_background.9.png
+++ b/packages/SystemUI/res/drawable-mdpi/status_bar_header_background.9.png
diff --git a/packages/StatusBarPhone/res/drawable-mdpi/statusbar_background.9.png b/packages/SystemUI/res/drawable-mdpi/statusbar_background.9.png
index eb7c1a4..eb7c1a4 100644
--- a/packages/StatusBarPhone/res/drawable-mdpi/statusbar_background.9.png
+++ b/packages/SystemUI/res/drawable-mdpi/statusbar_background.9.png
diff --git a/packages/StatusBarPhone/res/drawable-mdpi/title_bar_portrait.9.png b/packages/SystemUI/res/drawable-mdpi/title_bar_portrait.9.png
index 13b18d8..13b18d8 100644
--- a/packages/StatusBarPhone/res/drawable-mdpi/title_bar_portrait.9.png
+++ b/packages/SystemUI/res/drawable-mdpi/title_bar_portrait.9.png
diff --git a/packages/StatusBarPhone/res/drawable-mdpi/title_bar_shadow.9.png b/packages/SystemUI/res/drawable-mdpi/title_bar_shadow.9.png
index dbcefee..dbcefee 100644
--- a/packages/StatusBarPhone/res/drawable-mdpi/title_bar_shadow.9.png
+++ b/packages/SystemUI/res/drawable-mdpi/title_bar_shadow.9.png
diff --git a/packages/StatusBarPhone/res/drawable/btn_default_small.xml b/packages/SystemUI/res/drawable/btn_default_small.xml
index 5485ea0..5485ea0 100644
--- a/packages/StatusBarPhone/res/drawable/btn_default_small.xml
+++ b/packages/SystemUI/res/drawable/btn_default_small.xml
diff --git a/packages/StatusBarPhone/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml
index bb2d3b2..420286b 100644
--- a/packages/StatusBarPhone/res/layout/status_bar.xml
+++ b/packages/SystemUI/res/layout/status_bar.xml
@@ -19,7 +19,7 @@
 -->
 
 <!--    android:background="@drawable/status_bar_closed_default_background" -->
-<com.android.policy.statusbar.phone.StatusBarView
+<com.android.systemui.statusbar.StatusBarView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:background="@drawable/statusbar_background"
     android:orientation="vertical"
@@ -32,7 +32,7 @@
         android:layout_height="match_parent"
         android:orientation="horizontal">
             
-        <com.android.policy.statusbar.phone.IconMerger android:id="@+id/notificationIcons"
+        <com.android.systemui.statusbar.IconMerger android:id="@+id/notificationIcons"
             android:layout_width="0dip"
             android:layout_weight="1"
             android:layout_height="match_parent"
@@ -49,7 +49,7 @@
             android:gravity="center_vertical"
             android:orientation="horizontal"/>    
 
-        <com.android.policy.statusbar.phone.Clock
+        <com.android.systemui.statusbar.Clock
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:singleLine="true"
@@ -72,16 +72,16 @@
             android:layout_height="match_parent"
             android:layout_marginRight="8dip"
             >
-            <com.android.policy.statusbar.phone.AnimatedImageView
+            <com.android.systemui.statusbar.AnimatedImageView
                 android:layout_width="25dip"
                 android:layout_height="25dip"
                 />
-            <com.android.policy.statusbar.phone.AnimatedImageView
+            <com.android.systemui.statusbar.AnimatedImageView
                 android:layout_width="25dip"
                 android:layout_height="25dip"
                 />
         </ImageSwitcher>
-        <com.android.policy.statusbar.phone.TickerView android:id="@+id/tickerText"
+        <com.android.systemui.statusbar.TickerView android:id="@+id/tickerText"
             android:layout_width="0dip"
             android:layout_weight="1"
             android:layout_height="wrap_content"
@@ -99,10 +99,10 @@
                 android:layout_height="wrap_content"
                 android:singleLine="true"
                 />
-        </com.android.policy.statusbar.phone.TickerView>
+        </com.android.systemui.statusbar.TickerView>
     </LinearLayout>
 
-    <com.android.policy.statusbar.phone.DateView android:id="@+id/date"
+    <com.android.systemui.statusbar.DateView android:id="@+id/date"
         android:textAppearance="@*android:style/TextAppearance.StatusBar.Icon"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -112,4 +112,4 @@
         android:paddingRight="6px"
         android:background="@drawable/statusbar_background"
         />
-</com.android.policy.statusbar.phone.StatusBarView>
+</com.android.systemui.statusbar.StatusBarView>
diff --git a/packages/StatusBarPhone/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml
index 26d7a07..350a675 100644
--- a/packages/StatusBarPhone/res/layout/status_bar_expanded.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<com.android.policy.statusbar.phone.ExpandedView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.systemui.statusbar.ExpandedView xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:focusable="true"
     android:descendantFocusability="afterDescendants"
@@ -87,7 +87,7 @@
             android:layout_height="match_parent"
             android:fadingEdge="none"
             >
-            <com.android.policy.statusbar.phone.NotificationLinearLayout
+            <com.android.systemui.statusbar.NotificationLinearLayout
                 android:id="@+id/notificationLinearLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -130,7 +130,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
                     />
-            </com.android.policy.statusbar.phone.NotificationLinearLayout>
+            </com.android.systemui.statusbar.NotificationLinearLayout>
         </ScrollView>
 
         <ImageView
@@ -141,4 +141,4 @@
         />
 
     </FrameLayout>
-</com.android.policy.statusbar.phone.ExpandedView>
+</com.android.systemui.statusbar.ExpandedView>
diff --git a/packages/StatusBarPhone/res/layout/status_bar_icon.xml b/packages/SystemUI/res/layout/status_bar_icon.xml
index cba5de7..21d606f 100644
--- a/packages/StatusBarPhone/res/layout/status_bar_icon.xml
+++ b/packages/SystemUI/res/layout/status_bar_icon.xml
@@ -25,7 +25,7 @@
     android:layout_height="25dp"
     >
 
-    <com.android.policy.statusbar.phone.AnimatedImageView android:id="@+id/image"
+    <com.android.systemui.statusbar.AnimatedImageView android:id="@+id/image"
         android:layout_width="match_parent" 
         android:layout_height="match_parent"
         />
diff --git a/packages/StatusBarPhone/res/layout/status_bar_tracking.xml b/packages/SystemUI/res/layout/status_bar_tracking.xml
index 3866a31..bffd67e 100644
--- a/packages/StatusBarPhone/res/layout/status_bar_tracking.xml
+++ b/packages/SystemUI/res/layout/status_bar_tracking.xml
@@ -15,7 +15,7 @@
     limitations under the License.
 -->
 
-<com.android.policy.statusbar.phone.TrackingView
+<com.android.systemui.statusbar.TrackingView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:visibility="gone"
@@ -26,13 +26,13 @@
     android:paddingRight="0px"
     >
 
-    <com.android.policy.statusbar.phone.TrackingPatternView
+    <com.android.systemui.statusbar.TrackingPatternView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         />
 
-    <com.android.policy.statusbar.phone.CloseDragHandle android:id="@+id/close"
+    <com.android.systemui.statusbar.CloseDragHandle android:id="@+id/close"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -44,6 +44,6 @@
             android:scaleType="fitXY"
             android:src="@drawable/status_bar_close_on"/>
 
-    </com.android.policy.statusbar.phone.CloseDragHandle>
+    </com.android.systemui.statusbar.CloseDragHandle>
 
-</com.android.policy.statusbar.phone.TrackingView>
+</com.android.systemui.statusbar.TrackingView>
diff --git a/packages/StatusBarPhone/res/values/arrays.xml b/packages/SystemUI/res/values/arrays.xml
index dbb0e0f..dbb0e0f 100644
--- a/packages/StatusBarPhone/res/values/arrays.xml
+++ b/packages/SystemUI/res/values/arrays.xml
diff --git a/packages/StatusBarPhone/res/values/defaults.xml b/packages/SystemUI/res/values/defaults.xml
index 34302c4..34302c4 100644
--- a/packages/StatusBarPhone/res/values/defaults.xml
+++ b/packages/SystemUI/res/values/defaults.xml
diff --git a/packages/StatusBarPhone/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 93cf377..93cf377 100644
--- a/packages/StatusBarPhone/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
diff --git a/packages/StatusBarPhone/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 8e42b59..8e42b59 100644
--- a/packages/StatusBarPhone/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
diff --git a/packages/StatusBarPhone/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 41c8ae7..41c8ae7 100644
--- a/packages/StatusBarPhone/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
diff --git a/packages/StatusBarPhone/res/xml/bookmarks.xml b/packages/SystemUI/res/xml/bookmarks.xml
index dfaeeaf..dfaeeaf 100644
--- a/packages/StatusBarPhone/res/xml/bookmarks.xml
+++ b/packages/SystemUI/res/xml/bookmarks.xml
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/AnimatedImageView.java b/packages/SystemUI/src/com/android/systemui/statusbar/AnimatedImageView.java
index 3411f29..70d4d6a 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/AnimatedImageView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/AnimatedImageView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.content.Context;
 import android.graphics.drawable.AnimationDrawable;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/Clock.java b/packages/SystemUI/src/com/android/systemui/statusbar/Clock.java
index 8ad1fb6..eff05dc 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/Clock.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/Clock.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/CloseDragHandle.java b/packages/SystemUI/src/com/android/systemui/statusbar/CloseDragHandle.java
index 324c145..0f6723e 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/CloseDragHandle.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/CloseDragHandle.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
index 94b992a..5a888fd 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/CommandQueue.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.os.Handler;
 import android.os.IBinder;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/DateView.java b/packages/SystemUI/src/com/android/systemui/statusbar/DateView.java
index e36b124..e6d3a7e 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/DateView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/DateView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/ExpandedView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandedView.java
index 6b357e8..c5b901f 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/ExpandedView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandedView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/FixedSizeDrawable.java b/packages/SystemUI/src/com/android/systemui/statusbar/FixedSizeDrawable.java
index 3e40443..eb22b61 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/FixedSizeDrawable.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/FixedSizeDrawable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.graphics.drawable.Drawable;
 import android.graphics.Canvas;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/IconMerger.java b/packages/SystemUI/src/com/android/systemui/statusbar/IconMerger.java
index 226cb6a..26f5f51 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/IconMerger.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/IconMerger.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.content.Context;
 import android.os.Handler;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/LatestItemView.java b/packages/SystemUI/src/com/android/systemui/statusbar/LatestItemView.java
index 36e1bfb..1e89624 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/LatestItemView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/LatestItemView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/NotificationData.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
index 9252a33..7a82267 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/NotificationData.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.app.Notification;
 import android.os.IBinder;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/NotificationLinearLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLinearLayout.java
index a5d0c6a..8105352 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/NotificationLinearLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLinearLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/PhoneStatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java
index 10d31be..925095e 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/PhoneStatusBarService.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import com.android.internal.util.CharSequences;
 import com.android.internal.statusbar.IStatusBar;
@@ -71,6 +71,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Set;
 
+import com.android.systemui.R;
 
 public class PhoneStatusBarService extends StatusBarService {
     static final String TAG = "PhoneStatusBarService";
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
index 6b0b6d5..959ac7c 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarIconView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
index 20f3552..a60a40b 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.app.Service;
 import android.content.Context;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarStarter.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStarter.java
index 8314032..2b9dfb0 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarStarter.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStarter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarView.java
index ae703bf..466cc75 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.content.Context;
 import android.content.res.Configuration;
@@ -27,6 +27,8 @@ import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.widget.FrameLayout;
 
+import com.android.systemui.R;
+
 public class StatusBarView extends FrameLayout {
     private static final String TAG = "StatusBarView";
 
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/Ticker.java b/packages/SystemUI/src/com/android/systemui/statusbar/Ticker.java
index b9181a7..c3647cb 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/Ticker.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/Ticker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -34,7 +34,7 @@ import android.widget.ImageSwitcher;
 import java.util.ArrayList;
 
 import com.android.internal.statusbar.StatusBarNotification;
-
+import com.android.systemui.R;
 
 public abstract class Ticker {
     private static final int TICKER_SEGMENT_DELAY = 3000;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/TickerView.java b/packages/SystemUI/src/com/android/systemui/statusbar/TickerView.java
index 2b98fc5..9749ae4 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/TickerView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/TickerView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/TrackingPatternView.java b/packages/SystemUI/src/com/android/systemui/statusbar/TrackingPatternView.java
index 2eee5df..ba6f15d 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/TrackingPatternView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/TrackingPatternView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/TrackingView.java b/packages/SystemUI/src/com/android/systemui/statusbar/TrackingView.java
index 9eeaf4b..c59eb6a 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/TrackingView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/TrackingView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.policy.statusbar.phone;
+package com.android.systemui.statusbar;
 
 import android.content.Context;
 import android.util.AttributeSet;