From 8d0de3da05fc3931e71bf741282522f9947fc393 Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Sat, 6 Feb 2021 00:43:23 +0800
Subject: [PATCH] Add collapsing toolbar to Notification history page

On Android S, collapsing toolbar will be shown in each subsetting
pages. Notification history page doesn't have collapsing toolbar since
it's not a subsetting page. We changed the base activity for Notificatio
history page to eable the feature.

Bug: 178678690
Test: visual verified
1) Settings -> Notifications -> Notification history
2) Check if the collapsig toolbar is existig in this page

Change-Id: I51d66b64dc479bbe14274301c75da67600116772
---
 AndroidManifest.xml                                           | 1 +
 .../notification/history/NotificationHistoryActivity.java     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ee11802232f..1d1450e69b9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1272,6 +1272,7 @@
         <activity
             android:name=".notification.history.NotificationHistoryActivity"
             android:exported="true"
+            android:theme="@style/Theme.SubSettings"
             android:label="@string/notification_history_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_HISTORY" />
diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index d5745ac182d..4958f1bfe6d 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -21,7 +21,6 @@ import static android.provider.Settings.Secure.NOTIFICATION_HISTORY_ENABLED;
 import static androidx.core.view.accessibility.AccessibilityEventCompat.TYPE_VIEW_ACCESSIBILITY_FOCUSED;
 
 import android.app.ActionBar;
-import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.INotificationManager;
 import android.content.ComponentName;
@@ -55,6 +54,7 @@ import com.android.internal.logging.UiEventLogger;
 import com.android.internal.logging.UiEventLoggerImpl;
 import com.android.settings.R;
 import com.android.settings.notification.NotificationBackend;
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
 import com.android.settingslib.utils.ThreadUtils;
 import com.android.settingslib.widget.MainSwitchBar;
 import com.android.settingslib.widget.OnMainSwitchChangeListener;
@@ -65,7 +65,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-public class NotificationHistoryActivity extends Activity {
+public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity {
 
     private static String TAG = "NotifHistory";