Revert "Revert "Remove notification styles from AppCompat""
This reverts commit 4f8b18892c84976325ab05cbedd03c7738afebf0.
Change-Id: I52457167603467a4dbfa54c6f87bf5db5932d72a
BUG: 28983951
diff --git a/v7/appcompat/res-public/values/public_styles.xml b/v7/appcompat/res-public/values/public_styles.xml
index a9956ad..38efc46 100644
--- a/v7/appcompat/res-public/values/public_styles.xml
+++ b/v7/appcompat/res-public/values/public_styles.xml
@@ -36,12 +36,6 @@
<public type="style" name="TextAppearance.AppCompat.Medium"/>
<public type="style" name="TextAppearance.AppCompat.Medium.Inverse"/>
<public type="style" name="TextAppearance.AppCompat.Menu"/>
- <public type="style" name="TextAppearance.AppCompat.Notification"/>
- <public type="style" name="TextAppearance.AppCompat.Notification.Info"/>
- <public type="style" name="TextAppearance.AppCompat.Notification.Line2"/>
- <public type="style" name="TextAppearance.AppCompat.Notification.Media"/>
- <public type="style" name="TextAppearance.AppCompat.Notification.Time"/>
- <public type="style" name="TextAppearance.AppCompat.Notification.Title"/>
<public type="style" name="TextAppearance.AppCompat.SearchResult.Subtitle"/>
<public type="style" name="TextAppearance.AppCompat.SearchResult.Title"/>
<public type="style" name="TextAppearance.AppCompat.Small"/>
diff --git a/v7/appcompat/res/values-v21/styles.xml b/v7/appcompat/res/values-v21/styles.xml
deleted file mode 100644
index 48d0366..0000000
--- a/v7/appcompat/res/values-v21/styles.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
- ~ Copyright (C) 2016 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
- -->
-
-<resources>
-
- <!-- Use platform styles -->
- <style name="TextAppearance.AppCompat.Notification.Info"
- parent="@android:style/TextAppearance.Material.Notification.Info"/>
-
- <style name="TextAppearance.AppCompat.Notification.Time"
- parent="@android:style/TextAppearance.Material.Notification.Time"/>
-
- <style name="TextAppearance.AppCompat.Notification.Title"
- parent="@android:style/TextAppearance.Material.Notification.Title"/>
-
- <style name="TextAppearance.AppCompat.Notification"
- parent="@android:style/TextAppearance.Material.Notification"/>
-
- <style name="TextAppearance.AppCompat.Notification.Media" >
- <item name="android:textColor">@color/secondary_text_default_material_dark</item>
- </style>
-
- <style name="TextAppearance.AppCompat.Notification.Title.Media" >
- <item name="android:textColor">@color/primary_text_default_material_dark</item>
- </style>
-
- <style name="TextAppearance.AppCompat.Notification.Info.Media">
- <item name="android:textColor">@color/secondary_text_default_material_dark</item>
- </style>
-
- <style name="TextAppearance.AppCompat.Notification.Time.Media">
- <item name="android:textColor">@color/secondary_text_default_material_dark</item>
- </style>
-</resources>
\ No newline at end of file
diff --git a/v7/appcompat/res/values-v24/styles.xml b/v7/appcompat/res/values-v24/styles.xml
deleted file mode 100644
index 4cd8461..0000000
--- a/v7/appcompat/res/values-v24/styles.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- ~ Copyright (C) 2016 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
- -->
-
-<resources>
- <!-- Use platform styles, Media is dark again -->
- <style name="TextAppearance.AppCompat.Notification.Media" />
-
- <style name="TextAppearance.AppCompat.Notification.Info.Media" />
-
- <style name="TextAppearance.AppCompat.Notification.Time.Media" />
-
- <style name="TextAppearance.AppCompat.Notification.Title.Media" />
-</resources>
diff --git a/v7/appcompat/res/values/styles.xml b/v7/appcompat/res/values/styles.xml
index ce74a89..247ca4c 100644
--- a/v7/appcompat/res/values/styles.xml
+++ b/v7/appcompat/res/values/styles.xml
@@ -329,25 +329,4 @@
<style name="TextAppearance.AppCompat.Light.Widget.PopupMenu.Large" parent="TextAppearance.AppCompat.Widget.PopupMenu.Large" />
<style name="TextAppearance.AppCompat.Light.Widget.PopupMenu.Small" parent="TextAppearance.AppCompat.Widget.PopupMenu.Small" />
- <!-- These styles have moved to support-compat and should be removed when
- android.support.v7.app.NotificationCompat is removed -->
- <style name="TextAppearance.AppCompat.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent" />
- <style name="TextAppearance.AppCompat.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title" />
- <style name="TextAppearance.AppCompat.Notification.Info">
- <item name="android:textSize">12sp</item>
- <item name="android:textColor">?android:attr/textColorSecondary</item>
- </style>
- <style name="TextAppearance.AppCompat.Notification.Time">
- <item name="android:textSize">12sp</item>
- <item name="android:textColor">?android:attr/textColorSecondary</item>
- </style>
- <style name="TextAppearance.AppCompat.Notification.Line2" parent="TextAppearance.AppCompat.Notification.Info" />
-
- <!-- These styles have moved to media-compat and should be removed when
- android.support.v7.app.NotificationCompat is removed -->
- <style name="TextAppearance.AppCompat.Notification.Title.Media" />
- <style name="TextAppearance.AppCompat.Notification.Media" />
- <style name="TextAppearance.AppCompat.Notification.Info.Media" />
- <style name="TextAppearance.AppCompat.Notification.Time.Media" />
- <style name="TextAppearance.AppCompat.Notification.Line2.Media" parent="TextAppearance.AppCompat.Notification.Info.Media" />
</resources>
diff --git a/v7/appcompat/src/android/support/v7/app/NotificationCompat.java b/v7/appcompat/src/android/support/v7/app/NotificationCompat.java
index 5d74ad1..e008862 100644
--- a/v7/appcompat/src/android/support/v7/app/NotificationCompat.java
+++ b/v7/appcompat/src/android/support/v7/app/NotificationCompat.java
@@ -251,8 +251,8 @@
* </pre>
*
* <p>If you are using this style, consider using the corresponding styles like
- * {@link android.support.v7.appcompat.R.style#TextAppearance_AppCompat_Notification} or
- * {@link android.support.v7.appcompat.R.style#TextAppearance_AppCompat_Notification_Title} in
+ * {@link android.support.compat.R.style#TextAppearance_Compat_Notification} or
+ * {@link android.support.compat.R.style#TextAppearance_Compat_Notification_Title} in
* your custom views in order to get the correct styling on each platform version.
*
* @deprecated Use {@link android.support.v4.app.NotificationCompat.DecoratedCustomViewStyle}
@@ -299,9 +299,9 @@
* </pre>
*
* <p>If you are using this style, consider using the corresponding styles like
- * {@link android.support.v7.appcompat.R.style#TextAppearance_AppCompat_Notification_Media} or
+ * {@link android.support.mediacompat.R.style#TextAppearance_Compat_Notification_Media} or
* {@link
- * android.support.v7.appcompat.R.style#TextAppearance_AppCompat_Notification_Title_Media} in
+ * android.support.mediacompat.R.style#TextAppearance_Compat_Notification_Title_Media} in
* your custom views in order to get the correct styling on each platform version.
*
* @see android.support.v4.app.NotificationCompat.DecoratedCustomViewStyle