drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 6693743: update animation ring for keyguard and search panel" into jb-dev

Browse Source
This commit is contained in:
Jim Miller
2012-06-19 16:41:50 -07:00
committed by Android (Google) Code Review
parent 1b36a68f60 a7da8afe6d
commit f7e820bbc9
7 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
View File

@ -360,7 +360,6 @@ public class GlowPadView extends View {
mHandleDrawable.setAlpha(0.0f); mHandleDrawable.setAlpha(0.0f);
deactivateTargets(); deactivateTargets();
showTargets(true); showTargets(true);
ping();
startBackgroundAnimation(INITIAL_SHOW_HANDLE_DURATION, 1.0f); startBackgroundAnimation(INITIAL_SHOW_HANDLE_DURATION, 1.0f);
setGrabbedState(OnTriggerListener.CENTER_HANDLE); setGrabbedState(OnTriggerListener.CENTER_HANDLE);
if (AccessibilityManager.getInstance(mContext).isEnabled()) { if (AccessibilityManager.getInstance(mContext).isEnabled()) {
@ -484,11 +483,7 @@ public class GlowPadView extends View {
final int duration = animate ? HIDE_ANIMATION_DURATION : 0; final int duration = animate ? HIDE_ANIMATION_DURATION : 0;
final int delay = animate ? HIDE_ANIMATION_DELAY : 0; final int delay = animate ? HIDE_ANIMATION_DELAY : 0;
// TODO: add an attribute for this. For now we'll show the expand for navbar, but not final float targetScale = expanded ?
// keyguard.
final boolean expandDisabled = !mAlwaysTrackFinger;
final float targetScale = (expanded || expandDisabled) ?
TARGET_SCALE_EXPANDED : TARGET_SCALE_COLLAPSED; TARGET_SCALE_EXPANDED : TARGET_SCALE_COLLAPSED;
final int length = mTargetDrawables.size(); final int length = mTargetDrawables.size();
final TimeInterpolator interpolator = Ease.Cubic.easeOut; final TimeInterpolator interpolator = Ease.Cubic.easeOut;
@ -504,7 +499,7 @@ public class GlowPadView extends View {
"onUpdate", mUpdateListener)); "onUpdate", mUpdateListener));
} }
final float ringScaleTarget = (expanded || expandDisabled) ? final float ringScaleTarget = expanded ?
RING_SCALE_EXPANDED : RING_SCALE_COLLAPSED; RING_SCALE_EXPANDED : RING_SCALE_COLLAPSED;
mTargetAnimations.add(Tweener.to(mOuterRing, duration, mTargetAnimations.add(Tweener.to(mOuterRing, duration,
"ease", interpolator, "ease", interpolator,

2
core/res/res/drawable/ic_lockscreen_outerring.xml
View File

@ -20,5 +20,5 @@
<size android:height="@dimen/keyguard_lockscreen_outerring_diameter" <size android:height="@dimen/keyguard_lockscreen_outerring_diameter"
android:width="@dimen/keyguard_lockscreen_outerring_diameter" /> android:width="@dimen/keyguard_lockscreen_outerring_diameter" />
<solid android:color="#00000000" /> <solid android:color="#00000000" />
<stroke android:color="#00000000" android:width="2dp" /> <stroke android:color="#1affffff" android:width="2dp" />
</shape> </shape>

2
packages/SystemUI/res/drawable/navbar_search_outerring.xml
View File

@ -19,5 +19,5 @@
<size android:height="@dimen/navbar_search_outerring_diameter" <size android:height="@dimen/navbar_search_outerring_diameter"
android:width="@dimen/navbar_search_outerring_diameter" /> android:width="@dimen/navbar_search_outerring_diameter" />
<solid android:color="#00000000" /> <solid android:color="#00000000" />
<stroke android:color="#00000000" android:width="2dp" /> <stroke android:color="#40ffffff" android:width="2dp" />
</shape> </shape>

2
packages/SystemUI/res/layout-land/status_bar_search_panel.xml
View File

@ -54,7 +54,7 @@
prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" prvandroid:outerRadius="@dimen/navbar_search_outerring_radius"
prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius"
prvandroid:snapMargin="@dimen/navbar_search_snap_margin" prvandroid:snapMargin="@dimen/navbar_search_snap_margin"
prvandroid:feedbackCount="1" prvandroid:feedbackCount="0"
prvandroid:vibrationDuration="@integer/config_vibration_duration" prvandroid:vibrationDuration="@integer/config_vibration_duration"
prvandroid:alwaysTrackFinger="true" prvandroid:alwaysTrackFinger="true"
prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius"

2
packages/SystemUI/res/layout-port/status_bar_search_panel.xml
View File

@ -54,7 +54,7 @@
prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" prvandroid:outerRadius="@dimen/navbar_search_outerring_radius"
prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius"
prvandroid:snapMargin="@dimen/navbar_search_snap_margin" prvandroid:snapMargin="@dimen/navbar_search_snap_margin"
prvandroid:feedbackCount="1" prvandroid:feedbackCount="0"
prvandroid:vibrationDuration="@integer/config_vibration_duration" prvandroid:vibrationDuration="@integer/config_vibration_duration"
prvandroid:alwaysTrackFinger="true" prvandroid:alwaysTrackFinger="true"
prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius"

2
packages/SystemUI/res/layout-sw600dp/status_bar_search_panel.xml
View File

@ -40,7 +40,7 @@
prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" prvandroid:outerRadius="@dimen/navbar_search_outerring_radius"
prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius"
prvandroid:snapMargin="@dimen/navbar_search_snap_margin" prvandroid:snapMargin="@dimen/navbar_search_snap_margin"
prvandroid:feedbackCount="1" prvandroid:feedbackCount="0"
prvandroid:vibrationDuration="@integer/config_vibration_duration" prvandroid:vibrationDuration="@integer/config_vibration_duration"
prvandroid:alwaysTrackFinger="true" prvandroid:alwaysTrackFinger="true"
prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius"

2
packages/SystemUI/res/layout-sw720dp/status_bar_search_panel.xml
View File

@ -41,7 +41,7 @@
prvandroid:outerRadius="@dimen/navbar_search_outerring_radius" prvandroid:outerRadius="@dimen/navbar_search_outerring_radius"
prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius" prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius"
prvandroid:snapMargin="@dimen/navbar_search_snap_margin" prvandroid:snapMargin="@dimen/navbar_search_snap_margin"
prvandroid:feedbackCount="1" prvandroid:feedbackCount="0"
prvandroid:vibrationDuration="@integer/config_vibration_duration" prvandroid:vibrationDuration="@integer/config_vibration_duration"
prvandroid:alwaysTrackFinger="true" prvandroid:alwaysTrackFinger="true"
prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius" prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius"