recombine StatusBarService and PhoneStatusBarService

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Component to be used as the status bar service.  Must implement the IStatusBar

         interface.  This name is in the ComponentName flattened format (package/class)  -->

    <string name="config_statusBarComponent">com.android.systemui/com.android.systemui.statusbar.PhoneStatusBarService</string>

    <string name="config_statusBarComponent">com.android.systemui/com.android.systemui.statusbar.StatusBarService</string>

    <!-- Do not translate. Defines the slots for the right-hand side icons.  That is to say, the

         icons in the status bar that are not notifications. -->

        android:icon="@drawable/ic_launcher_settings">

        <service

            android:name=".statusbar.PhoneStatusBarService"

            android:name=".statusbar.StatusBarService"

            android:exported="false"

            />

public class CloseDragHandle extends LinearLayout {

    PhoneStatusBarService mService;

    StatusBarService mService;

    public CloseDragHandle(Context context, AttributeSet attrs) {

        super(context, attrs);

public class ExpandedView extends LinearLayout {

    PhoneStatusBarService mService;

    StatusBarService mService;

    int mPrevHeight = -1;

    public ExpandedView(Context context, AttributeSet attrs) {

         super.onLayout(changed, left, top, right, bottom);

         int height = bottom - top;

         if (height != mPrevHeight) {

             //Slog.d(PhoneStatusBarService.TAG, "height changed old=" + mPrevHeight

             //Slog.d(StatusBarService.TAG, "height changed old=" + mPrevHeight

             //     + " new=" + height);

             mPrevHeight = height;

             mService.updateExpandedViewPos(PhoneStatusBarService.EXPANDED_LEAVE_ALONE);

             mService.updateExpandedViewPos(StatusBarService.EXPANDED_LEAVE_ALONE);

         }

     }

}