diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2020-05-29 12:25:52 +0530 |
|---|---|---|
| committer | Harsh Shandilya <me@msfjarvis.dev> | 2020-05-29 12:25:52 +0530 |
| commit | 4dff537d21b868da40ac190b4ae196e814d9439d (patch) | |
| tree | d19c21bd24f88e6e88820446d3b3ab36955777ea /ui/src/main/res | |
| parent | 761c2ade4a498ed91b5a78852f0f2eb954afa0f6 (diff) | |
ui: address new databinding requirements
Layouts in differing configurations must agree on their root tags, so we give
both copies of main_activity the same root ID, and adjust the check for
two-pane layout to simply test for nullability. This also changes the inset
dispatch code to use ViewCompat and WindowInsetsCompat since they will adjust
insets based on the SDK level allowing us to abstract away that concern.
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'ui/src/main/res')
| -rw-r--r-- | ui/src/main/res/layout-sw600dp/main_activity.xml | 1 | ||||
| -rw-r--r-- | ui/src/main/res/layout/main_activity.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ui/src/main/res/layout-sw600dp/main_activity.xml b/ui/src/main/res/layout-sw600dp/main_activity.xml index 00fa1c49..b5ce34a4 100644 --- a/ui/src/main/res/layout-sw600dp/main_activity.xml +++ b/ui/src/main/res/layout-sw600dp/main_activity.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/main_activity_container" android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".activity.MainActivity"> diff --git a/ui/src/main/res/layout/main_activity.xml b/ui/src/main/res/layout/main_activity.xml index 89be4fe4..a970d8e2 100644 --- a/ui/src/main/res/layout/main_activity.xml +++ b/ui/src/main/res/layout/main_activity.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/master_detail_wrapper" + android:id="@+id/main_activity_container" android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" |