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

Commit fdbb5e76 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Fix screenshot work profile badge padding" into tm-qpr-dev am: 6a7f3c0c 

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



Change-Id: I3af800a031e140833d4aa0a857c75bd953c40917
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a5af4bde 6a7f3c0c

packages/SystemUI/res/drawable/overlay_badge_background.xml

+9 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2020 The Android Open Source Project

  ~ Copyright (C) 2022 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.
@@ -14,8 +14,11 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

        android:shape="oval">

    <solid android:color="?androidprv:attr/colorSurface"/>

</shape>
 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="48dp"

        android:height="48dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    <path

        android:pathData="M0,0M48,48"/>

</vector>

packages/SystemUI/res/layout/screenshot_static.xml

+2 −5
Original line number Diff line number Diff line
@@ -93,13 +93,10 @@ 
        app:layout_constraintBottom_toBottomOf="@id/screenshot_preview_border"/>

    <ImageView

        android:id="@+id/screenshot_badge"

        android:layout_width="24dp"

        android:layout_height="24dp"

        android:padding="4dp"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:visibility="gone"

        android:background="@drawable/overlay_badge_background"

        android:elevation="8dp"

        android:src="@drawable/overlay_cancel"

        app:layout_constraintBottom_toBottomOf="@id/screenshot_preview_border"

        app:layout_constraintEnd_toEndOf="@id/screenshot_preview_border"/>

    <FrameLayout

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java

+2 −2
Original line number Diff line number Diff line
@@ -687,8 +687,8 @@ public class ScreenshotController { 
                    }

                });

        if (mFlags.isEnabled(SCREENSHOT_WORK_PROFILE_POLICY)) {

            mScreenshotView.badgeScreenshot(

                    mContext.getPackageManager().getUserBadgeForDensity(owner, 0));

            mScreenshotView.badgeScreenshot(mContext.getPackageManager().getUserBadgedIcon(

                    mContext.getDrawable(R.drawable.overlay_badge_background), owner));

        }

        mScreenshotView.setScreenshot(mScreenBitmap, screenInsets);

        if (DEBUG_WINDOW) {