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

Commit 1e9246e2 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '1795-t-volume' into 'v1-t' 

Fix volume rocker notification theme

See merge request e/os/android_frameworks_base!196
parents fbe1f565 ce2b81c6

packages/SystemUI/res/values-night/colors.xml

+7 −7
Original line number Diff line number Diff line
@@ -70,13 +70,13 @@ 
    <color name="media_divider">#85ffffff</color>



    <!-- media output dialog-->

    <color name="media_dialog_background">@color/material_dynamic_neutral10</color>

    <color name="media_dialog_item_main_content">@color/material_dynamic_primary90</color>

    <color name="media_dialog_item_background">@color/material_dynamic_neutral_variant20</color>

    <color name="media_dialog_connected_item_background">@color/material_dynamic_secondary20</color>

    <color name="media_dialog_seekbar_progress">@color/material_dynamic_secondary40</color>

    <color name="media_dialog_button_background">@color/material_dynamic_primary70</color>

    <color name="media_dialog_solid_button_text">@color/material_dynamic_secondary20</color>

    <color name="media_dialog_background">@*android:color/background_floating_material_dark</color>

    <color name="media_dialog_item_main_content">@*android:color/bright_foreground_holo_dark</color>

    <color name="media_dialog_item_background">#2f3034</color>

    <color name="media_dialog_connected_item_background">#2f3034</color>

    <color name="media_dialog_seekbar_progress">@*android:color/accent_material_dark</color>

    <color name="media_dialog_button_background">@*android:color/accent_material_dark</color>

    <color name="media_dialog_solid_button_text">@*android:color/background_material_dark</color>



    <!-- Biometric dialog colors -->

    <color name="biometric_dialog_gray">#ffcccccc</color>

packages/SystemUI/res/values/colors.xml

+7 −7
Original line number Diff line number Diff line
@@ -182,13 +182,13 @@ 
    <color name="media_paging_indicator">@color/material_dynamic_neutral_variant80</color>



    <!-- media output dialog-->

    <color name="media_dialog_background" android:lstar="98">@color/material_dynamic_neutral90</color>

    <color name="media_dialog_item_main_content">@color/material_dynamic_primary20</color>

    <color name="media_dialog_item_background">@color/material_dynamic_secondary95</color>

    <color name="media_dialog_connected_item_background">@color/material_dynamic_primary90</color>

    <color name="media_dialog_seekbar_progress">@android:color/system_accent1_200</color>

    <color name="media_dialog_button_background">@color/material_dynamic_primary40</color>

    <color name="media_dialog_solid_button_text">@color/material_dynamic_neutral95</color>

    <color name="media_dialog_background">@*android:color/background_floating_material_light</color>

    <color name="media_dialog_item_main_content">@*android:color/bright_foreground_holo_light</color>

    <color name="media_dialog_item_background">#dddde4</color>

    <color name="media_dialog_connected_item_background">#dddde4</color>

    <color name="media_dialog_seekbar_progress">@*android:color/accent_material_light</color>

    <color name="media_dialog_button_background">@*android:color/accent_material_light</color>

    <color name="media_dialog_solid_button_text">@*android:color/background_material_light</color>



    <!-- controls -->

    <color name="control_primary_text">#E6FFFFFF</color>

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java

+0 −1
Original line number Diff line number Diff line
@@ -323,7 +323,6 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements 
                WallpaperColors wallpaperColors = WallpaperColors.fromBitmap(icon.getBitmap());

                colorSetUpdated = !wallpaperColors.equals(mWallpaperColors);

                if (colorSetUpdated) {

                    mAdapter.updateColorScheme(wallpaperColors, isDarkThemeOn);

                    updateButtonBackgroundColorFilter();

                    updateDialogBackgroundColor();

                }