Skip to content

Commit daadbbd

Browse files
bmartybmarty
committed
Revert "Target API 35: set android:fitsSystemWindows="true" to Activities."
This reverts commit 3d7bf51.
1 parent 3f22ddb commit daadbbd

18 files changed

+21
-38
lines changed

‎vector/src/main/res/layout/activity.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:id="@+id/coordinatorLayout"
55
android:layout_width="match_parent"
6-
android:layout_height="match_parent"
7-
android:fitsSystemWindows="true">
6+
android:layout_height="match_parent">
87

98
<androidx.constraintlayout.widget.ConstraintLayout
109
android:layout_width="match_parent"
@@ -38,4 +37,4 @@
3837

3938
</androidx.constraintlayout.widget.ConstraintLayout>
4039

41-
</androidx.coordinatorlayout.widget.CoordinatorLayout>
40+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

‎vector/src/main/res/layout/activity_bug_report.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="wrap_content"
7-
android:fitsSystemWindows="true"
87
android:orientation="vertical">
98

109
<com.google.android.material.appbar.AppBarLayout

‎vector/src/main/res/layout/activity_call.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?><!-- tools:ignore is needed because lint thinks this can be replaced with a merge. Replacing this
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- tools:ignore is needed because lint thinks this can be replaced with a merge. Replacing this
23
with a merge causes the fullscreen SurfaceView not to be centered. -->
34
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
45
xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -7,7 +8,6 @@
78
android:layout_width="match_parent"
89
android:layout_height="match_parent"
910
android:background="@color/bg_call_screen_blur"
10-
android:fitsSystemWindows="true"
1111
tools:ignore="MergeRootFrame">
1212

1313
<ImageView

‎vector/src/main/res/layout/activity_call_transfer.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:id="@+id/vector_coordinator_layout"
55
android:layout_width="match_parent"
6-
android:layout_height="match_parent"
7-
android:fitsSystemWindows="true">
6+
android:layout_height="match_parent">
87

98
<androidx.constraintlayout.widget.ConstraintLayout
109
android:layout_width="match_parent"
@@ -18,9 +17,9 @@
1817

1918
<com.google.android.material.appbar.MaterialToolbar
2019
android:id="@+id/callTransferToolbar"
20+
app:title="@string/call_transfer_title"
2121
android:layout_width="match_parent"
22-
android:layout_height="wrap_content"
23-
app:title="@string/call_transfer_title" />
22+
android:layout_height="wrap_content" />
2423

2524
<com.google.android.material.tabs.TabLayout
2625
android:id="@+id/callTransferTabLayout"

‎vector/src/main/res/layout/activity_emoji_reaction_picker.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
android:id="@+id/coordinatorLayout"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
8-
android:fitsSystemWindows="true"
98
tools:context=".features.reactions.EmojiReactionPickerActivity">
109

1110
<androidx.fragment.app.FragmentContainerView

‎vector/src/main/res/layout/activity_filtered_rooms.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:id="@+id/coordinatorLayout"
55
android:layout_width="match_parent"
6-
android:layout_height="match_parent"
7-
android:fitsSystemWindows="true">
6+
android:layout_height="match_parent">
87

98
<androidx.constraintlayout.widget.ConstraintLayout
109
android:layout_width="match_parent"

‎vector/src/main/res/layout/activity_home.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
android:id="@+id/drawerLayout"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
7-
android:fitsSystemWindows="true"
87
tools:openDrawer="start">
98

109
<androidx.coordinatorlayout.widget.CoordinatorLayout

‎vector/src/main/res/layout/activity_jitsi.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
android:id="@+id/jitsi_layout"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
7-
android:background="@android:color/black"
8-
android:fitsSystemWindows="true">
7+
android:background="@android:color/black">
98

109
<!-- Note: A org.jitsi.meet.sdk.JitsiMeetView will be added here and so add tools:ignore="UselessParent" -->
1110

@@ -25,4 +24,4 @@
2524

2625
</LinearLayout>
2726

28-
</FrameLayout>
27+
</FrameLayout>

‎vector/src/main/res/layout/activity_location_sharing.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
5-
android:fitsSystemWindows="true"
65
android:orientation="vertical">
76

87
<com.google.android.material.appbar.AppBarLayout
@@ -22,4 +21,4 @@
2221
android:layout_width="match_parent"
2322
android:layout_height="match_parent" />
2423

25-
</LinearLayout>
24+
</LinearLayout>

‎vector/src/main/res/layout/activity_login.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:id="@+id/coordinatorLayout"
66
android:layout_width="match_parent"
7-
android:layout_height="match_parent"
8-
android:fitsSystemWindows="true">
7+
android:layout_height="match_parent">
98

109
<androidx.constraintlayout.widget.ConstraintLayout
1110
android:id="@+id/loginContainer"
@@ -49,4 +48,4 @@
4948

5049
</androidx.constraintlayout.widget.ConstraintLayout>
5150

52-
</androidx.coordinatorlayout.widget.CoordinatorLayout>
51+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

0 commit comments

Comments
 (0)