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

Commit 151d1879 authored by Victor Truong's avatar Victor Truong Committed by Automerger Merge Worker
Browse files

Merge "Change blocked sensor to grey chip." into tm-qpr-dev am: a9a4f1e4 am: 0ddd5f65 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19135690



Change-Id: If5e68224829720ed98a498e12212965624b174ac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2a7eb382 0ddd5f65

packages/SystemUI/res/drawable/dream_overlay_camera_off.xml

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

<!--

  ~ Copyright (C) 2022 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="56dp"

    android:height="24dp"

    android:viewportWidth="56"

    android:viewportHeight="24">

  <path

      android:pathData="M12,0L44,0A12,12 0,0 1,56 12L56,12A12,12 0,0 1,44 24L12,24A12,12 0,0 1,0 12L0,12A12,12 0,0 1,12 0z"

      android:fillColor="#5F6368"/>

  <path

      android:pathData="M21.872,5.873L20.926,6.813L21.492,7.38C21.392,7.566 21.332,7.773 21.332,8V16C21.332,16.733 21.932,17.333 22.666,17.333H30.666C30.892,17.333 31.099,17.273 31.286,17.173L33.186,19.073L34.126,18.133L31.999,16L21.872,5.873ZM31.999,10.986V8C31.999,7.266 31.399,6.666 30.666,6.666H24.552L25.886,8H30.666V12.78L31.999,14.113V13.013L34.666,15.666V8.333L31.999,10.986ZM22.666,8.553V16H30.112L22.666,8.553Z"

      android:fillColor="#ffffff"

      android:fillType="evenOdd"/>

</vector>

packages/SystemUI/res/drawable/dream_overlay_mic_and_camera_off.xml

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

<!--

  ~ Copyright (C) 2022 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="56dp"

    android:height="24dp"

    android:viewportWidth="56"

    android:viewportHeight="24">

  <path

      android:pathData="M12,0L44,0A12,12 0,0 1,56 12L56,12A12,12 0,0 1,44 24L12,24A12,12 0,0 1,0 12L0,12A12,12 0,0 1,12 0z"

      android:fillColor="#5F6368"/>

  <path

      android:pathData="M15.332,7.333C15.332,6.966 15.632,6.666 15.999,6.666C16.366,6.666 16.666,6.966 16.666,7.333V10.78L17.879,11.993C17.952,11.786 17.999,11.566 17.999,11.333V7.333C17.999,6.226 17.106,5.333 15.999,5.333C14.892,5.333 13.999,6.226 13.999,7.333V8.113L15.332,9.446V7.333ZM9.872,5.873L8.926,6.813L16.692,14.58C16.472,14.633 16.239,14.666 15.999,14.666C14.159,14.666 12.666,13.173 12.666,11.333H11.332C11.332,13.686 13.072,15.62 15.332,15.946V18H16.666V15.946C17.046,15.893 17.412,15.786 17.759,15.64L21.186,19.066L22.126,18.126L9.872,5.873ZM19.332,11.333H20.666C20.666,12.313 20.359,13.213 19.846,13.96L18.872,12.986C19.159,12.5 19.332,11.94 19.332,11.333Z"

      android:fillColor="#ffffff"

      android:fillType="evenOdd"/>

  <path

      android:pathData="M33.872,5.873L32.926,6.813L33.492,7.38C33.392,7.566 33.332,7.773 33.332,8V16C33.332,16.733 33.932,17.333 34.666,17.333H42.666C42.892,17.333 43.099,17.273 43.286,17.173L45.186,19.073L46.126,18.133L43.999,16L33.872,5.873ZM43.999,10.986V8C43.999,7.266 43.399,6.666 42.666,6.666H36.552L37.886,8H42.666V12.78L43.999,14.113V13.013L46.666,15.666V8.333L43.999,10.986ZM34.666,8.553V16H42.112L34.666,8.553Z"

      android:fillColor="#ffffff"

      android:fillType="evenOdd"/>

</vector>

packages/SystemUI/res/drawable/dream_overlay_mic_off.xml

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

<!--

  ~ Copyright (C) 2022 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="56dp"

    android:height="24dp"

    android:viewportWidth="56"

    android:viewportHeight="24">

  <path

      android:pathData="M12,0L44,0A12,12 0,0 1,56 12L56,12A12,12 0,0 1,44 24L12,24A12,12 0,0 1,0 12L0,12A12,12 0,0 1,12 0z"

      android:fillColor="#5F6368"/>

  <path

      android:pathData="M27.807,7.133C27.807,6.767 28.107,6.467 28.473,6.467C28.84,6.467 29.14,6.767 29.14,7.133V10.58L30.353,11.793C30.427,11.587 30.473,11.367 30.473,11.133V7.133C30.473,6.027 29.58,5.133 28.473,5.133C27.367,5.133 26.473,6.027 26.473,7.133V7.913L27.807,9.247V7.133ZM22.347,5.673L21.4,6.613L29.167,14.38C28.947,14.433 28.713,14.467 28.473,14.467C26.633,14.467 25.14,12.973 25.14,11.133H23.807C23.807,13.487 25.547,15.42 27.807,15.747V17.8H29.14V15.747C29.52,15.693 29.887,15.587 30.233,15.44L33.66,18.867L34.6,17.927L22.347,5.673ZM31.807,11.133H33.14C33.14,12.113 32.833,13.013 32.32,13.76L31.347,12.787C31.633,12.3 31.807,11.74 31.807,11.133Z"

      android:fillColor="#ffffff"

      android:fillType="evenOdd"/>

</vector>

packages/SystemUI/res/layout/dream_overlay_status_bar_view.xml

+23 −6
Original line number Original line Diff line number Diff line
@@ -70,15 +70,32 @@ 
            android:visibility="gone"

            android:visibility="gone"

            android:contentDescription="@string/dream_overlay_status_bar_wifi_off" />

            android:contentDescription="@string/dream_overlay_status_bar_wifi_off" />





        <com.android.systemui.dreams.DreamOverlayDotImageView

        <ImageView

            android:id="@+id/dream_overlay_mic_off"

            android:layout_width="@dimen/dream_overlay_grey_chip_width"

            android:layout_height="match_parent"

            android:layout_marginEnd="@dimen/dream_overlay_status_icon_margin"

            android:src="@drawable/dream_overlay_mic_off"

            android:visibility="gone"

            android:contentDescription="@string/dream_overlay_status_bar_mic_off" />



        <ImageView

            android:id="@+id/dream_overlay_camera_off"

            android:layout_width="@dimen/dream_overlay_grey_chip_width"

            android:layout_height="match_parent"

            android:layout_marginEnd="@dimen/dream_overlay_status_icon_margin"

            android:src="@drawable/dream_overlay_camera_off"

            android:visibility="gone"

            android:contentDescription="@string/dream_overlay_status_bar_camera_off" />



        <ImageView

            android:id="@+id/dream_overlay_camera_mic_off"

            android:id="@+id/dream_overlay_camera_mic_off"

            android:layout_width="@dimen/dream_overlay_camera_mic_off_indicator_size"

            android:layout_width="@dimen/dream_overlay_grey_chip_width"

            android:layout_height="@dimen/dream_overlay_camera_mic_off_indicator_size"

            android:layout_height="match_parent"

            android:layout_gravity="center_vertical"

            android:layout_marginEnd="@dimen/dream_overlay_status_icon_margin"

            android:layout_marginEnd="@dimen/dream_overlay_status_icon_margin"

            android:src="@drawable/dream_overlay_mic_and_camera_off"

            android:visibility="gone"

            android:visibility="gone"

            android:contentDescription="@string/dream_overlay_status_bar_camera_mic_off"

            android:contentDescription="@string/dream_overlay_status_bar_camera_mic_off" />

            app:dotColor="@color/dream_overlay_camera_mic_off_dot_color" />





    </LinearLayout>

    </LinearLayout>

</com.android.systemui.dreams.DreamOverlayStatusBarView>
 
</com.android.systemui.dreams.DreamOverlayStatusBarView>

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -1443,6 +1443,7 @@ 
        @*android:dimen/status_bar_system_icon_size</dimen>

        @*android:dimen/status_bar_system_icon_size</dimen>

    <dimen name="dream_overlay_camera_mic_off_indicator_size">8dp</dimen>

    <dimen name="dream_overlay_camera_mic_off_indicator_size">8dp</dimen>

    <dimen name="dream_overlay_notification_indicator_size">6dp</dimen>

    <dimen name="dream_overlay_notification_indicator_size">6dp</dimen>

    <dimen name="dream_overlay_grey_chip_width">56dp</dimen>





    <!-- Dream overlay complications related dimensions -->

    <!-- Dream overlay complications related dimensions -->

    <dimen name="dream_overlay_complication_clock_time_text_size">100sp</dimen>

    <dimen name="dream_overlay_complication_clock_time_text_size">100sp</dimen>