Merge "Add dock info view overlay"

This commit is contained in:
TreeHugger Robot
2019-01-19 03:39:55 +00:00
committed by Android (Google) Code Review
2 changed files with 21 additions and 0 deletions

View File

@@ -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 />

View File

@@ -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"