diff --git a/packages/SystemUI/res/drawable/tv_circle_white_translucent.xml b/packages/SystemUI/res/drawable/tv_circle_white_translucent.xml deleted file mode 100644 index 55d21de00ca30..0000000000000 --- a/packages/SystemUI/res/drawable/tv_circle_white_translucent.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/tv_circle_dark.xml b/packages/SystemUI/res/drawable/tv_rect_shadow_rounded.xml similarity index 74% rename from packages/SystemUI/res/drawable/tv_circle_dark.xml rename to packages/SystemUI/res/drawable/tv_rect_shadow_rounded.xml index d1ba8e71ec313..93f8724b22a99 100644 --- a/packages/SystemUI/res/drawable/tv_circle_dark.xml +++ b/packages/SystemUI/res/drawable/tv_rect_shadow_rounded.xml @@ -16,9 +16,10 @@ --> + android:shape="rectangle"> - + + + \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/tv_ring_white.xml b/packages/SystemUI/res/drawable/tv_ring_white.xml deleted file mode 100644 index 0f7cc1082f715..0000000000000 --- a/packages/SystemUI/res/drawable/tv_ring_white.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/packages/SystemUI/res/layout/tv_audio_recording_indicator.xml b/packages/SystemUI/res/layout/tv_audio_recording_indicator.xml index 1d2340dadb8a6..f9336a5403763 100644 --- a/packages/SystemUI/res/layout/tv_audio_recording_indicator.xml +++ b/packages/SystemUI/res/layout/tv_audio_recording_indicator.xml @@ -19,7 +19,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - android:padding="32dp"> + android:padding="12dp"> + android:layout_width="wrap_content" + android:layout_height="match_parent"> - - + android:layout_width="34dp" + android:layout_height="24dp" + android:layout_gravity="center" + android:background="@drawable/tv_rect_shadow_rounded"> - - - - diff --git a/packages/SystemUI/res/values/colors_tv.xml b/packages/SystemUI/res/values/colors_tv.xml index 53cd9716c98e5..c92762c017f4c 100644 --- a/packages/SystemUI/res/values/colors_tv.xml +++ b/packages/SystemUI/res/values/colors_tv.xml @@ -24,7 +24,8 @@ #FF3C4043 - #4DFFFFFF + #CC000000 + #33FFFFFF #FFCC0000 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tv/micdisclosure/AudioRecordingDisclosureBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tv/micdisclosure/AudioRecordingDisclosureBar.java index 65f533e6a23d2..e3eed35f04837 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tv/micdisclosure/AudioRecordingDisclosureBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tv/micdisclosure/AudioRecordingDisclosureBar.java @@ -22,7 +22,6 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; -import android.animation.PropertyValuesHolder; import android.annotation.IntDef; import android.annotation.UiThread; import android.content.Context; @@ -94,8 +93,6 @@ public class AudioRecordingDisclosureBar implements private static final int ANIMATION_DURATION = 600; private static final int MAXIMIZED_DURATION = 3000; - private static final int PULSE_BIT_DURATION = 1000; - private static final float PULSE_SCALE = 1.25f; private final Context mContext; private boolean mIsEnabledInSettings; @@ -366,7 +363,6 @@ public class AudioRecordingDisclosureBar implements @Override public void onAnimationEnd(Animator animation) { - startPulsatingAnimation(); if (mRevealRecordingPackages) { onExpanded(); } else { @@ -529,20 +525,6 @@ public class AudioRecordingDisclosureBar implements mBgEnd = null; } - @UiThread - private void startPulsatingAnimation() { - final View pulsatingView = mIconTextsContainer.findViewById(R.id.pulsating_circle); - final ObjectAnimator animator = - ObjectAnimator.ofPropertyValuesHolder( - pulsatingView, - PropertyValuesHolder.ofFloat(View.SCALE_X, PULSE_SCALE), - PropertyValuesHolder.ofFloat(View.SCALE_Y, PULSE_SCALE)); - animator.setDuration(PULSE_BIT_DURATION); - animator.setRepeatCount(ObjectAnimator.INFINITE); - animator.setRepeatMode(ObjectAnimator.REVERSE); - animator.start(); - } - private String[] getGlobalStringArray(String setting) { String result = Settings.Global.getString(mContext.getContentResolver(), setting); return TextUtils.isEmpty(result) ? new String[0] : result.split(",");