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

Commit a7588e63 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Remove a few non-public dependencies."

parents 195c32f7 b8bacccf

packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java

+1 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.os.UserHandle; 
import android.util.Slog;



import com.android.systemui.SystemUI;

import com.google.android.collect.Maps;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -50,7 +49,7 @@ public class RingtonePlayer extends SystemUI { 
    private IAudioService mAudioService;



    private final NotificationPlayer mAsyncPlayer = new NotificationPlayer(TAG);

    private final HashMap<IBinder, Client> mClients = Maps.newHashMap();

    private final HashMap<IBinder, Client> mClients = new HashMap<IBinder, Client>();



    @Override

    public void start() {

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

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class GestureRecorder { 
            public MotionEvent event;

            public MotionEventRecord(long when, MotionEvent event) {

                this.time = when;

                this.event = event.copy();

                this.event = MotionEvent.obtain(event);

            }

            String actionName(int action) {

                switch (action) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/Ticker.java

+15 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.widget.ImageSwitcher; 
import java.util.ArrayList;



import com.android.internal.statusbar.StatusBarIcon;

import com.android.internal.util.CharSequences;



import com.android.systemui.R;

import com.android.systemui.statusbar.StatusBarIconView;
@@ -192,7 +191,7 @@ public abstract class Ticker { 
            if (n.getPackageName().equals(seg.notification.getPackageName())

                    && n.getNotification().icon == seg.notification.getNotification().icon

                    && n.getNotification().iconLevel == seg.notification.getNotification().iconLevel

                    && CharSequences.equals(seg.notification.getNotification().tickerText,

                    && charSequencesEqual(seg.notification.getNotification().tickerText,

                        n.getNotification().tickerText)) {

                return;

            }
@@ -232,6 +231,20 @@ public abstract class Ticker { 
        }

    }



    private static boolean charSequencesEqual(CharSequence a, CharSequence b) {

        if (a.length() != b.length()) {

            return false;

        }



        int length = a.length();

        for (int i = 0; i < length; i++) {

            if (a.charAt(i) != b.charAt(i)) {

                return false;

            }

        }

        return true;

    }



    public void removeEntry(StatusBarNotification n) {

        for (int i=mSegments.size()-1; i>=0; i--) {

            Segment seg = mSegments.get(i);