Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix screenshot work profile badge padding" into tm-qpr-dev

Browse Source
This commit is contained in:
Miranda Kephart
2023-01-11 22:07:56 +00:00
committed by Android (Google) Code Review
parent 585a299c9a 10df523dae
commit 6a7f3c0c61
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/res/drawable/overlay_badge_background.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?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"); ~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with 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 ~ See the License for the specific language governing permissions and
~ limitations under the License. ~ limitations under the License.
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" android:width="48dp"
android:shape="oval"> android:height="48dp"
<solid android:color="?androidprv:attr/colorSurface"/> android:viewportWidth="48.0"
</shape> android:viewportHeight="48.0">
<path
android:pathData="M0,0M48,48"/>
</vector>

7
packages/SystemUI/res/layout/screenshot_static.xml
View File

@@ -93,13 +93,10 @@
app:layout_constraintBottom_toBottomOf="@id/screenshot_preview_border"/> app:layout_constraintBottom_toBottomOf="@id/screenshot_preview_border"/>
<ImageView <ImageView
android:id="@+id/screenshot_badge" android:id="@+id/screenshot_badge"
android:layout_width="24dp" android:layout_width="48dp"
android:layout_height="24dp" android:layout_height="48dp"
android:padding="4dp"
android:visibility="gone" android:visibility="gone"
android:background="@drawable/overlay_badge_background"
android:elevation="8dp" android:elevation="8dp"
android:src="@drawable/overlay_cancel"
app:layout_constraintBottom_toBottomOf="@id/screenshot_preview_border" app:layout_constraintBottom_toBottomOf="@id/screenshot_preview_border"
app:layout_constraintEnd_toEndOf="@id/screenshot_preview_border"/> app:layout_constraintEnd_toEndOf="@id/screenshot_preview_border"/>
<FrameLayout <FrameLayout

4
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
View File

@@ -687,8 +687,8 @@ public class ScreenshotController {
} }
}); });
if (mFlags.isEnabled(SCREENSHOT_WORK_PROFILE_POLICY)) { if (mFlags.isEnabled(SCREENSHOT_WORK_PROFILE_POLICY)) {
mScreenshotView.badgeScreenshot( mScreenshotView.badgeScreenshot(mContext.getPackageManager().getUserBadgedIcon(
mContext.getPackageManager().getUserBadgeForDensity(owner, 0)); mContext.getDrawable(R.drawable.overlay_badge_background), owner));
} }
mScreenshotView.setScreenshot(mScreenBitmap, screenInsets); mScreenshotView.setScreenshot(mScreenBitmap, screenInsets);
if (DEBUG_WINDOW) { if (DEBUG_WINDOW) {