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

Commit 1d46191d authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

am b5f9b4f1: am 302759c1: Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken

parents fb3a35e5 b5f9b4f1

core/res/AndroidManifest.xml

+0 −3
Original line number Diff line number Diff line
@@ -1277,9 +1277,6 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>

        <activity android:name="com.android.server.status.UsbStorageActivity"

                android:excludeFromRecents="true">

        </activity>

        <activity android:name="com.android.internal.app.ExternalMediaFormatActivity"

                android:theme="@style/Theme.Dialog.Alert"

                android:excludeFromRecents="true">

packages/SystemUI/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -18,5 +18,10 @@ 
            android:name=".statusbar.PhoneStatusBarService"

            android:exported="false"

            />



        <activity android:name=".usb.UsbStorageActivity"

                android:excludeFromRecents="true">

        </activity>



    </application>

</manifest>

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

+10 −7
Original line number Diff line number Diff line
@@ -85,13 +85,6 @@ public class PhoneStatusBarService extends StatusBarService { 
    private static final int MSG_ANIMATE = 1000;

    private static final int MSG_ANIMATE_REVEAL = 1001;



    public interface NotificationCallbacks {

        void onSetDisabled(int status);

        void onClearAll();

        void onNotificationClick(String pkg, String tag, int id);

        void onPanelRevealed();

    }



    private class ExpandedDialog extends Dialog {

        ExpandedDialog(Context context) {

            super(context, com.android.internal.R.style.Theme_Light_NoTitleBar);
@@ -349,6 +342,16 @@ public class PhoneStatusBarService extends StatusBarService { 


        final RemoteViews contentView = notification.notification.contentView;



        if (false) {

            Slog.d(TAG, "old notification: when=" + oldNotification.notification.when

                    + " ongoing=" + oldNotification.isOngoing()

                    + " expanded=" + oldEntry.expanded

                    + " contentView=" + oldContentView);

            Slog.d(TAG, "new notification: when=" + notification.notification.when

                    + " ongoing=" + oldNotification.isOngoing()

                    + " contentView=" + contentView);

        }



        // Can we just reapply the RemoteViews in place?  If when didn't change, the order

        // didn't change.

        if (notification.notification.when == oldNotification.notification.when

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

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ public class StatusBarPolicy { 
        // storage

        mStorageManager = (StorageManager) context.getSystemService(Context.STORAGE_SERVICE);

        mStorageManager.registerListener(

                new com.android.server.status.StorageNotification(context));

                new com.android.systemui.usb.StorageNotification(context));



        // battery

        mService.setIcon("battery", com.android.internal.R.drawable.stat_sys_battery_unknown, 0);

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

+0 −6
Original line number Diff line number Diff line
@@ -48,12 +48,6 @@ public abstract class StatusBarService extends Service implements CommandQueue.C 
    CommandQueue mCommandQueue;

    IStatusBarService mBarService;



    /* TODO

    H mHandler = new H();

    Object mQueueLock = new Object();

    NotificationCallbacks mNotificationCallbacks;

    */



    @Override

    public void onCreate() {

        // Connect in to the status bar manager service