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

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

Merge "Add new TV bottom sheets for HTT mic mute"

parents 67aa0f16 165ddc4b

core/java/android/hardware/SensorPrivacyManager.java

+7 −0
Original line number Diff line number Diff line
@@ -72,6 +72,13 @@ public final class SensorPrivacyManager { 
    public static final String EXTRA_ALL_SENSORS = SensorPrivacyManager.class.getName()

            + ".extra.all_sensors";



    /**

     * An extra containing the sensor type

     * @hide

     */

    public static final String EXTRA_TOGGLE_TYPE = SensorPrivacyManager.class.getName()

            + ".extra.toggle_type";



    /**

     * Sensor constants which are used in {@link SensorPrivacyManager}

     */

core/res/res/values-television/config.xml

+6 −0
Original line number Diff line number Diff line
@@ -54,6 +54,12 @@ 
        com.android.systemui/com.android.systemui.sensorprivacy.television.TvUnblockSensorActivity

    </string>



    <!-- Component name of the activity used to inform a user about a sensor privacy update from

     SW/HW privacy switches. -->

    <string name="config_sensorStateChangedActivity" translatable="false">

        com.android.systemui/com.android.systemui.sensorprivacy.television.TvSensorPrivacyChangedActivity

    </string>



    <!-- Component name of the activity that shows the request for access to a usb device. -->

    <string name="config_usbPermissionActivity" translatable="false">

        com.android.systemui/com.android.systemui.usb.tv.TvUsbPermissionActivity

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -2944,6 +2944,9 @@ 
    <string name="config_usbResolverActivity" translatable="false"

            >com.android.systemui/com.android.systemui.usb.UsbResolverActivity</string>



    <!-- Component name of the activity used to inform a user about a sensor privacy state chage. -->

    <string name="config_sensorStateChangedActivity" translatable="false"></string>



    <!-- Component name of the activity used to inform a user about a sensory being blocked because

     of privacy settings. -->

    <string name="config_sensorUseStartedActivity" translatable="false"

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ 
  <java-symbol type="string" name="config_usbResolverActivity" />

  <java-symbol type="string" name="config_sensorUseStartedActivity" />

  <java-symbol type="string" name="config_sensorUseStartedActivity_hwToggle" />

  <java-symbol type="string" name="config_sensorStateChangedActivity" />

  <java-symbol type="string" name="config_hdmiCecSetMenuLanguageActivity" />

  <java-symbol type="integer" name="config_minNumVisibleRecentTasks_lowRam" />

  <java-symbol type="integer" name="config_maxNumVisibleRecentTasks_lowRam" />

packages/SystemUI/AndroidManifest.xml

+10 −0
Original line number Diff line number Diff line
@@ -557,6 +557,16 @@ 
                  android:showForAllUsers="true">

        </activity>



        <!-- started from SensoryPrivacyService -->

        <activity android:name=".sensorprivacy.television.TvSensorPrivacyChangedActivity"

            android:exported="true"

            android:launchMode="singleTop"

            android:permission="android.permission.MANAGE_SENSOR_PRIVACY"

            android:theme="@style/BottomSheet"

            android:finishOnCloseSystemDialogs="true"

            android:showForAllUsers="true">

        </activity>





        <!-- started from UsbDeviceSettingsManager -->

        <activity android:name=".usb.UsbAccessoryUriActivity"