Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a9d0f77 authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov
Browse files

Refresh mic disclosure indicator 

Remove the pulsating animation.
Move the indicator to 12dp from top/right edge.
Scale down the indicator.

Bug: 162513710
Test: adb shell appops start com.google.android.katniss 27
Change-Id: Ia4be3c2ff49952d53ac3d98007f00e44bbd16c84
parent 7921255f

packages/SystemUI/res/drawable/tv_circle_white_translucent.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2019 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.

  -->



<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval">



  <solid

      android:color="@color/tv_audio_recording_indicator_pulse" />



</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/tv_circle_dark.xml→packages/SystemUI/res/drawable/tv_rect_shadow_rounded.xml

+4 −3
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ 
  -->



<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval">

       android:shape="rectangle">



  <solid

      android:color="@color/tv_audio_recording_indicator_background" />

    <corners android:radius="20dp"/>

    <solid android:color="@color/tv_audio_recording_indicator_icon_background"/>

    <stroke android:width="1dp" android:color="@color/tv_audio_recording_indicator_stroke"/>



</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/tv_ring_white.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2019 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.

  -->



<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval">



  <stroke

      android:width="1dp"

      android:color="@android:color/white" />



</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/tv_audio_recording_indicator.xml

+10 −30
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
              android:layout_width="wrap_content"

              android:layout_height="wrap_content"

              android:orientation="horizontal"

              android:padding="32dp">

              android:padding="12dp">



    <FrameLayout

        android:layout_width="wrap_content"
@@ -32,45 +32,25 @@ 
            android:orientation="horizontal">



            <FrameLayout

                android:layout_width="45dp"

                android:layout_height="47dp">

                android:layout_width="wrap_content"

                android:layout_height="match_parent">



                <View

                    android:id="@+id/icon_container_bg"

                    android:layout_width="match_parent"

                    android:layout_width="50dp"

                    android:layout_height="match_parent"

                    android:background="@drawable/tv_rect_dark_left_rounded"/>



                <FrameLayout

                    android:id="@+id/icon_mic"

                    android:layout_width="35dp"

                    android:layout_height="35dp"

                    android:layout_marginStart="6dp"

                    android:layout_marginTop="6dp"

                    android:layout_marginBottom="6dp">



                    <View

                        android:layout_width="27dp"

                        android:layout_height="27dp"

                        android:layout_gravity="center"

                        android:background="@drawable/tv_circle_dark"/>



                    <ImageView

                        android:id="@+id/pulsating_circle"

                        android:layout_width="27dp"

                        android:layout_height="27dp"

                        android:layout_gravity="center"

                        android:background="@drawable/tv_circle_white_translucent"/>



                    <ImageView

                        android:layout_width="27dp"

                        android:layout_height="27dp"

                    android:layout_width="34dp"

                    android:layout_height="24dp"

                    android:layout_gravity="center"

                        android:src="@drawable/tv_ring_white"/>

                    android:background="@drawable/tv_rect_shadow_rounded">



                    <ImageView

                        android:layout_width="16dp"

                        android:layout_height="16dp"

                        android:layout_width="13dp"

                        android:layout_height="13dp"

                        android:layout_gravity="center"

                        android:background="@drawable/tv_ic_mic_white"/>

                </FrameLayout>

packages/SystemUI/res/values/colors_tv.xml

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 


    <!-- Background color for audio recording indicator (G800) -->

    <color name="tv_audio_recording_indicator_background">#FF3C4043</color>

    <color name="tv_audio_recording_indicator_pulse">#4DFFFFFF</color>

    <color name="tv_audio_recording_indicator_icon_background">#CC000000</color>

    <color name="tv_audio_recording_indicator_stroke">#33FFFFFF</color>



    <color name="red">#FFCC0000</color>

</resources>