Skip to content

Commit d408906

Browse files
pekingmeleticiarossi
authored andcommitted
[Button] Updated the icon in catalog and test to filled for non-toggle buttons.
PiperOrigin-RevId: 667721880
1 parent 04804eb commit d408906

File tree

69 files changed

+578
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+578
-156
lines changed

catalog/java/io/material/catalog/assets/res/drawable/ic_3d_rotation_24px.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
-->
1616

1717
<vector xmlns:android="http://schemas.android.com/apk/res/android"
18+
xmlns:tools="http://schemas.android.com/tools"
1819
android:width="24dp"
1920
android:height="24dp"
2021
android:tint="?attr/colorControlNormal"
2122
android:viewportHeight="24.0"
22-
android:viewportWidth="24.0">
23+
android:viewportWidth="24.0"
24+
tools:ignore="NewApi,VectorPath">
2325
<path
2426
android:fillColor="@android:color/white"
2527
android:pathData="M7.52,21.48C4.25,19.94 1.91,16.76 1.55,13L0.05,13C0.56,19.16 5.71,24 12,24l0.66,-0.03 -3.81,-3.81 -1.33,1.32zM8.41,14.96c-0.19,0 -0.37,-0.03 -0.52,-0.08 -0.16,-0.06 -0.29,-0.13 -0.4,-0.24 -0.11,-0.1 -0.2,-0.22 -0.26,-0.37 -0.06,-0.14 -0.09,-0.3 -0.09,-0.47h-1.3c0,0.36 0.07,0.68 0.21,0.95 0.14,0.27 0.33,0.5 0.56,0.69 0.24,0.18 0.51,0.32 0.82,0.41 0.3,0.1 0.62,0.15 0.96,0.15 0.37,0 0.72,-0.05 1.03,-0.15 0.32,-0.1 0.6,-0.25 0.83,-0.44s0.42,-0.43 0.55,-0.72c0.13,-0.29 0.2,-0.61 0.2,-0.97 0,-0.19 -0.02,-0.38 -0.07,-0.56 -0.05,-0.18 -0.12,-0.35 -0.23,-0.51 -0.1,-0.16 -0.24,-0.3 -0.4,-0.43 -0.17,-0.13 -0.37,-0.23 -0.61,-0.31 0.2,-0.09 0.37,-0.2 0.52,-0.33 0.15,-0.13 0.27,-0.27 0.37,-0.42 0.1,-0.15 0.17,-0.3 0.22,-0.46 0.05,-0.16 0.07,-0.32 0.07,-0.48 0,-0.36 -0.06,-0.68 -0.18,-0.96 -0.12,-0.28 -0.29,-0.51 -0.51,-0.69 -0.2,-0.19 -0.47,-0.33 -0.77,-0.43C9.1,8.05 8.76,8 8.39,8c-0.36,0 -0.69,0.05 -1,0.16 -0.3,0.11 -0.57,0.26 -0.79,0.45 -0.21,0.19 -0.38,0.41 -0.51,0.67 -0.12,0.26 -0.18,0.54 -0.18,0.85h1.3c0,-0.17 0.03,-0.32 0.09,-0.45s0.14,-0.25 0.25,-0.34c0.11,-0.09 0.23,-0.17 0.38,-0.22 0.15,-0.05 0.3,-0.08 0.48,-0.08 0.4,0 0.7,0.1 0.89,0.31 0.19,0.2 0.29,0.49 0.29,0.86 0,0.18 -0.03,0.34 -0.08,0.49 -0.05,0.15 -0.14,0.27 -0.25,0.37 -0.11,0.1 -0.25,0.18 -0.41,0.24 -0.16,0.06 -0.36,0.09 -0.58,0.09L7.5,11.4v1.03h0.77c0.22,0 0.42,0.02 0.6,0.07s0.33,0.13 0.45,0.23c0.12,0.11 0.22,0.24 0.29,0.4 0.07,0.16 0.1,0.35 0.1,0.57 0,0.41 -0.12,0.72 -0.35,0.93 -0.23,0.23 -0.55,0.33 -0.95,0.33zM16.96,9.04c-0.32,-0.33 -0.7,-0.59 -1.14,-0.77 -0.43,-0.18 -0.92,-0.27 -1.46,-0.27L12,8v8h2.3c0.55,0 1.06,-0.09 1.51,-0.27 0.45,-0.18 0.84,-0.43 1.16,-0.76 0.32,-0.33 0.57,-0.73 0.74,-1.19 0.17,-0.47 0.26,-0.99 0.26,-1.57v-0.4c0,-0.58 -0.09,-1.1 -0.26,-1.57 -0.18,-0.47 -0.43,-0.87 -0.75,-1.2zM16.57,12.2c0,0.42 -0.05,0.79 -0.14,1.13 -0.1,0.33 -0.24,0.62 -0.43,0.85 -0.19,0.23 -0.43,0.41 -0.71,0.53 -0.29,0.12 -0.62,0.18 -0.99,0.18h-0.91L13.39,9.12h0.97c0.72,0 1.27,0.23 1.64,0.69 0.38,0.46 0.57,1.12 0.57,1.99v0.4zM12,0l-0.66,0.03 3.81,3.81 1.33,-1.33c3.27,1.55 5.61,4.72 5.96,8.48h1.5C23.44,4.84 18.29,0 12,0z"/>

catalog/java/io/material/catalog/assets/res/drawable/ic_accelerator_24px.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
-->
1616

1717
<vector xmlns:android="http://schemas.android.com/apk/res/android"
18+
xmlns:tools="http://schemas.android.com/tools"
1819
android:width="24dp"
1920
android:height="24dp"
2021
android:tint="?attr/colorControlNormal"
2122
android:viewportHeight="24.0"
22-
android:viewportWidth="24.0">
23+
android:viewportWidth="24.0"
24+
tools:ignore="NewApi">
2325
<path
2426
android:fillColor="@android:color/white"
2527
android:pathData="M12,22l10,-10L12,2 8.67,5.33l6.65,6.65 -6.67,6.67zM5.3,15.32l3.35,-3.34 -3.31,-3.3L2,12.02z"/>

catalog/java/io/material/catalog/assets/res/drawable/ic_add_24px.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
limitations under the License.
1515
-->
1616
<vector xmlns:android="http://schemas.android.com/apk/res/android"
17+
xmlns:tools="http://schemas.android.com/tools"
1718
android:width="24dp"
1819
android:height="24dp"
1920
android:viewportWidth="24.0"
20-
android:viewportHeight="24.0">
21+
android:viewportHeight="24.0"
22+
tools:ignore="NewApi">
2123
<path
2224
android:fillColor="@android:color/white"
2325
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!--
2+
Copyright 2024 The Android Open Source Project
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
17+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
18+
<item android:state_checkable="true" android:state_checked="false"
19+
android:drawable="@drawable/ic_add_circle_default_24px"/>
20+
<item android:drawable="@drawable/ic_add_circle_fill_24px"/>
21+
</selector>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<!--
2+
Copyright 2024 The Android Open Source Project
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
http://www.apache.org/licenses/LICENSE-2.0
7+
Unless required by applicable law or agreed to in writing, software
8+
distributed under the License is distributed on an "AS IS" BASIS,
9+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10+
See the License for the specific language governing permissions and
11+
limitations under the License.
12+
-->
13+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
14+
android:width="24dp"
15+
android:height="24dp"
16+
android:viewportWidth="960"
17+
android:viewportHeight="960"
18+
android:tint="?attr/colorControlNormal">
19+
<path
20+
android:fillColor="@android:color/white"
21+
android:pathData="M440,680L520,680L520,520L680,520L680,440L520,440L520,280L440,280L440,440L280,440L280,520L440,520L440,680ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
22+
</vector>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<!--
2+
Copyright 2024 The Android Open Source Project
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
http://www.apache.org/licenses/LICENSE-2.0
7+
Unless required by applicable law or agreed to in writing, software
8+
distributed under the License is distributed on an "AS IS" BASIS,
9+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10+
See the License for the specific language governing permissions and
11+
limitations under the License.
12+
-->
13+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
14+
android:width="24dp"
15+
android:height="24dp"
16+
android:viewportWidth="960"
17+
android:viewportHeight="960"
18+
android:tint="?attr/colorControlNormal">
19+
<path
20+
android:fillColor="@android:color/white"
21+
android:pathData="M440,680L520,680L520,520L680,520L680,440L520,440L520,280L440,280L440,440L280,440L280,520L440,520L440,680ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Z"/>
22+
</vector>

catalog/java/io/material/catalog/assets/res/drawable/ic_close_vd_theme_24px.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
limitations under the License.
1515
-->
1616
<vector xmlns:android="http://schemas.android.com/apk/res/android"
17+
xmlns:tools="http://schemas.android.com/tools"
1718
android:width="24dp"
1819
android:height="24dp"
1920
android:viewportWidth="24.0"
2021
android:viewportHeight="24.0"
21-
android:tint="?attr/colorControlNormal">
22+
android:tint="?attr/colorControlNormal"
23+
tools:ignore="NewApi">
2224
<path
2325
android:fillColor="@android:color/white"
2426
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>

catalog/java/io/material/catalog/assets/res/drawable/ic_colors_24px.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
limitations under the License.
1515
-->
1616
<vector xmlns:android="http://schemas.android.com/apk/res/android"
17+
xmlns:tools="http://schemas.android.com/tools"
1718
android:width="24dp"
1819
android:height="24dp"
1920
android:viewportWidth="24.0"
20-
android:viewportHeight="24.0">
21+
android:viewportHeight="24.0"
22+
tools:ignore="NewApi">
2123
<path
2224
android:fillColor="#FF000000"
2325
android:pathData="M-278.33,-154.17h76v76h-76z"/>

catalog/java/io/material/catalog/assets/res/drawable/ic_colors_vd_theme_24px.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
limitations under the License.
1515
-->
1616
<vector xmlns:android="http://schemas.android.com/apk/res/android"
17+
xmlns:tools="http://schemas.android.com/tools"
1718
android:width="24dp"
1819
android:height="24dp"
1920
android:viewportWidth="24.0"
2021
android:viewportHeight="24.0"
21-
android:tint="?attr/colorControlNormal">
22+
android:tint="?attr/colorControlNormal"
23+
tools:ignore="NewApi">
2224
<path
2325
android:fillColor="@android:color/white"
2426
android:pathData="M-278.33,-154.17h76v76h-76z"/>

catalog/java/io/material/catalog/assets/res/drawable/ic_components_24px.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
limitations under the License.
1515
-->
1616
<vector xmlns:android="http://schemas.android.com/apk/res/android"
17+
xmlns:tools="http://schemas.android.com/tools"
1718
android:height="24dp"
1819
android:viewportHeight="24"
1920
android:viewportWidth="24"
20-
android:width="24dp">
21+
android:width="24dp"
22+
tools:ignore="NewApi">
2123
<path
2224
android:fillColor="#FF000000"
2325
android:pathData="M16,8.1V2H2v14h6.1c0.5,3.4,3.4,6,6.9,6c3.9,0,7-3.1,7-7C22,11.5,19.4,8.6,16,8.1z

0 commit comments

Comments
 (0)