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

Commit 6c328ac5 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Show cast record icon in the status bar 

- Add CastDrawable that wraps ic_cast and draws the red record fill
- Add ic_cast_connected_fill that only contains the fill of the cast icon
- Updated all icon packs to include fill icon on the right ic_cast size

Fixes: 127479204
Test: visual; sysui demo mode
Change-Id: Idaed25ad0a5646af4be4170ee76938a4d40aaf3e
parent 78cbd8f8

packages/SystemUI/res/drawable/ic_cast.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ Copyright (C) 2017 The Android Open Source Project 
    limitations under the License.

-->

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

    android:width="24dp"

    android:height="24dp"

    android:width="17dp"

    android:height="17dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

packages/SystemUI/res/drawable/ic_cast_connected.xml

+3 −3
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ Copyright (C) 2017 The Android Open Source Project 
    limitations under the License.

-->

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

        android:width="17dp"

        android:height="17dp"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">



    <path

        android:fillColor="#FFFFFFFF"

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

        android:pathData="M1,18v3h3C4,19.34 2.66,18 1,18zM1,14v2c2.76,0 5,2.24 5,5h2C8,17.13 4.87,14 1,14zM19,7H5v1.63c3.96,1.28 7.09,4.41 8.37,8.37H19V7zM1,10v2c4.97,0 9,4.03 9,9h2C12,14.92 7.07,10 1,10zM21,3H3C1.9,3 1,3.9 1,5v3h2V5h18v14h-7v2h7c1.1,0 2,-0.9 2,-2V5C23,3.9 22.1,3 21,3"/>



</vector>

packages/SystemUI/res/drawable/ic_cast_connected_fill.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

  ~ 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

  -->



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

    android:width="17dp"

    android:height="17dp"

    android:tint="?android:attr/colorError"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

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

        android:pathData="M19,7H5v1.63c3.96,1.28 7.09,4.41 8.37,8.37H19V7z" />

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/stat_sys_cast.xml

+1 −4
Original line number Diff line number Diff line
@@ -13,7 +13,4 @@ Copyright (C) 2017 The Android Open Source Project 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

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

    android:insetLeft="2.5dp"

    android:insetRight="2.5dp"

    android:drawable="@drawable/ic_cast_connected" />
 
 No newline at end of file
 
<com.android.systemui.statusbar.CastDrawable />
 
 No newline at end of file

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ 
    <!-- Height of notification icons in the status bar -->

    <dimen name="status_bar_icon_size">@*android:dimen/status_bar_icon_size</dimen>



    <!-- Default horizontal drawable padding for status bar icons. -->

    <dimen name="status_bar_horizontal_padding">2.5dp</dimen>



    <!-- Height of the battery icon in the status bar. -->

    <dimen name="status_bar_battery_icon_height">13.0dp</dimen>