Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improve animation from keyguard shortcut" into tm-qpr-dev

Browse Source
This commit is contained in:
Jordan Demeulenaere
2023-01-19 09:10:59 +00:00
committed by Android (Google) Code Review
parent 0ddb66c913 e1e5f29d68
commit 3d5c9f008e
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/animation/src/com/android/systemui/animation/GhostedViewLaunchAnimatorController.kt
View File

@@ -26,6 +26,7 @@ import android.graphics.drawable.Drawable
import android.graphics.drawable.GradientDrawable import android.graphics.drawable.GradientDrawable
import android.graphics.drawable.InsetDrawable import android.graphics.drawable.InsetDrawable
import android.graphics.drawable.LayerDrawable import android.graphics.drawable.LayerDrawable
import android.graphics.drawable.StateListDrawable
import android.util.Log import android.util.Log
import android.view.GhostView import android.view.GhostView
import android.view.View import android.view.View
@@ -341,6 +342,10 @@ open class GhostedViewLaunchAnimatorController @JvmOverloads constructor(
} }
} }
if (drawable is StateListDrawable) {
return findGradientDrawable(drawable.current)
}
return null return null
} }
} }

23
packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml
View File

@@ -27,22 +27,26 @@
android:top="3dp" android:top="3dp"
android:right="3dp" android:right="3dp"
android:bottom="3dp"> android:bottom="3dp">
<shape android:shape="oval"> <!-- We make the shapes a rounded rectangle instead of an oval so that it can animate -->
<!-- properly into an app/dialog. -->
<shape android:shape="rectangle">
<solid android:color="?androidprv:attr/colorSurface"/> <solid android:color="?androidprv:attr/colorSurface"/>
<size <size
android:width="@dimen/keyguard_affordance_width" android:width="@dimen/keyguard_affordance_fixed_width"
android:height="@dimen/keyguard_affordance_height"/> android:height="@dimen/keyguard_affordance_fixed_height"/>
<corners android:radius="@dimen/keyguard_affordance_fixed_radius"/>
</shape> </shape>
</item> </item>
<item> <item>
<shape android:shape="oval"> <shape android:shape="rectangle">
<stroke <stroke
android:color="@color/control_primary_text" android:color="@color/control_primary_text"
android:width="2dp"/> android:width="2dp"/>
<size <size
android:width="@dimen/keyguard_affordance_width" android:width="@dimen/keyguard_affordance_fixed_width"
android:height="@dimen/keyguard_affordance_height"/> android:height="@dimen/keyguard_affordance_fixed_height"/>
<corners android:radius="@dimen/keyguard_affordance_fixed_radius"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>
@@ -55,11 +59,12 @@
android:top="3dp" android:top="3dp"
android:right="3dp" android:right="3dp"
android:bottom="3dp"> android:bottom="3dp">
<shape android:shape="oval"> <shape android:shape="rectangle">
<solid android:color="?androidprv:attr/colorSurface"/> <solid android:color="?androidprv:attr/colorSurface"/>
<size <size
android:width="@dimen/keyguard_affordance_width" android:width="@dimen/keyguard_affordance_fixed_width"
android:height="@dimen/keyguard_affordance_height"/> android:height="@dimen/keyguard_affordance_fixed_height"/>
<corners android:radius="@dimen/keyguard_affordance_fixed_radius"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

4
packages/SystemUI/res/values-sw600dp/dimens.xml
View File

@@ -30,10 +30,6 @@
<!-- Margin on the left side of the carrier text on Keyguard --> <!-- Margin on the left side of the carrier text on Keyguard -->
<dimen name="keyguard_carrier_text_margin">24dp</dimen> <dimen name="keyguard_carrier_text_margin">24dp</dimen>
<!-- The width/height of the phone/camera/unlock icon on keyguard. -->
<dimen name="keyguard_affordance_height">80dp</dimen>
<dimen name="keyguard_affordance_width">120dp</dimen>
<!-- Screen pinning request width --> <!-- Screen pinning request width -->
<dimen name="screen_pinning_request_width">400dp</dimen> <dimen name="screen_pinning_request_width">400dp</dimen>
<!-- Screen pinning request bottom button circle widths --> <!-- Screen pinning request bottom button circle widths -->

4
packages/SystemUI/res/values/dimens.xml
View File

@@ -762,12 +762,10 @@
<dimen name="go_to_full_shade_appearing_translation">200dp</dimen> <dimen name="go_to_full_shade_appearing_translation">200dp</dimen>
<!-- The width/height of the keyguard bottom area icon view on keyguard. --> <!-- The width/height of the keyguard bottom area icon view on keyguard. -->
<dimen name="keyguard_affordance_height">48dp</dimen>
<dimen name="keyguard_affordance_width">48dp</dimen>
<dimen name="keyguard_affordance_fixed_height">48dp</dimen> <dimen name="keyguard_affordance_fixed_height">48dp</dimen>
<dimen name="keyguard_affordance_fixed_width">48dp</dimen> <dimen name="keyguard_affordance_fixed_width">48dp</dimen>
<dimen name="keyguard_affordance_fixed_radius">24dp</dimen> <dimen name="keyguard_affordance_fixed_radius">24dp</dimen>
<!-- Amount the button should shake when it's not long-pressed for long enough. --> <!-- Amount the button should shake when it's not long-pressed for long enough. -->
<dimen name="keyguard_affordance_shake_amplitude">8dp</dimen> <dimen name="keyguard_affordance_shake_amplitude">8dp</dimen>