chore(merging-upstream): bunch of conflicts to solve

This commit is contained in:
LucasGGamerM
2024-02-14 20:50:54 -03:00
parent 8dffbff97c
commit 0af8dbf09b
2000 changed files with 52238 additions and 10716 deletions

View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false">
<set>
<objectAnimator
android:propertyName="elevation"
android:valueTo="0dp"
android:duration="0"
android:valueType="floatType" />
</set>
</item>
<item android:state_hovered="true">
<set>
<objectAnimator
android:propertyName="elevation"
android:valueTo="2dp"
android:duration="@android:integer/config_shortAnimTime"
android:valueType="floatType" />
</set>
</item>
<item>
<set>
<objectAnimator
android:propertyName="elevation"
android:valueTo="1dp"
android:duration="@android:integer/config_shortAnimTime"
android:valueType="floatType" />
</set>
</item>
</selector>