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

Commit 84fffed1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "PrintSpooler: Clean up printer_button_contrast flag" into main

parents ba79fb99 192d11e4

packages/PrintSpooler/flags/flags.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -7,14 +7,3 @@ flag { 
  description: "Log print job creation and state transitions."

  bug: "385340868"

}
 


flag {

   name: "printer_button_contrast"

   namespace: "printing"

   description: "Use themed colors instead of hard-coded values for print icon"

   is_fixed_read_only: true

   bug: "341591022"

   metadata {

        purpose: PURPOSE_BUGFIX

   }

}

packages/PrintSpooler/res/values/colors.xml

+2 −4
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ 
    <color name="unselected_page_background_color">#C0C0C0</color>



    <color name="material_grey_500">#ffa3a3a3</color>

    <color name="ic_pdf_printer_color" android:featureFlag="!com.android.printspooler.flags.printer_button_contrast">@*android:color/accent_device_default_light</color>

    <color name="ic_pdf_printer_color" android:featureFlag="com.android.printspooler.flags.printer_button_contrast">@androidprv:color/materialColorPrimary</color>

    <color name="ic_pdf_printer_color">@androidprv:color/materialColorPrimary</color>



    <color name="print_button_background" android:featureFlag="!com.android.printspooler.flags.printer_button_contrast">?android:attr/colorAccent</color>

    <color name="print_button_background" android:featureFlag="com.android.printspooler.flags.printer_button_contrast">@androidprv:color/materialColorPrimary</color>

    <color name="print_button_background">@androidprv:color/materialColorPrimary</color>

</resources>