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

Commit 0a8e142d authored by nuclearmistake's avatar nuclearmistake
Browse files

Fix android-6.0.1_r3 merge derp in QSTileHost 

ps2: fix alphabetization of imports and clarify commit message

Change-Id: I1dd7820b7c0e271cbba15acf22bbf950d5170c9a
parent 10c07f77

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

+4 −7
Original line number Diff line number Diff line
@@ -16,12 +16,9 @@ 


package com.android.systemui.statusbar.phone;



<<<<<<< HEAD

import android.app.ActivityManager;

import android.content.ComponentName;

=======

import android.app.PendingIntent;

>>>>>>> 888ef59df9262e1308d383fb56b8d077fb4170d7

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.res.Resources;
@@ -186,16 +183,16 @@ public class QSTileHost implements QSTile.Host, Tunable { 
    }



    @Override

<<<<<<< HEAD

    public void removeCustomTile(StatusBarPanelCustomTile customTile) {

        if (mCustomTileListenerService != null) {

            mCustomTileListenerService.removeCustomTile(customTile.getPackage(),

                    customTile.getTag(), customTile.getId());

        }

=======

    }



    @Override

    public void startActivityDismissingKeyguard(PendingIntent intent) {

        mStatusBar.postStartActivityDismissingKeyguard(intent);

>>>>>>> 888ef59df9262e1308d383fb56b8d077fb4170d7

    }



    @Override