summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Priyanka Advani (xWF) <padvani@google.com> 2024-09-13 22:35:09 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-09-13 22:35:09 +0000
commitef59e5ee5a395f28a11e4ee1ece17e3dc511fb8a (patch)
treee6061d0e3f891f98d59f48c70f88f8efae693077
parent83584cc3b80a45587fe1ad53d632511f4cfd567a (diff)
Revert "Fix rounded corners in transitions on non-internal displays"
This reverts commit 83584cc3b80a45587fe1ad53d632511f4cfd567a. Reason for revert: Droidmonitor created revert due to b/366525394. Will be verifying through ABTD before submission. Change-Id: Ia9600561607a2180bcd644c8f816e65e7a7b99ea
-rw-r--r--core/java/com/android/internal/policy/ScreenDecorationsUtils.java10
1 files changed, 1 insertions, 9 deletions
diff --git a/core/java/com/android/internal/policy/ScreenDecorationsUtils.java b/core/java/com/android/internal/policy/ScreenDecorationsUtils.java
index b23515aa51f3..067e5e8813a7 100644
--- a/core/java/com/android/internal/policy/ScreenDecorationsUtils.java
+++ b/core/java/com/android/internal/policy/ScreenDecorationsUtils.java
@@ -37,8 +37,6 @@ public class ScreenDecorationsUtils {
*
* Note that if the context is not an UI context(not associated with Display), it will use
* default display.
- *
- * If the associated display is not internal, will return 0.
*/
public static float getWindowCornerRadius(Context context) {
final Resources resources = context.getResources();
@@ -46,13 +44,7 @@ public class ScreenDecorationsUtils {
return 0f;
}
// Use Context#getDisplayNoVerify() in case the context is not an UI context.
- final Display display = context.getDisplayNoVerify();
- // The radius is only valid for internal displays, since the corner radius of external or
- // virtual displays is not known when window corners are configured or are not supported.
- if (display.getType() != Display.TYPE_INTERNAL) {
- return 0f;
- }
- final String displayUniqueId = display.getUniqueId();
+ final String displayUniqueId = context.getDisplayNoVerify().getUniqueId();
// Radius that should be used in case top or bottom aren't defined.
float defaultRadius = RoundedCorners.getRoundedCornerRadius(resources, displayUniqueId)
- RoundedCorners.getRoundedCornerRadiusAdjustment(resources, displayUniqueId);