-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Tokens][exFAB] Integrate component tokens.
PiperOrigin-RevId: 459541412
- Loading branch information
1 parent
be8e4e2
commit 2719859
Showing
7 changed files
with
216 additions
and
18 deletions.
There are no files selected for viewing
109 changes: 109 additions & 0 deletions
109
...ndroid/material/floatingactionbutton/res/animator/m3_extended_fab_state_list_animator.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| Copyright 2019 The Android Open Source Project | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
|
|
||
| <set xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <selector> | ||
|
|
||
| <!-- Pressed state --> | ||
| <item | ||
| android:state_enabled="true" | ||
| android:state_pressed="true"> | ||
| <set> | ||
| <objectAnimator | ||
| android:duration="@integer/mtrl_btn_anim_duration_ms" | ||
| android:propertyName="translationZ" | ||
| android:valueTo="@dimen/m3_comp_extended_fab_primary_pressed_container_elevation" | ||
| android:valueType="floatType"/> | ||
| <objectAnimator | ||
| android:duration="0" | ||
| android:propertyName="elevation" | ||
| android:valueTo="@dimen/m3_comp_extended_fab_primary_container_elevation" | ||
| android:valueType="floatType"/> | ||
| </set> | ||
| </item> | ||
|
|
||
| <!-- Hover state. This is triggered via mouse. --> | ||
| <item | ||
| android:state_enabled="true" | ||
| android:state_hovered="true"> | ||
| <set> | ||
| <objectAnimator | ||
| android:duration="@integer/mtrl_btn_anim_duration_ms" | ||
| android:propertyName="translationZ" | ||
| android:valueTo="@dimen/m3_comp_extended_fab_primary_hover_container_elevation" | ||
| android:valueType="floatType"/> | ||
| <objectAnimator | ||
| android:duration="0" | ||
| android:propertyName="elevation" | ||
| android:valueTo="@dimen/m3_comp_extended_fab_primary_container_elevation" | ||
| android:valueType="floatType"/> | ||
| </set> | ||
| </item> | ||
|
|
||
| <!-- Focused state. This is triggered via keyboard. --> | ||
| <item | ||
| android:state_enabled="true" | ||
| android:state_focused="true"> | ||
| <set> | ||
| <objectAnimator | ||
| android:duration="@integer/mtrl_btn_anim_duration_ms" | ||
| android:propertyName="translationZ" | ||
| android:valueTo="@dimen/m3_comp_extended_fab_primary_focus_container_elevation" | ||
| android:valueType="floatType"/> | ||
| <objectAnimator | ||
| android:duration="0" | ||
| android:propertyName="elevation" | ||
| android:valueTo="@dimen/m3_comp_extended_fab_primary_container_elevation" | ||
| android:valueType="floatType"/> | ||
| </set> | ||
| </item> | ||
|
|
||
| <!-- Base state (enabled, not pressed) --> | ||
| <item android:state_enabled="true"> | ||
| <set> | ||
| <objectAnimator | ||
| android:duration="@integer/mtrl_btn_anim_duration_ms" | ||
| android:propertyName="translationZ" | ||
| android:startDelay="@integer/mtrl_btn_anim_delay_ms" | ||
| android:valueTo="@dimen/mtrl_extended_fab_translation_z_base" | ||
| android:valueType="floatType"/> | ||
| <objectAnimator | ||
| android:duration="0" | ||
| android:propertyName="elevation" | ||
| android:valueTo="@dimen/m3_comp_extended_fab_primary_container_elevation" | ||
| android:valueType="floatType"/> | ||
| </set> | ||
| </item> | ||
|
|
||
| <!-- Disabled state --> | ||
| <item> | ||
| <set> | ||
| <objectAnimator | ||
| android:duration="0" | ||
| android:propertyName="translationZ" | ||
| android:valueTo="@dimen/mtrl_extended_fab_disabled_translation_z" | ||
| android:valueType="floatType"/> | ||
| <objectAnimator | ||
| android:duration="0" | ||
| android:propertyName="elevation" | ||
| android:valueTo="@dimen/mtrl_extended_fab_disabled_elevation" | ||
| android:valueType="floatType"/> | ||
| </set> | ||
| </item> | ||
|
|
||
| </selector> | ||
| </set> |
22 changes: 22 additions & 0 deletions
22
.../google/android/material/floatingactionbutton/res/color/m3_efab_ripple_color_selector.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| ~ Copyright (C) 2021 The Android Open Source Project | ||
| ~ | ||
| ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| ~ you may not use this file except in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| --> | ||
| <selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <item android:alpha="@dimen/m3_comp_extended_fab_primary_pressed_state_layer_opacity" android:color="?attr/colorOnContainer" android:state_pressed="true"/> | ||
| <item android:alpha="@dimen/m3_comp_extended_fab_primary_focus_state_layer_opacity" android:color="?attr/colorOnContainer" android:state_focused="true"/> | ||
| <item android:alpha="@dimen/m3_comp_extended_fab_primary_hover_state_layer_opacity" android:color="?attr/colorOnContainer" android:state_hovered="true"/> | ||
| <item android:alpha="@dimen/m3_ripple_default_alpha" android:color="?attr/colorOnContainer"/> | ||
| </selector> |
File renamed without changes.
File renamed without changes.
62 changes: 62 additions & 0 deletions
62
lib/java/com/google/android/material/floatingactionbutton/res/values/efab_tokens.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| ~ Copyright (C) 2022 The Android Open Source Project | ||
| ~ | ||
| ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| ~ you may not use this file except in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| --> | ||
| <!-- AUTOGENERATED FILE. DO NOT MODIFY. --> | ||
| <!-- Version: v0.99 --> | ||
|
|
||
| <resources> | ||
| <!-- Generated from token set (md.comp.extended-fab.primary) in default context. --> | ||
| <!-- Enabled - Container --> | ||
| <macro name="m3_comp_extended_fab_primary_container_color">?attr/colorPrimaryContainer</macro> | ||
| <macro name="m3_comp_extended_fab_primary_container_shape">?attr/shapeAppearanceCornerLarge</macro> | ||
| <dimen name="m3_comp_extended_fab_primary_container_height">56dp</dimen> | ||
| <dimen name="m3_comp_extended_fab_primary_container_elevation">@dimen/m3_sys_elevation_level3</dimen> | ||
| <!-- Enabled - Label text --> | ||
| <macro name="m3_comp_extended_fab_primary_label_text_type">?attr/textAppearanceLabelLarge</macro> | ||
| <!-- Enabled - Icon --> | ||
| <dimen name="m3_comp_extended_fab_primary_icon_size">24dp</dimen> | ||
| <macro name="m3_comp_extended_fab_primary_icon_color">?attr/colorOnPrimaryContainer</macro> | ||
| <!-- Hovered - Container --> | ||
| <dimen name="m3_comp_extended_fab_primary_hover_container_elevation">@dimen/m3_sys_elevation_level4</dimen> | ||
| <!-- Hovered - State layer --> | ||
| <dimen name="m3_comp_extended_fab_primary_hover_state_layer_opacity">@dimen/m3_sys_state_hover_state_layer_opacity</dimen> | ||
| <!-- Focused - Container --> | ||
| <dimen name="m3_comp_extended_fab_primary_focus_container_elevation">@dimen/m3_sys_elevation_level3</dimen> | ||
| <!-- Focused - State layer --> | ||
| <dimen name="m3_comp_extended_fab_primary_focus_state_layer_opacity">@dimen/m3_sys_state_focus_state_layer_opacity</dimen> | ||
| <!-- Pressed (rippple) - Container --> | ||
| <dimen name="m3_comp_extended_fab_primary_pressed_container_elevation">@dimen/m3_sys_elevation_level3</dimen> | ||
| <!-- Pressed (rippple) - State layer --> | ||
| <dimen name="m3_comp_extended_fab_primary_pressed_state_layer_opacity">@dimen/m3_sys_state_pressed_state_layer_opacity</dimen> | ||
|
|
||
| <!-- Generated from token set (md.comp.extended-fab.secondary) in default context. --> | ||
| <!-- Enabled - Container --> | ||
| <macro name="m3_comp_extended_fab_secondary_container_color">?attr/colorSecondaryContainer</macro> | ||
| <!-- Enabled - Icon --> | ||
| <macro name="m3_comp_extended_fab_secondary_icon_color">?attr/colorOnSecondaryContainer</macro> | ||
|
|
||
| <!-- Generated from token set (md.comp.extended-fab.tertiary) in default context. --> | ||
| <!-- Enabled - Container --> | ||
| <macro name="m3_comp_extended_fab_tertiary_container_color">?attr/colorTertiaryContainer</macro> | ||
| <!-- Enabled - Icon --> | ||
| <macro name="m3_comp_extended_fab_tertiary_icon_color">?attr/colorOnTertiaryContainer</macro> | ||
|
|
||
| <!-- Generated from token set (md.comp.extended-fab.surface) in default context. --> | ||
| <!-- Enabled - Container --> | ||
| <macro name="m3_comp_extended_fab_surface_container_color">?attr/colorSurface</macro> | ||
| <!-- Enabled - Icon --> | ||
| <macro name="m3_comp_extended_fab_surface_icon_color">?attr/colorPrimary</macro> | ||
| </resources> |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters