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

Commit 477d097f authored by Anthony Tripaldi's avatar Anthony Tripaldi
Browse files

Remove custom theme added for tooltip in captions toggle first run show. 

windowIsFloating is necessary to stop drawing system bar backgrounds on
certain devices.

Bug: 130786771
Test: manual
Change-Id: Ic095d72d5dbfad1631b46e75775b14c7a36121b6
parent e0b95fbe

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

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:gravity="right"

    android:layout_gravity="right"

    android:background="@android:color/transparent"

    android:theme="@style/volume_dialog_theme">

    android:theme="@style/qs_theme">



    <FrameLayout

        android:id="@+id/volume_dialog"

packages/SystemUI/res/layout/volume_dialog.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:gravity="right"

    android:layout_gravity="right"

    android:background="@android:color/transparent"

    android:theme="@style/volume_dialog_theme">

    android:theme="@style/qs_theme">



    <!-- right-aligned to be physically near volume button -->

    <LinearLayout

packages/SystemUI/res/layout/volume_dialog_row.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:layout_width="@dimen/volume_dialog_panel_width"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:theme="@style/volume_dialog_theme">

    android:theme="@style/qs_theme">



    <LinearLayout

        android:layout_height="wrap_content"

packages/SystemUI/res/values/styles.xml

+0 −4
Original line number Diff line number Diff line
@@ -317,10 +317,6 @@ 
        <item name="android:windowIsFloating">true</item>

    </style>



    <style name="volume_dialog_theme" parent="qs_theme">

        <item name="android:windowIsFloating">false</item>

    </style>



    <style name="systemui_theme_remote_input" parent="@android:style/Theme.DeviceDefault.Light">

        <item name="android:colorAccent">@color/remote_input_accent</item>

    </style>

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ public class VolumeDialogImpl implements VolumeDialog, 


    public VolumeDialogImpl(Context context) {

        mContext =

                new ContextThemeWrapper(context, com.android.systemui.R.style.volume_dialog_theme);

                new ContextThemeWrapper(context, R.style.qs_theme);

        mController = Dependency.get(VolumeDialogController.class);

        mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);

        mActivityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
@@ -1337,7 +1337,7 @@ public class VolumeDialogImpl implements VolumeDialog, 


    private final class CustomDialog extends Dialog implements DialogInterface {

        public CustomDialog(Context context) {

            super(context, com.android.systemui.R.style.volume_dialog_theme);

            super(context, R.style.qs_theme);

        }



        @Override