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

Commit 84f6ea85 authored by Tim Joines's avatar Tim Joines Committed by android-build-merger
Browse files

Merge "Add config to control full task snapshot scale" into qt-dev am: 10b9def7 

am: 2ca532cd

Change-Id: I95e0a8fec1bcecae2af9068555216dabdde2030f
parents 831cbd5c 2ca532cd

core/java/com/android/internal/policy/BackdropFrameRenderer.java

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ public class BackdropFrameRenderer extends Thread implements Choreographer.Frame 
        // don't want the navigation bar background be moving around when resizing in docked mode.

        // However, we need it for the transitions into/out of docked mode.

        if (mNavigationBarColor != null && fullscreen) {

            DecorView.getNavigationBarRect(width, height, stableInsets, systemInsets, mTmpRect);

            DecorView.getNavigationBarRect(width, height, stableInsets, systemInsets, mTmpRect, 1f);

            mNavigationBarColor.setBounds(mTmpRect);

            mNavigationBarColor.draw(canvas);

        }

core/java/com/android/internal/policy/DecorView.java

+7 −4
Original line number Diff line number Diff line
@@ -1080,10 +1080,13 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
    }



    public static void getNavigationBarRect(int canvasWidth, int canvasHeight, Rect stableInsets,

            Rect contentInsets, Rect outRect) {

        final int bottomInset = getColorViewBottomInset(stableInsets.bottom, contentInsets.bottom);

        final int leftInset = getColorViewLeftInset(stableInsets.left, contentInsets.left);

        final int rightInset = getColorViewLeftInset(stableInsets.right, contentInsets.right);

            Rect contentInsets, Rect outRect, float scale) {

        final int bottomInset =

                (int) (getColorViewBottomInset(stableInsets.bottom, contentInsets.bottom) * scale);

        final int leftInset =

                (int) (getColorViewLeftInset(stableInsets.left, contentInsets.left) * scale);

        final int rightInset =

                (int) (getColorViewLeftInset(stableInsets.right, contentInsets.right) * scale);

        final int size = getNavBarSize(bottomInset, rightInset, leftInset);

        if (isNavBarToRightEdge(bottomInset, rightInset)) {

            outRect.set(canvasWidth - size, 0, canvasWidth, canvasHeight);

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -2787,6 +2787,9 @@ 
         screen. -->

    <bool name="config_lowRamTaskSnapshotsAndRecents">false</bool>



    <!-- The amount to scale fullscreen snapshots for Overview and snapshot starting windows. -->

    <item name="config_fullTaskSnapshotScale" format="float" type="dimen">1.0</item>



    <!-- Determines whether recent tasks are provided to the user. Default device has recents

         property. If this is false, then the following recents config flags are ignored. -->

    <bool name="config_hasRecents">true</bool>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -355,6 +355,7 @@ 
  <java-symbol type="bool" name="config_enableMultiUserUI"/>

  <java-symbol type="bool" name="config_enableNewAutoSelectNetworkUI"/>

  <java-symbol type="bool" name="config_disableUsbPermissionDialogs"/>

  <java-symbol type="dimen" name="config_fullTaskSnapshotScale" />

  <java-symbol type="bool" name="config_lowRamTaskSnapshotsAndRecents" />

  <java-symbol type="bool" name="config_hasRecents" />

  <java-symbol type="string" name="config_recentsComponentName" />

proto/src/task_snapshot.proto

+1 −0
Original line number Diff line number Diff line
@@ -32,4 +32,5 @@ 
     int32 system_ui_visibility = 8;

     bool is_translucent = 9;

     string top_activity_component = 10;

     float scale = 11;

 }
 
 No newline at end of file