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

Commit aa33d5af authored by Marzia Favaro's avatar Marzia Favaro Committed by Android (Google) Code Review
Browse files

Merge "Adjust conditions to hold onto a task's dim" into main

parents 5385fc44 eae640ab

core/java/android/window/flags/windowing_frontend.aconfig

+11 −0
Original line number Diff line number Diff line
@@ -153,3 +153,14 @@ flag { 
      purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "get_dimmer_on_closing"

  namespace: "windowing_frontend"

  description: "Change check for when to ignore a closing task's dim"

  bug: "329233513"

  is_fixed_read_only: true

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}
 
 No newline at end of file

services/core/java/com/android/server/wm/Task.java

+3 −1
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ import com.android.server.Watchdog; 
import com.android.server.am.ActivityManagerService;

import com.android.server.am.AppTimeTracker;

import com.android.server.uri.NeededUriGrants;

import com.android.window.flags.Flags;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -3363,7 +3364,8 @@ class Task extends TaskFragment { 
        // If true, we want to get the Dimmer from the level above since we don't want to animate

        // the dim with the Task.

        if (!isRootTask() || (Dimmer.DIMMER_REFACTOR && isTranslucentAndVisible())

                || isTranslucent(null)) {

                || (Flags.getDimmerOnClosing() ? isTranslucentForTransition()

                                                : isTranslucent(null))) {

            return super.getDimmer();

        }