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

Commit dca77914 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "glwallpaper_cleanup" 

* changes:
  Remove AOD_IMAGEWALLPAPER_ENABLED from feature flags
  Remove DrawableEngine and related logics
parents 7bd96b9d e3b06647

core/java/android/util/FeatureFlagUtils.java

+0 −18
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ import android.provider.Settings; 
import android.text.TextUtils;



import java.util.HashMap;

import java.util.HashSet;

import java.util.Map;

import java.util.Set;



/**

 * Util class to get feature flag information.
@@ -40,11 +38,9 @@ public class FeatureFlagUtils { 
    public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";

    public static final String SAFETY_HUB = "settings_safety_hub";

    public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press";

    public static final String AOD_IMAGEWALLPAPER_ENABLED = "settings_aod_imagewallpaper_enabled";

    public static final String GLOBAL_ACTIONS_GRID_ENABLED = "settings_global_actions_grid_enabled";



    private static final Map<String, String> DEFAULT_FLAGS;

    private static final Set<String> OBSERVABLE_FLAGS;



    static {

        DEFAULT_FLAGS = new HashMap<>();
@@ -60,11 +56,7 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false");

        DEFAULT_FLAGS.put(SAFETY_HUB, "false");

        DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false");

        DEFAULT_FLAGS.put(AOD_IMAGEWALLPAPER_ENABLED, "false");

        DEFAULT_FLAGS.put(GLOBAL_ACTIONS_GRID_ENABLED, "false");



        OBSERVABLE_FLAGS = new HashSet<>();

        OBSERVABLE_FLAGS.add(AOD_IMAGEWALLPAPER_ENABLED);

    }



    /**
@@ -101,16 +93,6 @@ public class FeatureFlagUtils { 
     */

    public static void setEnabled(Context context, String feature, boolean enabled) {

        SystemProperties.set(FFLAG_OVERRIDE_PREFIX + feature, enabled ? "true" : "false");



        // Also update Settings.Global if needed so that we can observe it via observer.

        if (OBSERVABLE_FLAGS.contains(feature)) {

            setObservableFlag(context, feature, enabled);

        }

    }



    private static void setObservableFlag(Context context, String feature, boolean enabled) {

        Settings.Global.putString(

                context.getContentResolver(), feature, enabled ? "true" : "false");

    }



    /**

packages/SystemUI/res/layout/super_status_bar.xml

+0 −8
Original line number Diff line number Diff line
@@ -43,14 +43,6 @@ 
                   android:visibility="invisible" />

    </com.android.systemui.statusbar.BackDropView>



    <com.android.systemui.wallpaper.AodMaskView

        android:id="@+id/aod_mask"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"

        android:visibility="invisible"

        sysui:ignoreRightInset="true" />



    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_behind"

        android:layout_width="match_parent"

packages/SystemUI/res/values/ids.xml

+0 −5
Original line number Diff line number Diff line
@@ -111,11 +111,6 @@ 
    <!-- Optional cancel button on Keyguard -->

    <item type="id" name="cancel_button"/>



    <!-- AodMaskView transition tag -->

    <item type="id" name="aod_mask_transition_progress_tag" />

    <item type="id" name="aod_mask_transition_progress_end_tag" />

    <item type="id" name="aod_mask_transition_progress_start_tag" />



    <!-- For saving DynamicAnimation physics animations as view tags. -->

    <item type="id" name="translation_x_dynamicanimation_tag"/>

    <item type="id" name="translation_y_dynamicanimation_tag"/>

packages/SystemUI/src/com/android/systemui/ImageWallpaper.java

+1 −526

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java

+0 −8

File changed.

Preview size limit exceeded, changes collapsed.