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

Commit 554e191d authored by Matt Pape's avatar Matt Pape Committed by android-build-merger
Browse files

Merge "Migrate usage of single property lister to multi prop listener." into qt-dev 

am: 8e24abad

Change-Id: Iba8191210ba73eaa42269891bf67cb8bd0cb3c1b
parents d8a04614 8e24abad

core/java/android/view/textclassifier/TextClassificationManager.java

+5 −4
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.Context; 
import android.database.ContentObserver;

import android.os.ServiceManager;

import android.provider.DeviceConfig;

import android.provider.DeviceConfig.Properties;

import android.provider.Settings;

import android.service.textclassifier.TextClassifierService;

import android.view.textclassifier.TextClassifier.TextClassifierType;
@@ -199,7 +200,7 @@ public final class TextClassificationManager { 
                getApplicationContext().getContentResolver()

                        .unregisterContentObserver(mSettingsObserver);

                if (ConfigParser.ENABLE_DEVICE_CONFIG) {

                    DeviceConfig.removeOnPropertyChangedListener(mSettingsObserver);

                    DeviceConfig.removeOnPropertiesChangedListener(mSettingsObserver);

                }

            }

        } finally {
@@ -286,7 +287,7 @@ public final class TextClassificationManager { 
    }



    private static final class SettingsObserver extends ContentObserver

            implements DeviceConfig.OnPropertyChangedListener {

            implements DeviceConfig.OnPropertiesChangedListener {



        private final WeakReference<TextClassificationManager> mTcm;
@@ -298,7 +299,7 @@ public final class TextClassificationManager { 
                    false /* notifyForDescendants */,

                    this);

            if (ConfigParser.ENABLE_DEVICE_CONFIG) {

                DeviceConfig.addOnPropertyChangedListener(

                DeviceConfig.addOnPropertiesChangedListener(

                        DeviceConfig.NAMESPACE_TEXTCLASSIFIER,

                        ActivityThread.currentApplication().getMainExecutor(),

                        this);
@@ -311,7 +312,7 @@ public final class TextClassificationManager { 
        }



        @Override

        public void onPropertyChanged(String namespace, String name, String value) {

        public void onPropertiesChanged(Properties properties) {

            invalidateSettings();

        }

packages/ExtServices/src/android/ext/services/notification/AssistantSettings.java

+4 −4
Original line number Diff line number Diff line
@@ -102,10 +102,10 @@ final class AssistantSettings extends ContentObserver { 
    }



    private void registerDeviceConfigs() {

        DeviceConfig.addOnPropertyChangedListener(

        DeviceConfig.addOnPropertiesChangedListener(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                this::postToHandler,

                this::onDeviceConfigPropertyChanged);

                (properties) -> onDeviceConfigPropertiesChanged(properties.getNamespace()));



        // Update the fields in this class from the current state of the device config.

        updateFromDeviceConfigFlags();
@@ -116,10 +116,10 @@ final class AssistantSettings extends ContentObserver { 
    }



    @VisibleForTesting

    void onDeviceConfigPropertyChanged(String namespace, String name, String value) {

    void onDeviceConfigPropertiesChanged(String namespace) {

        if (!DeviceConfig.NAMESPACE_SYSTEMUI.equals(namespace)) {

            Log.e(LOG_TAG, "Received update from DeviceConfig for unrelated namespace: "

                    + namespace + " " + name + "=" + value);

                    + namespace);

            return;

        }

packages/ExtServices/tests/src/android/ext/services/notification/AssistantSettingsTest.java

+11 −44
Original line number Diff line number Diff line
@@ -96,10 +96,7 @@ public class AssistantSettingsTest { 
                SystemUiDeviceConfigFlags.NAS_GENERATE_REPLIES,

                "false",

                false /* makeDefault */));

        mAssistantSettings.onDeviceConfigPropertyChanged(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_GENERATE_REPLIES,

                "false");

        mAssistantSettings.onDeviceConfigPropertiesChanged(DeviceConfig.NAMESPACE_SYSTEMUI);



        assertFalse(mAssistantSettings.mGenerateReplies);

    }
@@ -111,10 +108,7 @@ public class AssistantSettingsTest { 
                SystemUiDeviceConfigFlags.NAS_GENERATE_REPLIES,

                "true",

                false /* makeDefault */));

        mAssistantSettings.onDeviceConfigPropertyChanged(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_GENERATE_REPLIES,

                "true");

        mAssistantSettings.onDeviceConfigPropertiesChanged(DeviceConfig.NAMESPACE_SYSTEMUI);



        assertTrue(mAssistantSettings.mGenerateReplies);

    }
@@ -126,10 +120,7 @@ public class AssistantSettingsTest { 
                SystemUiDeviceConfigFlags.NAS_GENERATE_REPLIES,

                "false",

                false /* makeDefault */));

        mAssistantSettings.onDeviceConfigPropertyChanged(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_GENERATE_REPLIES,

                "false");

        mAssistantSettings.onDeviceConfigPropertiesChanged(DeviceConfig.NAMESPACE_SYSTEMUI);



        assertFalse(mAssistantSettings.mGenerateReplies);
@@ -138,10 +129,7 @@ public class AssistantSettingsTest { 
                SystemUiDeviceConfigFlags.NAS_GENERATE_REPLIES,

                null,

                false /* makeDefault */));

        mAssistantSettings.onDeviceConfigPropertyChanged(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_GENERATE_REPLIES,

                null);

        mAssistantSettings.onDeviceConfigPropertiesChanged(DeviceConfig.NAMESPACE_SYSTEMUI);



        // Go back to the default value.

        assertTrue(mAssistantSettings.mGenerateReplies);
@@ -154,10 +142,7 @@ public class AssistantSettingsTest { 
                SystemUiDeviceConfigFlags.NAS_GENERATE_ACTIONS,

                "false",

                false /* makeDefault */));

        mAssistantSettings.onDeviceConfigPropertyChanged(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_GENERATE_ACTIONS,

                "false");

        mAssistantSettings.onDeviceConfigPropertiesChanged(DeviceConfig.NAMESPACE_SYSTEMUI);



        assertFalse(mAssistantSettings.mGenerateActions);

    }
@@ -169,10 +154,7 @@ public class AssistantSettingsTest { 
                SystemUiDeviceConfigFlags.NAS_GENERATE_ACTIONS,

                "true",

                false /* makeDefault */));

        mAssistantSettings.onDeviceConfigPropertyChanged(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_GENERATE_ACTIONS,

                "true");

        mAssistantSettings.onDeviceConfigPropertiesChanged(DeviceConfig.NAMESPACE_SYSTEMUI);



        assertTrue(mAssistantSettings.mGenerateActions);

    }
@@ -184,10 +166,7 @@ public class AssistantSettingsTest { 
                SystemUiDeviceConfigFlags.NAS_GENERATE_ACTIONS,

                "false",

                false /* makeDefault */));

        mAssistantSettings.onDeviceConfigPropertyChanged(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_GENERATE_ACTIONS,

                "false");

        mAssistantSettings.onDeviceConfigPropertiesChanged(DeviceConfig.NAMESPACE_SYSTEMUI);



        assertFalse(mAssistantSettings.mGenerateActions);
@@ -196,10 +175,7 @@ public class AssistantSettingsTest { 
                SystemUiDeviceConfigFlags.NAS_GENERATE_ACTIONS,

                null,

                false /* makeDefault */));

        mAssistantSettings.onDeviceConfigPropertyChanged(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_GENERATE_ACTIONS,

                null);

        mAssistantSettings.onDeviceConfigPropertiesChanged(DeviceConfig.NAMESPACE_SYSTEMUI);



        // Go back to the default value.

        assertTrue(mAssistantSettings.mGenerateActions);
@@ -212,10 +188,7 @@ public class AssistantSettingsTest { 
                SystemUiDeviceConfigFlags.NAS_MAX_MESSAGES_TO_EXTRACT,

                "10",

                false /* makeDefault */));

        mAssistantSettings.onDeviceConfigPropertyChanged(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_MAX_MESSAGES_TO_EXTRACT,

                "10");

        mAssistantSettings.onDeviceConfigPropertiesChanged(DeviceConfig.NAMESPACE_SYSTEMUI);



        assertEquals(10, mAssistantSettings.mMaxMessagesToExtract);

    }
@@ -227,20 +200,14 @@ public class AssistantSettingsTest { 
                SystemUiDeviceConfigFlags.NAS_MAX_SUGGESTIONS,

                "5",

                false /* makeDefault */));

        mAssistantSettings.onDeviceConfigPropertyChanged(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_MAX_SUGGESTIONS,

                "5");

        mAssistantSettings.onDeviceConfigPropertiesChanged(DeviceConfig.NAMESPACE_SYSTEMUI);



        assertEquals(5, mAssistantSettings.mMaxSuggestions);

    }



    @Test

    public void testMaxSuggestionsEmpty() {

        mAssistantSettings.onDeviceConfigPropertyChanged(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.NAS_MAX_SUGGESTIONS,

                "");

        mAssistantSettings.onDeviceConfigPropertiesChanged(DeviceConfig.NAMESPACE_SYSTEMUI);



        assertEquals(DEFAULT_MAX_SUGGESTIONS, mAssistantSettings.mMaxSuggestions);

    }

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

+13 −9
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.os.Handler; 
import android.os.Trace;

import android.os.UserHandle;

import android.provider.DeviceConfig;

import android.provider.DeviceConfig.Properties;

import android.util.Log;

import android.view.View;

import android.widget.ImageView;
@@ -118,17 +119,20 @@ public class NotificationMediaManager implements Dumpable { 
    private ImageView mBackdropBack;



    private boolean mShowCompactMediaSeekbar;

    private final DeviceConfig.OnPropertyChangedListener mPropertyChangedListener =

            new DeviceConfig.OnPropertyChangedListener() {

    private final DeviceConfig.OnPropertiesChangedListener mPropertiesChangedListener =

            new DeviceConfig.OnPropertiesChangedListener() {

        @Override

        public void onPropertyChanged(String namespace, String name, String value) {

        public void onPropertiesChanged(Properties properties) {

            for (String name : properties.getKeyset()) {

                if (SystemUiDeviceConfigFlags.COMPACT_MEDIA_SEEKBAR_ENABLED.equals(name)) {

                    String value = properties.getString(name, null);

                    if (DEBUG_MEDIA) {

                        Log.v(TAG, "DEBUG_MEDIA: compact media seekbar flag updated: " + value);

                    }

                    mShowCompactMediaSeekbar = "true".equals(value);

                }

            }

        }

    };



    private final MediaController.Callback mMediaListener = new MediaController.Callback() {
@@ -189,9 +193,9 @@ public class NotificationMediaManager implements Dumpable { 
                DeviceConfig.getProperty(DeviceConfig.NAMESPACE_SYSTEMUI,

                    SystemUiDeviceConfigFlags.COMPACT_MEDIA_SEEKBAR_ENABLED));



        DeviceConfig.addOnPropertyChangedListener(DeviceConfig.NAMESPACE_SYSTEMUI,

        DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_SYSTEMUI,

                mContext.getMainExecutor(),

                mPropertyChangedListener);

                mPropertiesChangedListener);

    }



    public void setUpWithPresenter(NotificationPresenter presenter) {

packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyConstants.java

+4 −4
Original line number Diff line number Diff line
@@ -93,10 +93,10 @@ public final class SmartReplyConstants { 
    }



    private void registerDeviceConfigListener() {

        DeviceConfig.addOnPropertyChangedListener(

        DeviceConfig.addOnPropertiesChangedListener(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                this::postToHandler,

                this::onDeviceConfigPropertyChanged);

                (properties) -> onDeviceConfigPropertiesChanged(properties.getNamespace()));

    }



    private void postToHandler(Runnable r) {
@@ -104,10 +104,10 @@ public final class SmartReplyConstants { 
    }



    @VisibleForTesting

    void onDeviceConfigPropertyChanged(String namespace, String name, String value) {

    void onDeviceConfigPropertiesChanged(String namespace) {

        if (!DeviceConfig.NAMESPACE_SYSTEMUI.equals(namespace)) {

            Log.e(TAG, "Received update from DeviceConfig for unrelated namespace: "

                    + namespace + " " + name + "=" + value);

                    + namespace);

            return;

        }