b2f48af230e509ac8012612fe0262d7afc3659b0 - platform/frameworks/base

commit	b2f48af230e509ac8012612fe0262d7afc3659b0	[log] [tgz]
author	Todd Kennedy <toddke@google.com>	Fri Nov 09 18:38:07 2018 +0000
committer	Todd Kennedy <toddke@google.com>	Fri Nov 09 18:38:07 2018 +0000
tree	9b7b8057d7efcfa8ea076c20607b4550265a3364
parent	6fa357a529a57d0421df6070d425ccc684603ef0 [diff]

Revert "resolve merge conflicts of 0cc0d229d0f590fe84c1b7aa8cc8fbf188d8a787 to pi-dev-plus-aosp"

This reverts commit 6fa357a529a57d0421df6070d425ccc684603ef0.

Reason for revert: breaks git_pi-dev-plus-aosp build

Change-Id: I12697f8c329ab224f83856176ba989c37920774f

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java[diff]
packages/SystemUI/src/com/android/systemui/statusbar/HeadsUpStatusBarView.java[diff]
packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java[diff]
packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java[diff]
packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java[diff]
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java[diff]
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java[diff]
packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.java[diff]

9 files changed

tree: 9b7b8057d7efcfa8ea076c20607b4550265a3364