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

Merge "Extend rotation button timeout duration" into pi-dev

Browse Source
This commit is contained in:
Mike Digman
2018-05-21 20:09:24 +00:00
committed by Android (Google) Code Review
parent c81ed627ab d13e43b2bd
commit 4b0351d53f
2 changed files with 64 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
packages/SystemUI/res/drawable/ic_sysbar_rotate_button.xml
View File

@@ -29,7 +29,7 @@
</vector>
</aapt:attr>
<!-- Repeat all animations 3 times but don't fade out at the end -->
<!-- Repeat all animations 5 times but don't fade out at the end -->
<target android:name="root">
<aapt:attr name="android:animation">
<set android:ordering="sequentially">
@@ -67,6 +67,34 @@
android:valueFrom="0"
android:valueTo="1"
android:interpolator="@android:anim/linear_interpolator" />
<!-- Linear fade out -->
<objectAnimator android:propertyName="alpha"
android:duration="100"
android:startOffset="1700"
android:valueFrom="1"
android:valueTo="0"
android:interpolator="@android:anim/linear_interpolator"/>
<!-- Linear fade in-->
<objectAnimator android:propertyName="alpha"
android:duration="100"
android:startOffset="100"
android:valueFrom="0"
android:valueTo="1"
android:interpolator="@android:anim/linear_interpolator" />
<!-- Linear fade out -->
<objectAnimator android:propertyName="alpha"
android:duration="100"
android:startOffset="1700"
android:valueFrom="1"
android:valueTo="0"
android:interpolator="@android:anim/linear_interpolator"/>
<!-- Linear fade in-->
<objectAnimator android:propertyName="alpha"
android:duration="100"
android:startOffset="100"
android:valueFrom="0"
android:valueTo="1"
android:interpolator="@android:anim/linear_interpolator" />
</set>
</aapt:attr>
</target>
@@ -117,6 +145,40 @@
<pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/>
</aapt:attr>
</objectAnimator>
<!-- Reset rotation position for fade in -->
<objectAnimator android:propertyName="rotation"
android:startOffset="1300"
android:duration="100"
android:valueFrom="?attr/rotateButtonStartAngle"
android:valueTo="?attr/rotateButtonStartAngle"/>
<!-- Icon rotation with start timing offset after fade in -->
<objectAnimator android:propertyName="rotation"
android:duration="600"
android:valueFrom="?attr/rotateButtonStartAngle"
android:valueTo="?attr/rotateButtonEndAngle">
<aapt:attr name="android:interpolator">
<pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/>
</aapt:attr>
</objectAnimator>
<!-- Reset rotation position for fade in -->
<objectAnimator android:propertyName="rotation"
android:startOffset="1300"
android:duration="100"
android:valueFrom="?attr/rotateButtonStartAngle"
android:valueTo="?attr/rotateButtonStartAngle"/>
<!-- Icon rotation with start timing offset after fade in -->
<objectAnimator android:propertyName="rotation"
android:duration="600"
android:valueFrom="?attr/rotateButtonStartAngle"
android:valueTo="?attr/rotateButtonEndAngle">
<aapt:attr name="android:interpolator">
<pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/>
</aapt:attr>
</objectAnimator>
</set>
</aapt:attr>
</target>

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
View File

@@ -608,7 +608,7 @@ public class NavigationBarFragment extends Fragment implements Callbacks {
private int computeRotationProposalTimeout() {
if (mAccessibilityFeedbackEnabled) return 20000;
if (mHoveringRotationSuggestion) return 16000;
return 6000;
return 10000;
}
private boolean isRotateSuggestionIntroduced() {