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

Commit 737736fc authored by Jacqueline Bronger's avatar Jacqueline Bronger Committed by Automerger Merge Worker
Browse files

Merge "Reuse phone privacy indicator impl. for tv" into sc-dev am: 41b553c0 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I523eb5faa554528cc4d90c58b5a5a27e1225d1da
parents 52f5df34 41b553c0

packages/SystemUI/res/layout/tv_audio_recording_indicator.xml→packages/SystemUI/res/layout/tv_ongoing_privacy_chip.xml

+35 −0
Original line number Diff line number Diff line
@@ -15,24 +15,21 @@ 
  ~ limitations under the License.

  -->



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

              android:layout_width="wrap_content"

              android:layout_height="wrap_content"

              android:orientation="horizontal"

              android:padding="12dp">



<FrameLayout

        android:layout_width="34dp"

        android:layout_height="24dp"

        android:layout_gravity="center"

        android:background="@drawable/tv_rect_shadow_rounded">

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:padding="12dp"

    android:layout_gravity="center">



        <ImageView

            android:layout_width="13dp"

            android:layout_height="13dp"

            android:layout_gravity="center"

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

    <LinearLayout

        android:id="@+id/icons_container"

        android:background="@drawable/tv_rect_shadow_rounded"

        android:padding="@dimen/privacy_chip_icon_padding"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:orientation="horizontal"/>



</FrameLayout>

</LinearLayout>

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

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
    <string-array name="config_systemUIServiceComponents" translatable="false">

        <item>com.android.systemui.util.NotificationChannels</item>

        <item>com.android.systemui.volume.VolumeUI</item>

        <item>com.android.systemui.privacy.television.TvOngoingPrivacyChip</item>

        <item>com.android.systemui.statusbar.tv.TvStatusBar</item>

        <item>com.android.systemui.statusbar.tv.notifications.TvNotificationPanel</item>

        <item>com.android.systemui.statusbar.tv.notifications.TvNotificationHandler</item>

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

+4 −0
Original line number Diff line number Diff line
@@ -17,4 +17,8 @@ 
<resources>

    <!-- Opacity at which the background for the shutdown UI will be drawn. -->

    <item name="shutdown_scrim_behind_alpha" format="float" type="dimen">1.0</item>



    <dimen name="privacy_chip_icon_margin">3dp</dimen>

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

    <dimen name="privacy_chip_icon_size">13dp</dimen>

</resources>
 
 No newline at end of file

packages/SystemUI/res/values/config_tv.xml

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

<!-- Copyright (C) 2016 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>

    <!-- Whether to enable microphone disclosure indicator

         (com.android.systemui.statusbar.tv.micdisclosure.AudioRecordingDisclosureBar). -->

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

</resources>

packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import com.android.systemui.keyguard.dagger.KeyguardModule; 
import com.android.systemui.media.systemsounds.HomeSoundEffectController;

import com.android.systemui.people.widget.PeopleSpaceWidgetEnabler;

import com.android.systemui.power.PowerUI;

import com.android.systemui.privacy.television.TvOngoingPrivacyChip;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsModule;

import com.android.systemui.shortcut.ShortcutKeyDispatcher;
@@ -155,6 +156,12 @@ public abstract class SystemUIBinder { 
    @ClassKey(TvNotificationPanel.class)

    public abstract SystemUI bindsTvNotificationPanel(TvNotificationPanel sysui);



    /** Inject into TvOngoingPrivacyChip. */

    @Binds

    @IntoMap

    @ClassKey(TvOngoingPrivacyChip.class)

    public abstract SystemUI bindsTvOngoingPrivacyChip(TvOngoingPrivacyChip sysui);



    /** Inject into VolumeUI. */

    @Binds

    @IntoMap