ce9645b17a
The title of heads-up notification was shown incompletely
because it's covered by operator name.
To fix this issue, the operator name should be hidden
when a heads-up notification is shown.
Fixes: b/116533819
Test: atest SystemUITests
Test: manual - enable config_showOperatorNameInStatusBar
and show a heads-up notification
Change-Id: Id3318cd7cb2c9b6950392fadd11d02ab873d84c5
124 lines
5.0 KiB
XML
124 lines
5.0 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
**
|
|
** Copyright 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.
|
|
*/
|
|
-->
|
|
|
|
<!-- android:background="@drawable/status_bar_closed_default_background" -->
|
|
<com.android.systemui.statusbar.phone.PhoneStatusBarView
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="@dimen/status_bar_height"
|
|
android:id="@+id/status_bar"
|
|
android:background="@drawable/system_bar_background"
|
|
android:orientation="vertical"
|
|
android:focusable="false"
|
|
android:descendantFocusability="afterDescendants"
|
|
android:accessibilityPaneTitle="@string/status_bar"
|
|
>
|
|
|
|
<ImageView
|
|
android:id="@+id/notification_lights_out"
|
|
android:layout_width="@dimen/status_bar_icon_size"
|
|
android:layout_height="match_parent"
|
|
android:paddingStart="@dimen/status_bar_padding_start"
|
|
android:paddingBottom="2dip"
|
|
android:src="@drawable/ic_sysbar_lights_out_dot_small"
|
|
android:scaleType="center"
|
|
android:visibility="gone"
|
|
/>
|
|
|
|
<LinearLayout android:id="@+id/status_bar_contents"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:paddingStart="@dimen/status_bar_padding_start"
|
|
android:paddingEnd="@dimen/status_bar_padding_end"
|
|
android:orientation="horizontal"
|
|
>
|
|
<FrameLayout
|
|
android:layout_height="match_parent"
|
|
android:layout_width="0dp"
|
|
android:layout_weight="1">
|
|
|
|
<include layout="@layout/heads_up_status_bar_layout" />
|
|
|
|
<!-- The alpha of the left side is controlled by PhoneStatusBarTransitions, and the
|
|
individual views are controlled by StatusBarManager disable flags DISABLE_CLOCK and
|
|
DISABLE_NOTIFICATION_ICONS, respectively -->
|
|
<LinearLayout
|
|
android:id="@+id/status_bar_left_side"
|
|
android:layout_height="match_parent"
|
|
android:layout_width="match_parent"
|
|
android:clipChildren="false"
|
|
>
|
|
<ViewStub
|
|
android:id="@+id/operator_name"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:layout="@layout/operator_name" />
|
|
|
|
<com.android.systemui.statusbar.policy.Clock
|
|
android:id="@+id/clock"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:textAppearance="@style/TextAppearance.StatusBar.Clock"
|
|
android:singleLine="true"
|
|
android:paddingStart="@dimen/status_bar_left_clock_starting_padding"
|
|
android:paddingEnd="@dimen/status_bar_left_clock_end_padding"
|
|
android:gravity="center_vertical|start"
|
|
/>
|
|
|
|
<com.android.systemui.statusbar.AlphaOptimizedFrameLayout
|
|
android:id="@+id/notification_icon_area"
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="1"
|
|
android:orientation="horizontal"
|
|
android:clipChildren="false"/>
|
|
|
|
</LinearLayout>
|
|
</FrameLayout>
|
|
|
|
<!-- Space should cover the notch (if it exists) and let other views lay out around it -->
|
|
<android.widget.Space
|
|
android:id="@+id/cutout_space_view"
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:gravity="center_horizontal|center_vertical"
|
|
/>
|
|
|
|
<com.android.keyguard.AlphaOptimizedLinearLayout android:id="@+id/system_icon_area"
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="1"
|
|
android:orientation="horizontal"
|
|
android:gravity="center_vertical|end"
|
|
>
|
|
|
|
<include layout="@layout/system_icons" />
|
|
</com.android.keyguard.AlphaOptimizedLinearLayout>
|
|
</LinearLayout>
|
|
|
|
<ViewStub
|
|
android:id="@+id/emergency_cryptkeeper_text"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:layout="@layout/emergency_cryptkeeper_text"
|
|
/>
|
|
|
|
</com.android.systemui.statusbar.phone.PhoneStatusBarView>
|