File tree Expand file tree Collapse file tree 11 files changed +19
-21
lines changed
common/common-ui/src/main/res Expand file tree Collapse file tree 11 files changed +19
-21
lines changed Original file line number Diff line number Diff line change 25
25
<include
26
26
android : id =" @+id/topMockupSingleToolbar"
27
27
android : layout_width =" match_parent"
28
- android : layout_height =" @dimen/toolbarSize "
28
+ android : layout_height =" ?attr/actionBarSize "
29
29
android : layout_alignParentTop =" true"
30
30
layout =" @layout/include_omnibar_toolbar_mockup" />
31
31
56
56
<include
57
57
android : id =" @+id/bottomMockupSingleToolbar"
58
58
android : layout_width =" match_parent"
59
- android : layout_height =" @dimen/toolbarSize "
59
+ android : layout_height =" ?attr/actionBarSize "
60
60
android : layout_alignParentBottom =" true"
61
61
layout =" @layout/include_omnibar_toolbar_mockup_bottom" />
62
62
Original file line number Diff line number Diff line change 37
37
android : id =" @+id/tabsContainer"
38
38
android : layout_width =" match_parent"
39
39
android : layout_height =" match_parent"
40
- android : elevation =" 10dp"
41
40
app : layout_behavior =" @string/appbar_scrolling_view_behavior" >
42
41
43
42
<View
Original file line number Diff line number Diff line change 24
24
android : orientation =" horizontal"
25
25
android : paddingHorizontal =" 2dp"
26
26
tools : ignore =" KeyboardInaccessibleWidget"
27
- tools : layout_height =" @dimen/toolbarSize " >
27
+ tools : layout_height =" ?attr/actionBarSize " >
28
28
29
29
<!-- The expected horizontal padding for content is 6dp but we're applying only 2dp
30
30
because the remaining 4dp are added by the omnibar selection animation -->
Original file line number Diff line number Diff line change 21
21
xmlns : tools =" http://schemas.android.com/tools"
22
22
android : id =" @+id/appBarLayoutMockup"
23
23
android : layout_width =" match_parent"
24
- android : layout_height =" @dimen/toolbarSize "
24
+ android : layout_height =" ?attr/actionBarSize "
25
25
android : background =" ?daxColorToolbar"
26
26
android : clipChildren =" false" >
27
27
Original file line number Diff line number Diff line change 21
21
xmlns : tools =" http://schemas.android.com/tools"
22
22
android : id =" @+id/appBarLayoutMockup"
23
23
android : layout_width =" match_parent"
24
- android : layout_height =" @dimen/toolbarSize "
24
+ android : layout_height =" ?attr/actionBarSize "
25
25
android : background =" ?daxColorToolbar"
26
26
android : clipChildren =" false" >
27
27
Original file line number Diff line number Diff line change 41
41
<androidx .appcompat.widget.Toolbar
42
42
android : id =" @+id/toolbar"
43
43
android : layout_width =" 0dp"
44
- android : layout_height =" @dimen/toolbarSize "
44
+ android : layout_height =" ?attr/actionBarSize "
45
45
android : clipChildren =" false"
46
46
app : contentInsetEnd =" 0dp"
47
47
app : contentInsetStart =" 0dp"
364
364
<androidx .constraintlayout.widget.ConstraintLayout
365
365
android : id =" @+id/customTabToolbarContainerWrapper"
366
366
android : layout_width =" 0dp"
367
- android : layout_height =" @dimen/toolbarSize "
367
+ android : layout_height =" ?attr/actionBarSize "
368
368
android : layout_marginHorizontal =" @dimen/keyline_2"
369
369
app : layout_constraintBottom_toBottomOf =" parent"
370
370
app : layout_constraintEnd_toStartOf =" @id/iconsContainer"
Original file line number Diff line number Diff line change 25
25
android : elevation =" 0dp"
26
26
android : outlineProvider =" none" >
27
27
28
+ <View
29
+ android : layout_width =" match_parent"
30
+ android : layout_height =" 0.5dp"
31
+ android : background =" ?attr/daxColorShadeSolid" />
32
+
28
33
<androidx .appcompat.widget.Toolbar
29
34
android : id =" @+id/toolbar"
30
35
android : layout_width =" match_parent"
31
36
android : layout_height =" ?attr/actionBarSize"
32
37
android : background =" ?attr/daxColorToolbar"
33
- android : paddingTop =" ?attr/toolbarExtraPadding"
34
38
android : theme =" @style/TabSwitcher.Widget.Toolbar"
35
39
app : popupTheme =" @style/Widget.DuckDuckGo.PopUpOverflowMenu" />
36
40
Original file line number Diff line number Diff line change 28
28
<androidx .appcompat.widget.Toolbar
29
29
android : id =" @+id/toolbar"
30
30
android : layout_width =" match_parent"
31
- android : layout_height =" @dimen/tabSwitcherToolbarTopSize"
32
- android : paddingBottom =" ?attr/toolbarExtraPadding"
31
+ android : layout_height =" ?attr/actionBarSize"
33
32
android : background =" ?attr/daxColorToolbar"
34
33
android : theme =" @style/TabSwitcher.Widget.Toolbar"
35
34
app : popupTheme =" @style/Widget.DuckDuckGo.PopUpOverflowMenu" />
36
35
36
+ <View
37
+ android : layout_width =" match_parent"
38
+ android : layout_height =" 0.5dp"
39
+ android : background =" ?attr/daxColorShade" />
40
+
37
41
</com .google.android.material.appbar.AppBarLayout>
Original file line number Diff line number Diff line change 29
29
<attr name =" cookiesAnimationRadius" format =" dimension" />
30
30
<attr name =" cookiesAnimationHeight" format =" dimension" />
31
31
32
- <attr name =" toolbarExtraPadding" format =" dimension" />
33
-
34
32
</resources >
Original file line number Diff line number Diff line change 43
43
<dimen name =" toolbarIconPadding" >3dp</dimen >
44
44
<dimen name =" toolbarIcon" >40dp</dimen >
45
45
<dimen name =" toolbarSize" >60dp</dimen >
46
- <dimen name =" tabSwitcherToolbarTopSize" >56dp</dimen >
47
46
48
47
<!-- Navigation Bar -->
49
48
<dimen name =" experimentalNavigationBarPaddingTopWhenStandalone" >12dp</dimen >
You can’t perform that action at this time.
0 commit comments