Skip to content

Commit 823bb3d

Browse files
authored
Add ScrollView to fix Dax being cutoff when keyboard appears (#1238)
* Add ScrollView to fix Dax being cutoff when keyboard appears * Fill viewport so that widget CTA dialog is shown at the bottom of the screen
1 parent 35385a4 commit 823bb3d

File tree

1 file changed

+45
-39
lines changed

1 file changed

+45
-39
lines changed

app/src/main/res/layout/include_new_browser_tab.xml

Lines changed: 45 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,53 +14,59 @@
1414
~ limitations under the License.
1515
-->
1616

17-
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
17+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
1818
xmlns:app="http://schemas.android.com/apk/res-auto"
1919
xmlns:tools="http://schemas.android.com/tools"
2020
android:id="@+id/newTabLayout"
2121
android:layout_width="match_parent"
2222
android:layout_height="match_parent"
23-
android:layout_marginTop="?attr/actionBarSize"
24-
android:foreground="@android:color/transparent"
23+
android:fillViewport="true"
2524
tools:context="com.duckduckgo.app.browser.BrowserActivity"
2625
tools:showIn="@layout/fragment_browser_tab">
2726

28-
<ImageView
29-
android:id="@+id/ddgLogo"
30-
android:layout_width="0dp"
31-
android:alpha="0"
32-
android:layout_height="wrap_content"
33-
android:contentDescription="@string/duckDuckGoLogoDescription"
34-
android:src="@drawable/logo_full"
35-
app:layout_constraintEnd_toEndOf="parent"
36-
app:layout_constraintHeight_max="180dp"
37-
app:layout_constraintStart_toStartOf="parent"
38-
android:layout_marginTop="@dimen/homeTabDdgLogoTopMargin"
39-
app:layout_constraintTop_toTopOf="parent"
40-
app:layout_constraintWidth_max="180dp"
41-
android:visibility="gone"/>
27+
<androidx.constraintlayout.widget.ConstraintLayout
28+
android:layout_width="match_parent"
29+
android:layout_height="match_parent"
30+
android:layout_marginTop="?attr/actionBarSize"
31+
android:foreground="@android:color/transparent">
4232

43-
<include
44-
layout="@layout/include_dax_dialog_cta"
45-
android:layout_width="0dp"
46-
android:layout_height="wrap_content"
47-
android:layout_marginTop="40dp"
48-
app:layout_constraintEnd_toEndOf="parent"
49-
app:layout_constraintStart_toStartOf="parent"
50-
app:layout_constraintTop_toTopOf="parent"
51-
app:layout_constraintWidth_max="600dp"
52-
android:visibility="gone"/>
33+
<ImageView
34+
android:id="@+id/ddgLogo"
35+
android:layout_width="0dp"
36+
android:alpha="0"
37+
android:layout_height="wrap_content"
38+
android:contentDescription="@string/duckDuckGoLogoDescription"
39+
android:src="@drawable/logo_full"
40+
app:layout_constraintEnd_toEndOf="parent"
41+
app:layout_constraintHeight_max="180dp"
42+
app:layout_constraintStart_toStartOf="parent"
43+
android:layout_marginTop="@dimen/homeTabDdgLogoTopMargin"
44+
app:layout_constraintTop_toTopOf="parent"
45+
app:layout_constraintWidth_max="180dp"
46+
android:visibility="gone"/>
5347

54-
<LinearLayout
55-
android:id="@+id/ctaContainer"
56-
android:layout_width="match_parent"
57-
android:layout_height="wrap_content"
58-
android:orientation="vertical"
59-
android:visibility="gone"
60-
android:elevation="12dp"
61-
android:outlineProvider="paddedBounds"
62-
app:layout_constraintBottom_toBottomOf="parent"
63-
app:layout_constraintEnd_toEndOf="parent"
64-
app:layout_constraintStart_toStartOf="parent" />
48+
<include
49+
layout="@layout/include_dax_dialog_cta"
50+
android:layout_width="0dp"
51+
android:layout_height="wrap_content"
52+
android:layout_marginTop="40dp"
53+
app:layout_constraintEnd_toEndOf="parent"
54+
app:layout_constraintStart_toStartOf="parent"
55+
app:layout_constraintTop_toTopOf="parent"
56+
app:layout_constraintWidth_max="600dp"
57+
android:visibility="gone"/>
58+
59+
<LinearLayout
60+
android:id="@+id/ctaContainer"
61+
android:layout_width="match_parent"
62+
android:layout_height="wrap_content"
63+
android:orientation="vertical"
64+
android:visibility="gone"
65+
android:elevation="12dp"
66+
android:outlineProvider="paddedBounds"
67+
app:layout_constraintBottom_toBottomOf="parent"
68+
app:layout_constraintEnd_toEndOf="parent"
69+
app:layout_constraintStart_toStartOf="parent" />
6570

66-
</androidx.constraintlayout.widget.ConstraintLayout>
71+
</androidx.constraintlayout.widget.ConstraintLayout>
72+
</ScrollView>

0 commit comments

Comments
 (0)