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

Delete secondary text in charging animation

Browse Source 
Secondary text was causing battery percentag
of wireless charging animation to be off center so remove it

Test: manual
Bug: 74946337
Change-Id: I0bf5ac142580011b24c12d4461b02885193d54d1
This commit is contained in:
Beverly
2018-03-15 11:24:21 -04:00
parent 8506821db9
commit 4564570820
2 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/res/layout/wireless_charging_layout.xml
View File

@@ -44,13 +44,6 @@
android:layout_gravity="center"
android:textSize="32sp"
android:textColor="?attr/wallpaperTextColor"/>
<TextView
android:id="@+id/wireless_charging_secondary_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="?attr/wallpaperTextColor"/>
</LinearLayout>
</FrameLayout>

12
packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java
View File

@@ -65,9 +65,6 @@ public class WirelessChargingLayout extends FrameLayout {
// amount of battery:
final TextView mPercentage = findViewById(R.id.wireless_charging_percentage);
// (optional) time until full charge if available
final TextView mSecondaryText = findViewById(R.id.wireless_charging_secondary_text);
if (batteryLevel != UNKNOWN_BATTERY_LEVEL) {
mPercentage.setText(NumberFormat.getPercentInstance().format(mBatteryLevel / 100f));
mPercentage.setAlpha(0);
@@ -110,17 +107,10 @@ public class WirelessChargingLayout extends FrameLayout {
circleFadeAnimator.setInterpolator(Interpolators.LINEAR);
circleFadeAnimator.setStartDelay(chargingAnimationFadeStartOffset);
// Animation Opacity: secondary text animation fades from 1 to 0 opacity
ValueAnimator secondaryTextFadeAnimator = ObjectAnimator.ofFloat(mSecondaryText, "alpha",
1, 0);
circleFadeAnimator.setDuration(chargingAnimationFadeDuration);
secondaryTextFadeAnimator.setInterpolator(Interpolators.LINEAR);
secondaryTextFadeAnimator.setStartDelay(chargingAnimationFadeStartOffset);
// play all animations together
AnimatorSet animatorSet = new AnimatorSet();
animatorSet.playTogether(textSizeAnimator, textOpacityAnimator, textFadeAnimator,
circleFadeAnimator, secondaryTextFadeAnimator);
circleFadeAnimator);
animatorSet.start();
}
}