From 16d3dc672e272c45c9474ff14c0e3494c5479a74 Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Thu, 7 Apr 2016 12:59:28 -0700
Subject: [PATCH] LLS: Deprecate collapseNotificationPanel [1/2]

collapseNotificationPanel is no longer applicable with the updated
UX so deprecate it and document that it will essentially be a no-op

Change-Id: I285bb48e3a9ffec8d554f880edf17e5105c94018
TICKET: CYNGNOS-2392
---
 api/cm_current.txt                                           | 2 +-
 .../java/cyanogenmod/externalviews/KeyguardExternalView.java | 5 +----
 .../externalviews/KeyguardExternalViewProviderService.java   | 5 ++++-
 system-api/cm_system-current.txt                             | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/api/cm_current.txt b/api/cm_current.txt
index b0e7678..ff84505 100644
--- a/api/cm_current.txt
+++ b/api/cm_current.txt
@@ -427,7 +427,7 @@ package cyanogenmod.externalviews {
 
   protected abstract class KeyguardExternalViewProviderService.Provider {
     ctor protected KeyguardExternalViewProviderService.Provider(android.os.Bundle);
-    method protected final void collapseNotificationPanel();
+    method protected final deprecated void collapseNotificationPanel();
     method protected android.os.Bundle getOptions();
     method protected void onAttach();
     method protected abstract void onBouncerShowing(boolean);
diff --git a/sdk/src/java/cyanogenmod/externalviews/KeyguardExternalView.java b/sdk/src/java/cyanogenmod/externalviews/KeyguardExternalView.java
index 9f4059a..44cd154 100644
--- a/sdk/src/java/cyanogenmod/externalviews/KeyguardExternalView.java
+++ b/sdk/src/java/cyanogenmod/externalviews/KeyguardExternalView.java
@@ -175,9 +175,7 @@ public class KeyguardExternalView extends View implements ViewTreeObserver.OnPre
 
         @Override
         public void collapseNotificationPanel() throws RemoteException {
-            if (mCallback != null) {
-                mCallback.collapseNotificationPanel();
-            }
+            /* collapseNotificationPanel is deprecated so do nothing */
         }
 
         @Override
@@ -476,7 +474,6 @@ public class KeyguardExternalView extends View implements ViewTreeObserver.OnPre
     public interface KeyguardExternalViewCallbacks {
         boolean requestDismiss();
         boolean requestDismissAndStartActivity(Intent intent);
-        void collapseNotificationPanel();
         void providerDied();
         void slideLockscreenIn();
     }
diff --git a/sdk/src/java/cyanogenmod/externalviews/KeyguardExternalViewProviderService.java b/sdk/src/java/cyanogenmod/externalviews/KeyguardExternalViewProviderService.java
index 4c69a0a..915adfb 100644
--- a/sdk/src/java/cyanogenmod/externalviews/KeyguardExternalViewProviderService.java
+++ b/sdk/src/java/cyanogenmod/externalviews/KeyguardExternalViewProviderService.java
@@ -595,9 +595,12 @@ public abstract class KeyguardExternalViewProviderService extends Service {
          * attention.  The user will still be able to bring the notifications back into view by
          * sliding down from the status bar.
          * Calling this method has no effect for non-interactive components.</p>
+         * @deprecated As of SDK version {@link cyanogenmod.os.Build.CM_VERSION_CODES#ELDERBERRY}
+         * this does nothing.
          */
+        @Deprecated
         protected final void collapseNotificationPanel() {
-            mImpl.collapseNotificationPanel();
+            /* do nothing */
         }
 
         /**
diff --git a/system-api/cm_system-current.txt b/system-api/cm_system-current.txt
index b0e7678..ff84505 100644
--- a/system-api/cm_system-current.txt
+++ b/system-api/cm_system-current.txt
@@ -427,7 +427,7 @@ package cyanogenmod.externalviews {
 
   protected abstract class KeyguardExternalViewProviderService.Provider {
     ctor protected KeyguardExternalViewProviderService.Provider(android.os.Bundle);
-    method protected final void collapseNotificationPanel();
+    method protected final deprecated void collapseNotificationPanel();
     method protected android.os.Bundle getOptions();
     method protected void onAttach();
     method protected abstract void onBouncerShowing(boolean);