Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d0de3da authored by Mill Chen's avatar Mill Chen
Browse files

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
parent e74e93b3

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />

src/com/android/settings/notification/history/NotificationHistoryActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -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";