diff options
| author | nuclearmistake <nuclearmistake@gmail.com> | 2015-12-07 23:27:20 -0500 |
|---|---|---|
| committer | nuclearmistake <nuclearmistake@gmail.com> | 2015-12-07 23:31:51 -0500 |
| commit | 0a8e142de7c27a394b2480fdb1512f1a5d9f8742 (patch) | |
| tree | 6be38871ffe8d06e7da4dbc8efb3ab780fd43475 /packages/SystemUI/src/com | |
| parent | 10c07f778a611d8723619f67e5709cbd9e502a07 (diff) | |
| download | frameworks_base-0a8e142de7c27a394b2480fdb1512f1a5d9f8742.zip frameworks_base-0a8e142de7c27a394b2480fdb1512f1a5d9f8742.tar.gz frameworks_base-0a8e142de7c27a394b2480fdb1512f1a5d9f8742.tar.bz2 | |
Fix android-6.0.1_r3 merge derp in QSTileHost
ps2: fix alphabetization of imports and clarify commit message
Change-Id: I1dd7820b7c0e271cbba15acf22bbf950d5170c9a
Diffstat (limited to 'packages/SystemUI/src/com')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java index b6bb995..dbee4ba 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java @@ -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 |