From feb2b339bc619fa4fa4eb2047f4ab8a095d9647b Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Mon, 2 Jul 2018 13:36:14 +0200
Subject: [PATCH] sdm845-common: Adjust SystemUI layouts to compensate for
 notch.

In particular
- move carrier name under notch in QS panel
- adjust keyguard status bar height
- adjust volume panel padding

Change-Id: Idb6f5a12a5dc50635bf962ac53845c952180ab7e
---
 .../res/layout/keyguard_status_bar.xml        | 69 ++++++++++++++++++
 .../packages/SystemUI/res/layout/qs_panel.xml | 42 +++++++++++
 .../quick_status_bar_expanded_header.xml      | 72 +++++++++++++++++++
 .../quick_status_bar_header_system_icons.xml  | 63 ++++++++++++++++
 .../packages/SystemUI/res/values/dimens.xml   | 29 ++++++++
 5 files changed, 275 insertions(+)
 create mode 100644 overlay/frameworks/base/packages/SystemUI/res/layout/keyguard_status_bar.xml
 create mode 100644 overlay/frameworks/base/packages/SystemUI/res/layout/qs_panel.xml
 create mode 100644 overlay/frameworks/base/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
 create mode 100644 overlay/frameworks/base/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml
 create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml

diff --git a/overlay/frameworks/base/packages/SystemUI/res/layout/keyguard_status_bar.xml b/overlay/frameworks/base/packages/SystemUI/res/layout/keyguard_status_bar.xml
new file mode 100644
index 0000000..0607ca2
--- /dev/null
+++ b/overlay/frameworks/base/packages/SystemUI/res/layout/keyguard_status_bar.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2014 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
+  -->
+
+<!-- Extends RelativeLayout -->
+<com.android.systemui.statusbar.phone.KeyguardStatusBarView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
+    android:id="@+id/keyguard_header"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/status_bar_header_height_keyguard"
+    android:baselineAligned="false"
+    >
+
+    <com.android.systemui.statusbar.phone.MultiUserSwitch android:id="@+id/multi_user_switch"
+        android:layout_width="@dimen/multi_user_switch_width_keyguard"
+        android:layout_height="match_parent"
+        android:layout_alignParentEnd="true"
+        android:background="@drawable/ripple_drawable"
+        android:layout_marginEnd="@dimen/multi_user_switch_keyguard_margin">
+        <ImageView android:id="@+id/multi_user_avatar"
+            android:layout_width="@dimen/multi_user_avatar_keyguard_size"
+            android:layout_height="@dimen/multi_user_avatar_keyguard_size"
+            android:layout_gravity="center"
+            android:scaleType="centerInside"/>
+    </com.android.systemui.statusbar.phone.MultiUserSwitch>
+
+    <LinearLayout android:id="@+id/system_icons_super_container"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/status_bar_header_height"
+        android:layout_toStartOf="@id/multi_user_switch"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_marginStart="@dimen/system_icons_super_container_margin_start"
+        android:paddingEnd="@dimen/system_icons_keyguard_padding_end">
+        <FrameLayout android:id="@+id/system_icons_container"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/status_bar_height"
+            android:layout_gravity="center_vertical"
+            >
+            <include layout="@layout/system_icons" />
+        </FrameLayout>
+    </LinearLayout>
+
+    <com.android.keyguard.CarrierText
+        android:id="@+id/keyguard_carrier_text"
+        android:layout_width="400px"
+        android:layout_height="match_parent"
+        android:layout_marginStart="@dimen/keyguard_carrier_text_margin"
+        android:layout_alignParentStart="true"
+        android:gravity="center_vertical"
+        android:ellipsize="marquee"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?attr/wallpaperTextColorSecondary"
+        android:singleLine="true" />
+
+</com.android.systemui.statusbar.phone.KeyguardStatusBarView>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/layout/qs_panel.xml b/overlay/frameworks/base/packages/SystemUI/res/layout/qs_panel.xml
new file mode 100644
index 0000000..9f175ee
--- /dev/null
+++ b/overlay/frameworks/base/packages/SystemUI/res/layout/qs_panel.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+<com.android.systemui.qs.QSContainerImpl
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/quick_settings_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/qs_background_primary"
+    android:elevation="4dp"
+    android:clipToPadding="false"
+    android:clipChildren="false">
+
+    <com.android.systemui.qs.QSPanel
+        android:id="@+id/quick_settings_panel"
+        android:layout_marginTop="68dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="48dp" />
+
+    <include layout="@layout/quick_status_bar_expanded_header" />
+
+    <include layout="@layout/qs_footer_impl" />
+
+    <include android:id="@+id/qs_detail" layout="@layout/qs_detail" />
+
+    <include android:id="@+id/qs_customize" layout="@layout/qs_customize_panel"
+        android:visibility="gone" />
+
+</com.android.systemui.qs.QSContainerImpl>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml b/overlay/frameworks/base/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
new file mode 100644
index 0000000..7a8c1a3
--- /dev/null
+++ b/overlay/frameworks/base/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+** Copyright 2012, 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.
+-->
+
+<!-- Extends RelativeLayout -->
+<com.android.systemui.qs.QuickStatusBarHeader
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/header"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/status_bar_header_height"
+    android:layout_gravity="@integer/notification_panel_layout_gravity"
+    android:baselineAligned="false"
+    android:clickable="false"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:paddingTop="0dp"
+    android:paddingEnd="0dp"
+    android:paddingStart="0dp">
+
+    <include layout="@layout/quick_status_bar_header_system_icons" />
+
+    <com.android.systemui.qs.QuickQSPanel
+        android:id="@+id/quick_qs_panel"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="71dp"
+        android:layout_alignParentTop="true"
+        android:accessibilityTraversalAfter="@+id/date_time_group"
+        android:accessibilityTraversalBefore="@id/expand_indicator"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:focusable="true"
+        android:importantForAccessibility="yes" />
+
+    <com.android.systemui.statusbar.AlphaOptimizedImageView
+        android:id="@+id/qs_detail_header_progress"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:alpha="0"
+        android:background="@color/qs_detail_progress_track"
+        android:src="@drawable/indeterminate_anim"/>
+
+    <TextView
+        android:id="@+id/header_debug_info"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:fontFamily="sans-serif-condensed"
+        android:padding="2dp"
+        android:textColor="#00A040"
+        android:textSize="11dp"
+        android:textStyle="bold"
+        android:visibility="invisible"/>
+
+</com.android.systemui.qs.QuickStatusBarHeader>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml b/overlay/frameworks/base/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml
new file mode 100644
index 0000000..1579f2c
--- /dev/null
+++ b/overlay/frameworks/base/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+** Copyright 2017, 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.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:systemui="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/qs_header_system_icons_area_height"
+        android:orientation="horizontal">
+
+        <com.android.systemui.statusbar.policy.Clock
+            android:id="@+id/clock"
+            android:textAppearance="@style/TextAppearance.StatusBar.Clock"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:paddingStart="@dimen/status_bar_clock_starting_padding"
+            android:paddingEnd="@dimen/status_bar_clock_end_padding"
+            android:gravity="center_vertical"
+            systemui:showDark="false"
+            />
+
+        <com.android.systemui.BatteryMeterView android:id="@+id/battery"
+            android:layout_height="match_parent"
+            android:layout_width="wrap_content"
+            />
+
+    </LinearLayout>
+
+    <com.android.keyguard.CarrierText
+        android:id="@+id/qs_carrier_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="marquee"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textDirection="locale"
+        android:singleLine="true" />
+
+</LinearLayout>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
new file mode 100644
index 0000000..8a63254
--- /dev/null
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2006, 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.
+*/
+-->
+<resources>
+    <!-- Height of the status bar header bar -->
+    <dimen name="status_bar_header_height">164dp</dimen>
+
+    <!-- Height of the status bar header bar when expanded -->
+    <dimen name="status_bar_header_height_expanded">164dp</dimen>
+
+    <!-- Height of the status bar header bar when on Keyguard -->
+    <dimen name="status_bar_header_height_keyguard">80px</dimen>
+
+    <dimen name="volume_dialog_padding_top">84px</dimen>
+</resources>