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

Commit 6a40ac6c authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Some Cleanup"

parents 0ff26a76 2b37190f

packages/SystemUI/src/com/android/systemui/qs/customize/CustomQSPanel.java

+4 −2
Original line number Diff line number Diff line
@@ -179,14 +179,16 @@ public class CustomQSPanel extends QSPanel { 
        mCurrentTiles.clear();

        for (int i = 0; i < mTiles.size(); i++) {

            if (mTiles.get(i).startsWith(CustomTile.PREFIX)) {

                mCurrentTiles.add(BlankCustomTile.create(mHost, mTiles.get(i)));

                QSTile<?> tile = BlankCustomTile.create(mHost, mTiles.get(i));

                tile.setTileSpec(mTiles.get(i));

                mCurrentTiles.add(tile);

            } else {

                QSTile<?> tile = mHost.createTile(mTiles.get(i));

                if (tile != null) {

                    tile.setTileSpec(mTiles.get(i));

                    mCurrentTiles.add(tile);

                }

            }

            mCurrentTiles.get(mCurrentTiles.size() - 1).setTileSpec(mTiles.get(i));

        }

        super.setTiles(mCurrentTiles);

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -332,7 +332,10 @@ public final class QSTileHost implements QSTile.Host, Tunable { 
        // Intent tiles.

        else if (tileSpec.startsWith(IntentTile.PREFIX)) return IntentTile.create(this,tileSpec);

        else if (tileSpec.startsWith(CustomTile.PREFIX)) return CustomTile.create(this,tileSpec);

        else throw new IllegalArgumentException("Bad tile spec: " + tileSpec);

        else {

            Log.w(TAG, "Bad tile spec: " + tileSpec);

            return null;

        }

    }



    public static List<String> loadTileSpecs(Context context, String tileList) {

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

+0 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.graphics.Rect; 
import android.graphics.drawable.Animatable;

import android.graphics.drawable.RippleDrawable;

import android.util.AttributeSet;

import android.util.Log;

import android.view.View;

import android.view.ViewGroup;

import android.widget.ImageView;
@@ -135,7 +134,6 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements 
    @Override

    public void onNextAlarmChanged(AlarmManager.AlarmClockInfo nextAlarm) {

        mNextAlarm = nextAlarm;

        Log.d(TAG, "Got alarm update " + (nextAlarm != null));

        if (nextAlarm != null) {

            mAlarmStatus.setText(KeyguardStatusView.formatNextAlarm(getContext(), nextAlarm));

        }
@@ -179,10 +177,8 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements 


    private void updateListeners() {

        if (mListening) {

            Log.d(TAG, "Listening for Alarms");

            mNextAlarmController.addStateChangedCallback(this);

        } else {

            Log.d(TAG, "Not listening for Alarms");

            mNextAlarmController.removeStateChangedCallback(this);

        }

    }