Skip to content

Commit caa4dd2

Browse files
imhappidrchen
authored andcommitted
[DockedToolbar] 1P styles and tests, and catalog demo
PiperOrigin-RevId: 728323728
1 parent 0c4ed7e commit caa4dd2

File tree

2 files changed

+79
-2
lines changed

2 files changed

+79
-2
lines changed
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ Copyright (C) 2025 The Android Open Source Project
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
18+
xmlns:app="http://schemas.android.com/apk/res-auto"
19+
android:baselineAligned="false" android:orientation="horizontal"
20+
android:layout_width="wrap_content"
21+
android:layout_height="wrap_content"
22+
android:gravity="center">
23+
<Button
24+
android:id="@+id/docked_toolbar_left_arrow_button"
25+
android:layout_width="48dp"
26+
android:layout_height="48dp"
27+
android:layout_gravity="center"
28+
style="?attr/materialIconButtonStyle"
29+
android:contentDescription="@string/cat_docked_toolbar_left_arrow_button_description"
30+
android:layout_marginEnd="32dp"
31+
app:icon="@drawable/ic_arrow_back_24px" />
32+
33+
<Button
34+
android:id="@+id/docked_toolbar_right_arrow_button"
35+
android:layout_width="48dp"
36+
android:layout_height="48dp"
37+
android:layout_gravity="center"
38+
style="?attr/materialIconButtonStyle"
39+
android:layout_marginEnd="32dp"
40+
android:contentDescription="@string/cat_docked_toolbar_right_arrow_button_description"
41+
app:icon="@drawable/ic_arrow_forward_24px" />
42+
43+
<Button
44+
android:id="@+id/docked_toolbar_add_button"
45+
android:layout_width="48dp"
46+
android:layout_height="48dp"
47+
android:layout_gravity="center"
48+
android:gravity="center"
49+
android:paddingVertical="8dp"
50+
android:paddingHorizontal="8dp"
51+
app:iconSize="24dp"
52+
app:shapeAppearance="?attr/shapeAppearanceCornerMedium"
53+
style="?attr/materialIconButtonFilledStyle"
54+
android:layout_marginEnd="32dp"
55+
android:contentDescription="@string/cat_docked_toolbar_add_button_description"
56+
app:icon="@drawable/ic_add_24px" />
57+
58+
<Button
59+
android:id="@+id/docked_toolbar_tab_button"
60+
android:layout_width="wrap_content"
61+
android:layout_height="wrap_content"
62+
android:layout_gravity="center"
63+
style="?attr/materialIconButtonStyle"
64+
android:contentDescription="@string/cat_docked_toolbar_tab_button_description"
65+
android:layout_marginEnd="32dp"
66+
app:icon="@drawable/ic_tab_24px" />
67+
68+
<Button
69+
android:id="@+id/docked_toolbar_button_overflow_button"
70+
android:layout_width="wrap_content"
71+
android:layout_height="wrap_content"
72+
android:layout_gravity="center"
73+
style="?attr/materialIconButtonStyle"
74+
android:contentDescription="@string/cat_docked_toolbar_overflow_button_description"
75+
app:icon="@drawable/abc_ic_menu_overflow_material" />
76+
77+
</LinearLayout>

catalog/java/io/material/catalog/tableofcontents/TocModule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
DatePickerDemoLandingFragment.Module.class,
7373
DialogDemoLandingFragment.Module.class,
7474
DividerFragment.Module.class,
75-
DockedToolbarFragment.Module.class,
76-
ElevationFragment.Module.class,
75+
DockedToolbarFragment.Module.class,
76+
ElevationFragment.Module.class,
7777
FabFragment.Module.class,
7878
FloatingToolbarFragment.Module.class,
7979
FontFragment.Module.class,

0 commit comments

Comments
 (0)