diff options
| author | Albin <albin@mullvad.net> | 2023-08-03 18:05:59 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-08-03 18:05:59 +0200 |
| commit | efdb6adf45653f6dd1f1874f1fe6c39a4347d285 (patch) | |
| tree | 2fca6507377a7ec13cc5fcd80864a9800c471f92 /android | |
| parent | 6709241ae1fd7cc1f5ad0964939c35905063c8dd (diff) | |
| parent | 562b5e1096ae745439f7ad0b0899f4eea494f691 (diff) | |
| download | mullvadvpn-efdb6adf45653f6dd1f1874f1fe6c39a4347d285.tar.xz mullvadvpn-efdb6adf45653f6dd1f1874f1fe6c39a4347d285.zip | |
Merge branch 'connect-view-dpad-navigation-not-working-droid-232'
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/main/res/layout/connect.xml | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/android/app/src/main/res/layout/connect.xml b/android/app/src/main/res/layout/connect.xml index 9db162a667..dafc2bc39e 100644 --- a/android/app/src/main/res/layout/connect.xml +++ b/android/app/src/main/res/layout/connect.xml @@ -7,15 +7,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="0.5dp" /> - <androidx.coordinatorlayout.widget.CoordinatorLayout android:layout_width="match_parent" - android:layout_height="match_parent"> - <net.mullvad.mullvadvpn.ui.widget.NotificationBanner android:id="@+id/notification_banner" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:elevation="0.25dp" /> - <androidx.compose.ui.platform.ComposeView android:id="@+id/compose_view" - app:layout_behavior="net.mullvad.mullvadvpn.ui.UnderNotificationBannerBehavior" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - </androidx.coordinatorlayout.widget.CoordinatorLayout> + <net.mullvad.mullvadvpn.ui.widget.NotificationBanner android:id="@+id/notification_banner" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:elevation="0.25dp" /> + <androidx.compose.ui.platform.ComposeView android:id="@+id/compose_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_behavior="net.mullvad.mullvadvpn.ui.UnderNotificationBannerBehavior" /> </LinearLayout> |