Merge "Disable scrim focus on AOD" into pi-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Mon, 19 Mar 2018 05:03:50 +0000 (05:03 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 19 Mar 2018 05:03:50 +0000 (05:03 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Mon, 19 Mar 2018 05:03:50 +0000 (05:03 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 19 Mar 2018 05:03:50 +0000 (05:03 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
Simple merge
diff --cc packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Mon, 19 Mar 2018 05:03:50 +0000 (05:03 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 19 Mar 2018 05:03:50 +0000 (05:03 +0000)
		1	2
packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java	patch \|	diff1 \|	diff2 \|	blob \| history