Merge "Remove deprecated v7 NotificationCompat" into oc-mr1-dev

2 files changed, 0 insertions, 60 deletions

diff --git a/v7/appcompat/api/current.txt b/v7/appcompat/api/current.txt
index e514695d5e9..93d0186ed95 100644
--- a/v7/appcompat/api/current.txt
+++ b/v7/appcompat/api/current.txt
@@ -303,14 +303,6 @@ package android.support.v7.app {
     ctor public AppCompatDialogFragment();
   }
 
-  public deprecated class NotificationCompat extends android.support.v4.app.NotificationCompat {
-    ctor public deprecated NotificationCompat();
-  }
-
-  public static deprecated class NotificationCompat.Builder extends android.support.v4.app.NotificationCompat.Builder {
-    ctor public deprecated NotificationCompat.Builder(android.content.Context);
-  }
-
 }
 
 package android.support.v7.content.res {
diff --git a/v7/appcompat/src/android/support/v7/app/NotificationCompat.java b/v7/appcompat/src/android/support/v7/app/NotificationCompat.java
deleted file mode 100644
index 6b2b8591542..00000000000
--- a/v7/appcompat/src/android/support/v7/app/NotificationCompat.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.support.v7.app;
-
-import android.content.Context;
-
-/**
- * An extension of {@link android.support.v4.app.NotificationCompat} which adds additional styles.
- * @deprecated Use {@link android.support.v4.app.NotificationCompat}.
- */
-@Deprecated
-public class NotificationCompat extends android.support.v4.app.NotificationCompat {
-
-    /**
-     * @deprecated Use the static classes in {@link android.support.v4.app.NotificationCompat}.
-     */
-    @Deprecated
-    public NotificationCompat() {
-    }
-
-    /**
-     * @deprecated All {@link android.support.v4.app.NotificationCompat.Style styles} can now be
-     * used with {@link android.support.v4.app.NotificationCompat.Builder}.
-     */
-    @Deprecated
-    public static class Builder extends android.support.v4.app.NotificationCompat.Builder {
-
-        /**
-         * @inheritDoc
-         * @deprecated Use {@link android.support.v4.app.NotificationCompat.Builder
-         * #NotificationCompat.Builder(Context, String)}
-         */
-        @Deprecated
-        public Builder(Context context) {
-            super(context);
-        }
-    }
-}