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

Commit 52ebeb70 authored by Mill Chen's avatar Mill Chen Committed by Automerger Merge Worker
Browse files

Merge "Add collapsing toolbar to Notification history page" into sc-dev am: 8308928a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13495592

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17bada041be71215175d49abc518e89844ce3b28
parents 3a678ef6 8308928a

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -1273,6 +1273,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";