Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5c2f5b5 authored by Joe Onorato's avatar Joe Onorato
Browse files

resolved conflicts for merge of 32b739b6 to master 

Change-Id: I5a1791d12ca57ee682e46ade7d24b21e9f59aff2
parents 6443de56 32b739b6

core/res/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
<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. -->

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
        android:icon="@drawable/ic_launcher_settings">

                 

        <service

            android:name=".statusbar.PhoneStatusBarService"

            android:name=".statusbar.StatusBarService"

            android:exported="false"

            />

packages/SystemUI/src/com/android/systemui/statusbar/CloseDragHandle.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.widget.LinearLayout; 




public class CloseDragHandle extends LinearLayout {

    PhoneStatusBarService mService;

    StatusBarService mService;



    public CloseDragHandle(Context context, AttributeSet attrs) {

        super(context, attrs);

packages/SystemUI/src/com/android/systemui/statusbar/ExpandedView.java

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.util.Slog; 




public class ExpandedView extends LinearLayout {

    PhoneStatusBarService mService;

    StatusBarService mService;

    int mPrevHeight = -1;



    public ExpandedView(Context context, AttributeSet attrs) {
@@ -50,10 +50,10 @@ public class ExpandedView extends LinearLayout { 
         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);

         }

     }

}

packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java

deleted100644 → 0
+0 −1546

File deleted.

Preview size limit exceeded, changes collapsed.