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

Merge "Adds the keyguard indication area overlays" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-15 04:02:51 +00:00
committed by Android (Google) Code Review
parent 6e52f838ba 985c3f0d21
commit 18cb49bbab
3 changed files with 65 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/res/layout/keyguard_bottom_area.xml
View File

@@ -31,6 +31,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/keyguard_indication_margin_bottom" android:layout_marginBottom="@dimen/keyguard_indication_margin_bottom"
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"
android:orientation="horizontal">
<include layout="@layout/left_docked_overlay" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical|center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
<com.android.systemui.statusbar.phone.KeyguardIndicationTextView <com.android.systemui.statusbar.phone.KeyguardIndicationTextView
@@ -51,6 +60,10 @@
</LinearLayout> </LinearLayout>
<include layout="@layout/right_docked_overlay" />
</LinearLayout>
<FrameLayout <FrameLayout
android:id="@+id/preview_container" android:id="@+id/preview_container"
android:layout_width="match_parent" android:layout_width="match_parent"

19
packages/SystemUI/res/layout/left_docked_overlay.xml Normal file
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 />

19
packages/SystemUI/res/layout/right_docked_overlay.xml Normal file
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 />