Skip to content

Commit d0b75f9

Browse files
authored
updated to jetpack windowmanager 1.4 and fixed edge-to-edge layouts (#283)
1 parent db6dc1d commit d0b75f9

13 files changed

+18
-6
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ play-services-location = "21.1.0"
3535
accompanist = "0.32.0"
3636
androidx-datastore = "1.0.0"
3737
androidx-navigation = "2.7.7"
38-
androidx-window = "1.2.0"
38+
androidx-window = "1.4.0-rc01"
3939
casa = "0.5.1"
4040
gradleDownloadTask = "4.1.2"
4141
ksp = "1.9.22-1.0.17"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
android:id="@+id/rootLayout"
2323
android:layout_width="match_parent"
2424
android:layout_height="match_parent"
25+
android:fitsSystemWindows="true"
2526
tools:context="com.example.platform.ui.windowmanager.DisplayFeaturesActivity">
2627

2728
<FrameLayout

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
xmlns:app="http://schemas.android.com/apk/res-auto"
2121
xmlns:tools="http://schemas.android.com/tools"
2222
android:layout_width="match_parent"
23-
android:layout_height="match_parent">
23+
android:layout_height="match_parent"
24+
android:fitsSystemWindows="true">
2425

2526
<Button
2627
android:id="@+id/button"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
xmlns:app="http://schemas.android.com/apk/res-auto"
2121
xmlns:tools="http://schemas.android.com/tools"
2222
android:layout_width="match_parent"
23-
android:layout_height="match_parent">
23+
android:layout_height="match_parent"
24+
android:fitsSystemWindows="true">
2425

2526
<Button
2627
android:id="@+id/button"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
xmlns:android="http://schemas.android.com/apk/res/android"
2020
android:id="@+id/root_split_activity_layout"
2121
android:layout_width="match_parent"
22-
android:layout_height="match_parent">
22+
android:layout_height="match_parent"
23+
android:fitsSystemWindows="true">
2324

2425
<LinearLayout
2526
android:layout_width="match_parent"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
android:layout_width="match_parent"
2222
android:layout_height="match_parent"
2323
android:orientation="vertical"
24+
android:fitsSystemWindows="true"
2425
android:padding="10dp">
2526

2627
<TextView

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
android:id="@+id/root_split_activity_layout"
2121
android:layout_width="match_parent"
2222
android:layout_height="match_parent"
23+
android:fitsSystemWindows="true"
2324
android:padding="10dp">
2425

2526
<Button

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
android:layout_width="match_parent"
2222
android:layout_height="match_parent"
2323
android:orientation="vertical"
24+
android:fitsSystemWindows="true"
2425
android:padding="10dp">
2526

2627
<TextView

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
xmlns:android="http://schemas.android.com/apk/res/android"
1919
android:id="@+id/root_split_activity_layout"
2020
android:layout_width="match_parent"
21-
android:layout_height="match_parent">
21+
android:layout_height="match_parent"
22+
android:fitsSystemWindows="true">
2223
<LinearLayout
2324
android:layout_width="match_parent"
2425
android:layout_height="match_parent"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
android:layout_width="match_parent"
2020
android:layout_height="match_parent"
2121
android:orientation="vertical"
22+
android:fitsSystemWindows="true"
2223
android:padding="10dp">
2324

2425
<TextView

0 commit comments

Comments
 (0)