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

Commit 8693114f authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b204127880_pipeline_backport_1" into sc-v2-dev 

* changes:
  New pipeline: Fix notification re-inflation on dark mode change.
  Make FeatureFlagManager Dumpable
  New Pipeline: Implement lifetime extension for guts
  Add ListenerSet and use in places which currently copy-on-iterate.
  Populate buckets to ensure correct corner rounds on notifications
  Enabled x button for clearable silent Notif[s]
  New pipeline: Section manager is old pipeline, so don't call it for the new.
  Remove dismiss-rtl setters because dismiss is bidirectional
  New pipeline: remove non-silent section headers
parents 7f1538b2 ddfd237d

packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/NotificationMenuRowPlugin.java

+0 −6
Original line number Diff line number Diff line
@@ -182,12 +182,6 @@ public interface NotificationMenuRowPlugin extends Plugin { 
     */

    public boolean canBeDismissed();



    /**

     * Informs the menu whether dismiss gestures are left-to-right or right-to-left.

     */

    default void setDismissRtl(boolean dismissRtl) {

    }



    /**

     * Determines whether the menu should remain open given its current state, or snap closed.

     * @return true if the menu should remain open, false otherwise.

packages/SystemUI/src-debug/com/android/systemui/flags/FeatureFlagManager.java

+23 −2
Original line number Diff line number Diff line
@@ -23,11 +23,18 @@ import android.content.IntentFilter; 
import android.os.Bundle;

import android.util.Log;



import androidx.annotation.NonNull;



import com.android.systemui.Dumpable;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dump.DumpManager;



import org.json.JSONException;

import org.json.JSONObject;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.Map;
@@ -43,7 +50,7 @@ import javax.inject.Inject; 
 * To restore a flag back to its default, leave the `--ez value <0|1>` off of the command.

 */

@SysUISingleton

public class FeatureFlagManager implements FlagReader, FlagWriter {

public class FeatureFlagManager implements FlagReader, FlagWriter, Dumpable {

    private static final String TAG = "SysUIFlags";



    private static final String SYSPROP_PREFIX = "persist.systemui.flag_";
@@ -58,11 +65,13 @@ public class FeatureFlagManager implements FlagReader, FlagWriter { 
    private final Map<Integer, Boolean> mBooleanFlagCache = new HashMap<>();



    @Inject

    public FeatureFlagManager(SystemPropertiesHelper systemPropertiesHelper, Context context) {

    public FeatureFlagManager(SystemPropertiesHelper systemPropertiesHelper, Context context,

            DumpManager dumpManager) {

        mSystemPropertiesHelper = systemPropertiesHelper;



        IntentFilter filter = new IntentFilter(ACTION_SET_FLAG);

        context.registerReceiver(mReceiver, filter, FLAGS_PERMISSION, null);

        dumpManager.registerDumpable(TAG, this);

    }



    /** Return a {@link BooleanFlag}'s value. */
@@ -186,4 +195,16 @@ public class FeatureFlagManager implements FlagReader, FlagWriter { 
            }

        }

    };



    @Override

    public void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter pw, @NonNull String[] args) {

        ArrayList<String> flagStrings = new ArrayList<>(mBooleanFlagCache.size());

        for (Map.Entry<Integer, Boolean> entry : mBooleanFlagCache.entrySet()) {

            flagStrings.add("  sysui_flag_" + entry.getKey() + ": " + entry.getValue());

        }

        flagStrings.sort(String.CASE_INSENSITIVE_ORDER);

        for (String flagString : flagStrings) {

            pw.println(flagString);

        }

    }

}

packages/SystemUI/src/com/android/systemui/flags/FeatureFlagManager.java

+27 −2
Original line number Diff line number Diff line
@@ -16,23 +16,48 @@ 


package com.android.systemui.flags;



import android.util.SparseBooleanArray;



import androidx.annotation.NonNull;



import com.android.systemui.Dumpable;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dump.DumpManager;



import java.io.FileDescriptor;

import java.io.PrintWriter;



import javax.inject.Inject;



/**

 * Default implementation of the a Flag manager that returns default values for release builds

 *

 * There's a version of this file in src-debug which allows overriding, and has documentation about

 * how to set flags.

 */

@SysUISingleton

public class FeatureFlagManager implements FlagReader, FlagWriter {

public class FeatureFlagManager implements FlagReader, FlagWriter, Dumpable {

    SparseBooleanArray mAccessedFlags = new SparseBooleanArray();

    @Inject

    public FeatureFlagManager() {}

    public FeatureFlagManager(DumpManager dumpManager) {

        dumpManager.registerDumpable("SysUIFlags", this);

    }

    public boolean isEnabled(String key, boolean defaultValue) {

        return defaultValue;

    }

    public boolean isEnabled(int key, boolean defaultValue) {

        mAccessedFlags.append(key, defaultValue);

        return defaultValue;

    }

    public void setEnabled(String key, boolean value) {}

    public void setEnabled(int key, boolean value) {}



    @Override

    public void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter pw, @NonNull String[] args) {

        int size = mAccessedFlags.size();

        for (int i = 0; i < size; i++) {

            pw.println("  sysui_flag_" + mAccessedFlags.keyAt(i)

                    + ": " + mAccessedFlags.valueAt(i));

        }

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ import static android.app.Notification.VISIBILITY_SECRET; 
import static android.app.admin.DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED;



import static com.android.systemui.DejankUtils.whitelistIpcs;

import static com.android.systemui.statusbar.notification.stack.NotificationSectionsManagerKt.BUCKET_MEDIA_CONTROLS;

import static com.android.systemui.statusbar.notification.stack.NotificationSectionsManagerKt.BUCKET_SILENT;

import static com.android.systemui.statusbar.notification.stack.NotificationPriorityBucketKt.BUCKET_MEDIA_CONTROLS;

import static com.android.systemui.statusbar.notification.stack.NotificationPriorityBucketKt.BUCKET_SILENT;



import android.app.ActivityManager;

import android.app.KeyguardManager;

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListEntry.java

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public abstract class ListEntry { 
    private final ListAttachState mPreviousAttachState = ListAttachState.create();

    private final ListAttachState mAttachState = ListAttachState.create();



    ListEntry(String key, long creationTime) {

    protected ListEntry(String key, long creationTime) {

        mKey = key;

        mCreationTime = creationTime;

    }