diff options
Diffstat (limited to 'java')
18 files changed, 82 insertions, 2 deletions
diff --git a/java/com/android/incallui/incall/impl/ButtonController.java b/java/com/android/incallui/incall/impl/ButtonController.java index cefbd723b..5e37a492b 100644 --- a/java/com/android/incallui/incall/impl/ButtonController.java +++ b/java/com/android/incallui/incall/impl/ButtonController.java @@ -16,6 +16,7 @@ package com.android.incallui.incall.impl; +import android.graphics.drawable.AnimationDrawable; import android.support.annotation.CallSuper; import android.support.annotation.DrawableRes; import android.support.annotation.NonNull; @@ -569,11 +570,14 @@ interface ButtonController { InCallButtonIds.BUTTON_SWAP_SIM, R.string.incall_content_description_swap_sim, R.string.incall_label_swap_sim, - R.drawable.quantum_ic_swap_calls_white_36); + R.drawable.ic_sim_change_white); } @Override public void onClick(View view) { + AnimationDrawable drawable = (AnimationDrawable) button.getIconDrawable(); + drawable.stop(); // animation is one shot, stop it so it can be started again. + drawable.start(); delegate.swapSimClicked(); } } diff --git a/java/com/android/incallui/incall/impl/CheckableLabeledButton.java b/java/com/android/incallui/incall/impl/CheckableLabeledButton.java index 325c3a92a..ca018acc2 100644 --- a/java/com/android/incallui/incall/impl/CheckableLabeledButton.java +++ b/java/com/android/incallui/incall/impl/CheckableLabeledButton.java @@ -47,6 +47,7 @@ public class CheckableLabeledButton extends LinearLayout implements Checkable { private boolean isChecked; private OnCheckedChangeListener onCheckedChangeListener; private ImageView iconView; + @DrawableRes private int iconResource = 0; private TextView labelView; private Drawable background; private Drawable backgroundMore; @@ -135,8 +136,15 @@ public class CheckableLabeledButton extends LinearLayout implements Checkable { new int[] {color, Color.WHITE})); } + public Drawable getIconDrawable() { + return iconView.getDrawable(); + } + public void setIconDrawable(@DrawableRes int drawableRes) { - iconView.setImageResource(drawableRes); + if (iconResource != drawableRes) { + iconView.setImageResource(drawableRes); + iconResource = drawableRes; + } } public void setLabelText(@StringRes int stringRes) { diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_00.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_00.png Binary files differnew file mode 100644 index 000000000..4c8b33f95 --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_00.png diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_01.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_01.png Binary files differnew file mode 100644 index 000000000..910177920 --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_01.png diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_02.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_02.png Binary files differnew file mode 100644 index 000000000..92a27eed2 --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_02.png diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_03.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_03.png Binary files differnew file mode 100644 index 000000000..484058f22 --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_03.png diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_04.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_04.png Binary files differnew file mode 100644 index 000000000..348ae927a --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_04.png diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_05.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_05.png Binary files differnew file mode 100644 index 000000000..011915a93 --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_05.png diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_06.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_06.png Binary files differnew file mode 100644 index 000000000..c1cc0d6d7 --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_06.png diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_07.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_07.png Binary files differnew file mode 100644 index 000000000..75233db73 --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_07.png diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_08.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_08.png Binary files differnew file mode 100644 index 000000000..2918e1a4b --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_08.png diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_09.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_09.png Binary files differnew file mode 100644 index 000000000..7e927674c --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_09.png diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_10.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_10.png Binary files differnew file mode 100644 index 000000000..008931431 --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_10.png diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_11.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_11.png Binary files differnew file mode 100644 index 000000000..f66a6b669 --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_11.png diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_12.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_12.png Binary files differnew file mode 100644 index 000000000..9303d9596 --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_12.png diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_13.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_13.png Binary files differnew file mode 100644 index 000000000..d2bef6e77 --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_13.png diff --git a/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_14.png b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_14.png Binary files differnew file mode 100644 index 000000000..a5434ecdc --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable-xxxhdpi/ic_sim_change_white_14.png diff --git a/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_white.xml b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_white.xml new file mode 100644 index 000000000..00b1b7ace --- /dev/null +++ b/java/com/android/incallui/incall/impl/res/drawable/ic_sim_change_white.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2017 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<animation-list xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/ic_sim_change_white" + android:oneshot="true"> + <item + android:drawable="@drawable/ic_sim_change_white_00" + android:duration="33"/> + <item + android:drawable="@drawable/ic_sim_change_white_01" + android:duration="33"/> + <item + android:drawable="@drawable/ic_sim_change_white_02" + android:duration="33"/> + <item + android:drawable="@drawable/ic_sim_change_white_03" + android:duration="33"/> + <item + android:drawable="@drawable/ic_sim_change_white_04" + android:duration="33"/> + <item + android:drawable="@drawable/ic_sim_change_white_05" + android:duration="33"/> + <item + android:drawable="@drawable/ic_sim_change_white_06" + android:duration="33"/> + <item + android:drawable="@drawable/ic_sim_change_white_07" + android:duration="33"/> + <item + android:drawable="@drawable/ic_sim_change_white_08" + android:duration="33"/> + <item + android:drawable="@drawable/ic_sim_change_white_09" + android:duration="33"/> + <item + android:drawable="@drawable/ic_sim_change_white_10" + android:duration="33"/> + <item + android:drawable="@drawable/ic_sim_change_white_11" + android:duration="33"/> + <item + android:drawable="@drawable/ic_sim_change_white_12" + android:duration="33"/> + <item + android:drawable="@drawable/ic_sim_change_white_13" + android:duration="33"/> + <item + android:drawable="@drawable/ic_sim_change_white_14" + android:duration="33"/> + <item + android:drawable="@drawable/ic_sim_change_white_00" + android:duration="33"/> +</animation-list>
\ No newline at end of file |