Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Add an overlay for photo preview" into rvc-dev am: b28dfc88cb am: 3b1927e9a6" into rvc-d1-dev-plus-aosp am: 09666e1ea0

Browse Source 
Change-Id: I2aa9866cb38c9f7b8d5cb4acd0de36d051067102
This commit is contained in:
Automerger Merge Worker
2020-04-15 18:31:14 +00:00
parent 0c0841a1e4 09666e1ea0
commit 4fd0794362
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/SystemUI/res/layout/photo_preview_overlay.xml Normal file
View File

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

2
packages/SystemUI/res/layout/status_bar_expanded.xml
View File

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