Skip to content

Commit 9eb76ae

Browse files
Ulrico972rlepinski
authored andcommitted
use system service to get window manager (#1624)
1 parent 6fdcb44 commit 9eb76ae

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

urbanairship-layout/src/main/java/com/urbanairship/android/layout/util/ResourceUtils.java

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@
22

33
package com.urbanairship.android.layout.util;
44

5-
import android.app.Activity;
5+
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
6+
import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
7+
import static android.content.res.Configuration.SCREENLAYOUT_SIZE_LARGE;
8+
import static android.content.res.Configuration.SCREENLAYOUT_SIZE_NORMAL;
9+
import static android.content.res.Configuration.SCREENLAYOUT_SIZE_SMALL;
10+
import static android.content.res.Configuration.SCREENLAYOUT_SIZE_XLARGE;
11+
import static androidx.annotation.Dimension.DP;
12+
import static androidx.annotation.Dimension.SP;
13+
614
import android.content.Context;
715
import android.content.res.AssetManager;
816
import android.content.res.Configuration;
@@ -15,6 +23,10 @@
1523
import android.view.WindowManager;
1624
import android.view.WindowMetrics;
1725

26+
import androidx.annotation.Dimension;
27+
import androidx.annotation.NonNull;
28+
import androidx.annotation.Nullable;
29+
1830
import com.urbanairship.android.layout.property.Orientation;
1931
import com.urbanairship.android.layout.property.WindowSize;
2032
import com.urbanairship.json.JsonException;
@@ -28,19 +40,6 @@
2840
import java.util.List;
2941
import java.util.Scanner;
3042

31-
import androidx.annotation.Dimension;
32-
import androidx.annotation.NonNull;
33-
import androidx.annotation.Nullable;
34-
35-
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
36-
import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
37-
import static android.content.res.Configuration.SCREENLAYOUT_SIZE_LARGE;
38-
import static android.content.res.Configuration.SCREENLAYOUT_SIZE_NORMAL;
39-
import static android.content.res.Configuration.SCREENLAYOUT_SIZE_SMALL;
40-
import static android.content.res.Configuration.SCREENLAYOUT_SIZE_XLARGE;
41-
import static androidx.annotation.Dimension.DP;
42-
import static androidx.annotation.Dimension.SP;
43-
4443
public final class ResourceUtils {
4544
private ResourceUtils() {}
4645

@@ -130,7 +129,7 @@ public static int getDisplayHeightPixels(@NonNull Context context) {
130129
}
131130

132131
public static int getWindowWidthPixels(@NonNull Context context, boolean ignoreSafeArea) {
133-
WindowManager windowManager = ((Activity) context).getWindowManager();
132+
WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
134133
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
135134
WindowMetrics windowMetrics = windowManager.getCurrentWindowMetrics();
136135

@@ -152,7 +151,7 @@ public static int getWindowWidthPixels(@NonNull Context context, boolean ignoreS
152151
}
153152

154153
public static int getWindowHeightPixels(@NonNull Context context, boolean ignoreSafeArea) {
155-
WindowManager windowManager = ((Activity) context).getWindowManager();
154+
WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
156155
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
157156
WindowMetrics windowMetrics = windowManager.getCurrentWindowMetrics();
158157

0 commit comments

Comments
 (0)