diff options
| -rw-r--r-- | res/values-ja/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/incallui/CallCardFragment.java | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 2943e339..67b85ddb 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -20,7 +20,7 @@ <string name="phoneAppLabel" product="default" msgid="906161039445636857">"電話"</string> <string name="onHold" msgid="9035493194749959955">"保留中"</string> <string name="unknown" msgid="6878797917991465859">"通知不可能"</string> - <string name="private_num" msgid="6713286113000232309">"非通知"</string> + <string name="private_num" msgid="6713286113000232309">"非通知設定"</string> <string name="payphone" msgid="4793877574636445118">"公衆電話"</string> <string name="confCall" msgid="1904840547188336828">"グループ通話"</string> <string name="call_lost" msgid="6183862117003999578">"通話が遮断されました"</string> diff --git a/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java index dc92ac3e..fb0ef75a 100644 --- a/src/com/android/incallui/CallCardFragment.java +++ b/src/com/android/incallui/CallCardFragment.java @@ -586,6 +586,8 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr } else { mCallStateLabel.startAnimation(mPulseAnimation); } + } else { + mCallStateLabel.clearAnimation(); } if (callStateIcon != null) { @@ -606,10 +608,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr ((AnimationDrawable) callStateIcon).start(); } } else { - Animation callStateIconAnimation = mCallStateIcon.getAnimation(); - if (callStateIconAnimation != null) { - callStateIconAnimation.cancel(); - } + mCallStateIcon.clearAnimation(); // Invoke setAlpha(float) instead of setAlpha(int) to set the view's alpha. This is // needed because the pulse animation operates on the view alpha. |