From f5ec09e661c6f76aaff0444aaf83e96776ab7758 Mon Sep 17 00:00:00 2001
From: Jerry Chang <chenghsiuchang@google.com>
Date: Fri, 11 Jan 2019 17:35:07 +0800
Subject: [PATCH] Add dock info view overlay

Bug: 122806326
Test:  atest SystemUITests
Change-Id: Ic2a35b34fcb560e36e784fa0d0a962e9dae9b962
---
 .../SystemUI/res/layout/dock_info_overlay.xml | 19 +++++++++++++++++++
 .../res/layout/status_bar_expanded.xml        |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 packages/SystemUI/res/layout/dock_info_overlay.xml

diff --git a/packages/SystemUI/res/layout/dock_info_overlay.xml b/packages/SystemUI/res/layout/dock_info_overlay.xml
new file mode 100644
index 0000000000000..430143ca3bc28
--- /dev/null
+++ b/packages/SystemUI/res/layout/dock_info_overlay.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!-- empty stub -->
+<merge />
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml
index 75c0ec3ced438..7d403b24354c6 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -43,6 +43,8 @@
         android:clipToPadding="false"
         android:clipChildren="false">
 
+        <include layout="@layout/dock_info_overlay" />
+
         <FrameLayout
             android:id="@+id/qs_frame"
             android:layout="@layout/qs_panel"