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

Commit 654c7c81 authored by Iavor-Valentin Iftime's avatar Iavor-Valentin Iftime Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-de049f159e2f408b9a31119e97634b05" into tm-mainline-prod 

* changes:
  [automerge] Add support for HW privacy toggles in sensor unblock dialog 2p: db0a9431
  Add support for HW privacy toggles in sensor unblock dialog
parents 297ee291 84478056

packages/SystemUI/res/drawable/ic_mic_off.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?attr/colorControlNormal">

  <path

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

      android:pathData="M11,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v5.17l1.82,1.82c0.11,-0.31 0.18,-0.64 0.18,-0.99V5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v1.17l2,2V5zM2.81,2.81L1.39,4.22l11.65,11.65c-0.33,0.08 -0.68,0.13 -1.04,0.13 -2.76,0 -5,-2.24 -5,-5H5c0,3.53 2.61,6.43 6,6.92V21h2v-3.08c0.57,-0.08 1.12,-0.24 1.64,-0.46l5.14,5.14 1.41,-1.41L2.81,2.81zM19,11h-2c0,0.91 -0.26,1.75 -0.69,2.48l1.46,1.46C18.54,13.82 19,12.47 19,11z"/>

</vector>

packages/SystemUI/res/drawable/ic_videocam_off.xml

0 → 100644
+13 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?attr/colorControlNormal">

  <path

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

      android:pathData="M15,8v2.67l5.85,5.85C20.94,16.37 21,16.2 21,16V8c0,-0.82 -0.94,-1.29 -1.6,-0.8L17,9V8c0,-1.1 -0.9,-2 -2,-2h-4.67l2,2H15z"/>

  <path

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

      android:pathData="M2,3.32l2.71,2.71C3.74,6.17 3,7 3,8v8c0,1.1 0.9,2 2,2h11.68l3,3l1.41,-1.41L3.41,1.91L2,3.32zM5,8h1.68l8,8H5V8z"/>

</vector>

packages/SystemUI/res/values-television/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -42,4 +42,8 @@ 


    <!-- Whether to use window background blur for the volume dialog. -->

    <bool name="config_volumeDialogUseBackgroundBlur">true</bool>



    <!-- Whether to tint the icon of the sensor hardware privacy toggle unblock dialog.

        Set to false if using a custom icon. -->

    <bool name="config_unblockHwSensorIconEnableTint">true</bool>

</resources>

packages/SystemUI/res/values-television/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -57,4 +57,7 @@ 
    <dimen name="privacy_chip_dot_bg_height">18dp</dimen>

    <dimen name="privacy_chip_dot_bg_radius">9dp</dimen>



    <dimen name="unblock_hw_sensor_icon_width">@dimen/bottom_sheet_icon_size</dimen>

    <dimen name="unblock_hw_sensor_icon_height">@dimen/bottom_sheet_icon_size</dimen>



</resources>

packages/SystemUI/res/values/drawables.xml

0 → 100644
+26 −0
Original line number 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.

  -->

<resources>

    <!-- Drawable shown for the sensor unblock dialog when blocked by the hardware camera toggle -->

    <drawable name="unblock_hw_sensor_camera">@drawable/ic_videocam_off</drawable>

    <!-- Drawable shown for the sensor unblock dialog when blocked by the hardware microphone toggle -->

    <drawable name="unblock_hw_sensor_microphone">@drawable/ic_mic_off</drawable>

    <!-- Drawable shown for the sensor unblock dialog when blocked by the hardware privacy toggle -->

    <drawable name="unblock_hw_sensor_all">@drawable/ic_videocam_off</drawable>

    <!-- Second drawable shown for the sensor unblock dialog when blocked by the hardware privacy toggle -->

    <drawable name="unblock_hw_sensor_all_second">@drawable/ic_mic_off</drawable>

</resources>