summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wilson Wu <wilsonwu@google.com> 2020-03-30 17:11:36 +0800
committer Wilson Wu <wilsonwu@google.com> 2020-03-30 17:11:36 +0800
commitfec5842cca8f4782cb3136e0ff375d70e763f23c (patch)
treef391516100dbc86a989e16a9a736b05c8bc792a0
parent0741d3b855dc1fe152b3d88994d3d6aec0129d88 (diff)
Add an overlay for photo preview
Bug: 151064807 Test: Manual Change-Id: I097ed4bfc0582eb3499c27a72d65d46f846aed40
-rw-r--r--packages/SystemUI/res/layout/photo_preview_overlay.xml19
-rw-r--r--packages/SystemUI/res/layout/status_bar_expanded.xml2
2 files changed, 21 insertions, 0 deletions
diff --git a/packages/SystemUI/res/layout/photo_preview_overlay.xml b/packages/SystemUI/res/layout/photo_preview_overlay.xml
new file mode 100644
index 000000000000..9210996fb9c6
--- /dev/null
+++ b/packages/SystemUI/res/layout/photo_preview_overlay.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2020 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 /> \ No newline at end of file
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml
index 115b4a86b86d..1d4b98242519 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -66,6 +66,8 @@
<include layout="@layout/ambient_indication"
android:id="@+id/ambient_indication_container" />
+ <include layout="@layout/photo_preview_overlay" />
+
<ViewStub
android:id="@+id/keyguard_user_switcher"
android:layout="@layout/keyguard_user_switcher"