Merge pull request #289 from android/window-manager

updated WindowMetricsActivity with the new WindowSizeClass APIs

Author: romanofranz

samples/user-interface/windowmanager/src/main/java/com/example/platform/ui/windowmanager/WindowMetricsActivity.kt

@@ -22,6 +22,11 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
 import androidx.window.layout.WindowMetricsCalculator
 import androidx.window.core.layout.WindowSizeClass
+import androidx.window.core.layout.WindowSizeClass.Companion.HEIGHT_DP_EXPANDED_LOWER_BOUND
+import androidx.window.core.layout.WindowSizeClass.Companion.HEIGHT_DP_MEDIUM_LOWER_BOUND
+import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_EXPANDED_LOWER_BOUND
+import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOWER_BOUND
+import androidx.window.core.layout.computeWindowSizeClass
 
 import com.example.platform.ui.windowmanager.infolog.InfoLogAdapter
 
@@ -48,9 +53,38 @@ class WindowMetricsActivity : AppCompatActivity() {
         val width = windowMetrics.bounds.width()
         val height = windowMetrics.bounds.height()
         val density = resources.displayMetrics.density
-        val windowSizeClass = WindowSizeClass.compute(width/density, height/density)
+        val windowSizeClass = WindowSizeClass.BREAKPOINTS_V1.computeWindowSizeClass(width/density, height/density)
+
         adapter.append("WindowMetrics update", "width: $width, height: $height")
-        adapter.append("WindowSize Class", "" + windowSizeClass.windowHeightSizeClass + "\n" + windowSizeClass.windowWidthSizeClass)
+        adapter.append("WindowSize Class", "Height: " + getHeightSizeClass(windowSizeClass) + "\nWidth: " + getWidthSizeClass(windowSizeClass))
         adapter.notifyDataSetChanged()
     }
+
+    private fun getWidthSizeClass(sizeClass: WindowSizeClass): String {
+        return when {
+            sizeClass.isWidthAtLeastBreakpoint(WIDTH_DP_EXPANDED_LOWER_BOUND) -> {
+                "EXPANDED"
+            }
+            sizeClass.isWidthAtLeastBreakpoint(WIDTH_DP_MEDIUM_LOWER_BOUND) -> {
+                "MEDIUM"
+            }
+            else -> {
+                "COMPACT"
+            }
+        }
+    }
+
+    private fun getHeightSizeClass(sizeClass: WindowSizeClass): String {
+        return when {
+            sizeClass.isHeightAtLeastBreakpoint(HEIGHT_DP_EXPANDED_LOWER_BOUND) -> {
+                "EXPANDED"
+            }
+            sizeClass.isHeightAtLeastBreakpoint(HEIGHT_DP_MEDIUM_LOWER_BOUND) -> {
+                "MEDIUM"
+            }
+            else -> {
+                "COMPACT"
+            }
+        }
+    }
 }

samples/user-interface/windowmanager/src/main/res/layout/activity_window_metrics.xml

@@ -20,4 +20,5 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
+    android:layout_margin="8dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>

samples/user-interface/windowmanager/src/main/res/values/strings.xml

@@ -40,7 +40,7 @@
     <string name="split_layout_demo_description">Demo of a layout that splits the content to sides of a fold or a hinge. If not present or minimal size requirements are not meant, it behave like a FrameLayout.</string>
     <string name="presentation_demo_description">Demo of using Presentation API to show content on secondary display.</string>
     <string name="window_metrics">Window metrics</string>
-    <string name="window_metrics_description">Demo of using WindowMetrics API with Activity handling rotations.</string>
+    <string name="window_metrics_description">Demo of using WindowMetrics API and WindowSizeClass.</string>
     <string name="current_split_attributes">Current SplitAttributes:</string>>
     <string name="current_animation_background_color">Current Animation Background Color:</string>>
     <string name="toast_split_not_support">Please enable PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED and ensure device supports splits.</string>