Merge "Make FeatureFlags a singleton"

package com.android.systemui.statusbar;

package com.android.systemui.statusbar;

import static com.android.systemui.Dependency.BG_HANDLER_NAME;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.os.Handler;

import android.os.Handler;

import android.os.HandlerExecutor;

import android.os.HandlerExecutor;

import android.os.Looper;

import android.provider.DeviceConfig;

import android.provider.DeviceConfig;

import android.util.ArrayMap;

import android.util.ArrayMap;

import java.util.Map;

import java.util.Map;

import javax.inject.Inject;

import javax.inject.Inject;

import javax.inject.Named;

import javax.inject.Singleton;

/**

/**

 * Class to manage simple DeviceConfig-based feature flags.

 * Class to manage simple DeviceConfig-based feature flags.

 *  $ adb shell device_config put systemui <key> <true|false>

 *  $ adb shell device_config put systemui <key> <true|false>

*  }

*  }

 *

 *

 * You will probably need to @{$ adb reboot} afterwards in order for the code to pick up the change.

 * You will probably need to restart systemui for the changes to be picked up:

 *

 * {@code

 *  $ adb shell am crash com.android.systemui

 * }

 */

 */

@Singleton

public class FeatureFlags {

public class FeatureFlags {

    private final Map<String, Boolean> mCachedDeviceConfigFlags = new ArrayMap<>();

    private final Map<String, Boolean> mCachedDeviceConfigFlags = new ArrayMap<>();

    @Inject

    @Inject

    public FeatureFlags() {

    public FeatureFlags(

            @Named(BG_HANDLER_NAME) Handler bgHandler) {

        DeviceConfig.addOnPropertiesChangedListener(

        DeviceConfig.addOnPropertiesChangedListener(

                "systemui",

                "systemui",

                new HandlerExecutor(new Handler(Looper.getMainLooper())),

                new HandlerExecutor(bgHandler),

                this::onPropertiesChanged);

                this::onPropertiesChanged);

    }

    }