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

Commit 8fbe5b0f authored by Nadav Bar's avatar Nadav Bar Committed by Android (Google) Code Review
Browse files

Merge "Integrate captions volume button with new CaptioningManager API" into tm-dev

parents 72d2d550 904975fd

packages/SystemUI/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -311,6 +311,9 @@ 
    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />

    <uses-permission android:name="android.permission.SUPPRESS_CLIPBOARD_ACCESS_NOTIFICATION" />



    <!-- To change system captions state -->

    <uses-permission android:name="android.permission.SET_SYSTEM_AUDIO_CAPTION" />



    <protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" />

    <protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" />

    <protected-broadcast android:name="com.android.settings.flashlight.action.FLASHLIGHT_CHANGED" />

packages/SystemUI/plugin/src/com/android/systemui/plugins/VolumeDialogController.java

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ public interface VolumeDialogController { 


    boolean areCaptionsEnabled();

    void setCaptionsEnabled(boolean isEnabled);

    boolean isCaptionStreamOptedOut();



    void getCaptionsComponentState(boolean fromTooltip);

packages/SystemUI/res/color/caption_tint_color_selector.xml

+0 −3
Original line number Diff line number Diff line
@@ -16,8 +16,5 @@ 
  -->

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

          xmlns:sysui="http://schemas.android.com/apk/res-auto">

    <item sysui:optedOut="true"

          android:color="?android:attr/colorButtonNormal"/>



    <item android:color="?android:attr/colorAccent"/>

</selector>
 
 No newline at end of file

packages/SystemUI/res/layout-land-television/volume_dialog.xml

+1 −2
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ 
                android:layout_height="match_parent"

                android:tint="@color/caption_tint_color_selector"

                android:layout_gravity="center"

                android:soundEffectsEnabled="false"

                sysui:optedOut="false"/>

                android:soundEffectsEnabled="false"/>



        </FrameLayout>

packages/SystemUI/res/layout-land/volume_dialog.xml

+1 −2
Original line number Diff line number Diff line
@@ -136,8 +136,7 @@ 
                android:layout_height="match_parent"

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

                android:layout_gravity="center"

                android:soundEffectsEnabled="false"

                sysui:optedOut="false"/>

                android:soundEffectsEnabled="false" />

        </FrameLayout>

    </LinearLayout>