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

Commit cfcb4eef authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add widget flag in CoreSettingObserver" into udc-qpr-dev am: 9dc442bf 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24360625



Change-Id: Ib3ca3820f43e34c2c1fb24bd48c7e5fb10749ee5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18cda114 9dc442bf

core/java/android/widget/RemoteViews.java

+1 −1
Original line number Diff line number Diff line
@@ -4820,7 +4820,7 @@ public class RemoteViews implements Parcelable, Filter { 
    public static boolean isAdapterConversionEnabled() {

        return AppGlobals.getIntCoreSetting(

                SystemUiDeviceConfigFlags.REMOTEVIEWS_ADAPTER_CONVERSION,

                SystemUiDeviceConfigFlags.REMOTEVIEWS_ADAPTER_CONVERSION_DEFAULT ? 1 : 0) == 1;

                SystemUiDeviceConfigFlags.REMOTEVIEWS_ADAPTER_CONVERSION_DEFAULT ? 1 : 0) != 0;

    }



    /**

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+8 −1
Original line number Diff line number Diff line
@@ -534,7 +534,14 @@ public final class SystemUiDeviceConfigFlags { 
    /**

     * (boolean) Whether to enable the adapter conversion in RemoteViews

     */

    public static final String REMOTEVIEWS_ADAPTER_CONVERSION = "remoteviews_adapter_conversion";

    public static final String REMOTEVIEWS_ADAPTER_CONVERSION =

            "CursorControlFeature__remoteviews_adapter_conversion";



    /**

     * The key name used in app core settings for {@link #REMOTEVIEWS_ADAPTER_CONVERSION}

     */

    public static final String KEY_REMOTEVIEWS_ADAPTER_CONVERSION =

            "systemui__remoteviews_adapter_conversion";



    /**

     * Default value for whether the adapter conversion is enabled or not. This is set for

services/core/java/com/android/server/am/CoreSettingsObserver.java

+7 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.widget.WidgetFlags; 


import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;



import java.util.ArrayList;

import java.util.HashMap;
@@ -160,6 +161,12 @@ final class CoreSettingsObserver extends ContentObserver { 
                WidgetFlags.KEY_MAGNIFIER_ASPECT_RATIO, float.class,

                WidgetFlags.MAGNIFIER_ASPECT_RATIO_DEFAULT));



        sDeviceConfigEntries.add(new DeviceConfigEntry<Boolean>(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                SystemUiDeviceConfigFlags.REMOTEVIEWS_ADAPTER_CONVERSION,

                SystemUiDeviceConfigFlags.KEY_REMOTEVIEWS_ADAPTER_CONVERSION, boolean.class,

                SystemUiDeviceConfigFlags.REMOTEVIEWS_ADAPTER_CONVERSION_DEFAULT));



        sDeviceConfigEntries.add(new DeviceConfigEntry<Boolean>(

                TextFlags.NAMESPACE, TextFlags.ENABLE_NEW_CONTEXT_MENU,

                TextFlags.KEY_ENABLE_NEW_CONTEXT_MENU, boolean.class,