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

Commit 0cb38d2e authored by Michael Kolb's avatar Michael Kolb Committed by Android (Google) Code Review
Browse files

Merge "Add configuration for activity thumbnails" into klp-modular-dev

parents f5e67474 5f6238e4
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -1487,6 +1487,9 @@
    <!-- default window inset isRound property -->
    <bool name="config_windowIsRound">false</bool>

    <!-- default device has recents property -->
    <bool name="config_hasRecents">true</bool>

    <!-- Defines the default set of global actions. Actions may still be disabled or hidden based
         on the current state of the device.
         Each item must be one of the following strings:
+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@
  <java-symbol type="bool" name="config_forceDefaultOrientation" />
  <java-symbol type="bool" name="config_wifi_batched_scan_supported" />
  <java-symbol type="bool" name="config_windowIsRound" />
  <java-symbol type="bool" name="config_hasRecents" />

  <java-symbol type="integer" name="config_cursorWindowSize" />
  <java-symbol type="integer" name="config_extraFreeKbytesAdjust" />
+6 −0
Original line number Diff line number Diff line
@@ -1074,6 +1074,9 @@ public final class ActivityManagerService extends ActivityManagerNative
     */
    private boolean mUserIsMonkey;
    /** Flag whether the device has a recents UI */
    final boolean mHasRecents;
    final ServiceThread mHandlerThread;
    final MainHandler mHandler;
@@ -1941,6 +1944,9 @@ public final class ActivityManagerService extends ActivityManagerNative
        mConfigurationSeq = mConfiguration.seq = 1;
        mProcessCpuTracker.init();
        mHasRecents = mContext.getResources().getBoolean(
                com.android.internal.R.bool.config_hasRecents);
        mCompatModePackages = new CompatModePackages(this, systemDir, mHandler);
        mIntentFirewall = new IntentFirewall(new IntentFirewallInterface(), mHandler);
        mStackSupervisor = new ActivityStackSupervisor(this);
+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ final class ActivityStack {
        prev.task.touchActiveTime();
        clearLaunchTime(prev);
        final ActivityRecord next = mStackSupervisor.topRunningActivityLocked();
        if (next == null || next.task != prev.task) {
        if (mService.mHasRecents && (next == null || next.task != prev.task)) {
            prev.updateThumbnail(screenshotActivities(prev), null);
        }
        stopFullyDrawnTraceIfNeeded();