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

Commit fb527ecb authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Fix regressions with DecoratedCustomViewStyle" into sc-dev am: d1cc1421

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13988307

Change-Id: Ide35f81e9fa49982388803a36b12801673de37c2
parents 1c879e13 d1cc1421
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -12381,19 +12381,13 @@ public class Notification implements Parcelable
        }

        public StandardTemplateParams decorationType(int decorationType) {
            // These fields are removed by the decoration process, and thus would not show anyway;
            // hiding them is a minimal time/space optimization.
            hideAppName(true);
            hideTitle(true);
            hideSubText(true);
            hideTime(true);
            // Minimally decorated custom views do not show certain pieces of chrome that have
            // always been shown when using DecoratedCustomViewStyle.
            boolean hideOtherFields = decorationType <= DECORATION_MINIMAL;
            hideLargeIcon(hideOtherFields);
            hideProgress(hideOtherFields);
            hideActions(hideOtherFields);
            hideSnoozeButton(hideOtherFields);
            return this;
        }
    }