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

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)

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>

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>

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>

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"
         />

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>

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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";

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;

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;

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;

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";
 

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;

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;

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;

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;