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

Commit 4fa04ff7 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'issue-1435_oreo' into 'v1-oreo' 

Dark overlay in call screen

See merge request e/os/android_packages_apps_Dialer!15
parents 325c4dbd 35f2e786

java/com/android/incallui/InCallActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -337,9 +337,9 @@ public class InCallActivity extends TransactionSafeFragmentActivity 
      middle = themeColorManager.getBackgroundColorSolid();

      bottom = themeColorManager.getBackgroundColorSolid();

    } else {

      top = themeColorManager.getBackgroundColorTop();

      middle = themeColorManager.getBackgroundColorMiddle();

      bottom = themeColorManager.getBackgroundColorBottom();

      top = getResources().getColor(R.color.incall_background_gradient_top);

      middle = getResources().getColor(R.color.incall_background_gradient_top);

      bottom = getResources().getColor(R.color.incall_background_gradient_top);

    }



    if (progress < 0) {

java/com/android/incallui/ThemeColorManager.java

+6 −14
Original line number Diff line number Diff line
@@ -74,20 +74,12 @@ public class ThemeColorManager { 
      backgroundColorBottom = context.getColor(R.color.incall_background_gradient_spam_bottom);

      backgroundColorSolid = context.getColor(R.color.incall_background_multiwindow_spam);

    } else {

      @ColorInt int highlightColor = getHighlightColor(context, handle);

      palette = colorMap.calculatePrimaryAndSecondaryColor(highlightColor);

      backgroundColorTop = context.getColor(R.color.incall_background_gradient_top);

      backgroundColorMiddle = context.getColor(R.color.incall_background_gradient_middle);

      backgroundColorBottom = context.getColor(R.color.incall_background_gradient_bottom);

      backgroundColorSolid = context.getColor(R.color.incall_background_multiwindow);

      if (highlightColor != PhoneAccount.NO_HIGHLIGHT_COLOR) {

        // The default background gradient has a subtle alpha. We grab that alpha and apply it to

        // the phone account color.

        backgroundColorTop = applyAlpha(palette.mPrimaryColor, backgroundColorTop);

        backgroundColorMiddle = applyAlpha(palette.mPrimaryColor, backgroundColorMiddle);

        backgroundColorBottom = applyAlpha(palette.mPrimaryColor, backgroundColorBottom);

        backgroundColorSolid = applyAlpha(palette.mPrimaryColor, backgroundColorSolid);

      }

      palette =

          colorMap.calculatePrimaryAndSecondaryColor(R.color.incall_background_color);

      backgroundColorTop = context.getColor(R.color.incall_background_color);

      backgroundColorMiddle = context.getColor(R.color.incall_background_color);

      backgroundColorBottom = context.getColor(R.color.incall_background_color);

      backgroundColorSolid = context.getColor(R.color.incall_background_color);

    }



    primaryColor = palette.mPrimaryColor;

java/com/android/incallui/res/values/colors.xml

+6 −3
Original line number Diff line number Diff line
@@ -78,9 +78,12 @@ 
  <!-- Background color for large notification icon in after call from unknown numbers -->

  <color name="unknown_number_color">#F4B400</color>



  <color name="incall_background_gradient_top">#E91141BB</color>

  <color name="incall_background_gradient_middle">#E91141BB</color>

  <color name="incall_background_gradient_bottom">#CC229FEB</color>

    <color name="incall_background_color">#CC000000</color>





  <color name="incall_background_gradient_top">#CC000000</color>

  <color name="incall_background_gradient_middle">#CC000000</color>

  <color name="incall_background_gradient_bottom">#CC000000</color>



  <color name="incall_background_multiwindow">#E91141BB</color>