0cf8dfce9b
This moves most of the logic out of the view and into StatusBarWindowViewController. It is not beautiful, but it is cleaner than before. This removes the final call to Dependency.get(FalsingManager.class). This also fixes a small, old bug in StatusBarWindowView.onInterceptTouchEvent where the results of calling hte super method were being unintentionally ingored. (This bug would have been introduced nearly seven years ago.) Bug: 141751146,136279712 Test: atest SystemUITests Change-Id: I5e09c1c0f2a3098db1a47837ddce3d382099f483
110 lines
4.3 KiB
XML
110 lines
4.3 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.
|
|
*/
|
|
-->
|
|
|
|
<merge
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:systemui="http://schemas.android.com/apk/res-auto">
|
|
<FrameLayout
|
|
android:id="@+id/big_clock_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:visibility="gone" />
|
|
|
|
<include
|
|
layout="@layout/keyguard_status_view"
|
|
android:visibility="gone" />
|
|
|
|
<com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_gravity="@integer/notification_panel_layout_gravity"
|
|
android:id="@+id/notification_container_parent"
|
|
android:clipToPadding="false"
|
|
android:clipChildren="false">
|
|
|
|
<include layout="@layout/dock_info_overlay" />
|
|
|
|
<FrameLayout
|
|
android:id="@+id/qs_frame"
|
|
android:layout="@layout/qs_panel"
|
|
android:layout_width="@dimen/qs_panel_width"
|
|
android:layout_height="match_parent"
|
|
android:layout_gravity="@integer/notification_panel_layout_gravity"
|
|
android:clipToPadding="false"
|
|
android:clipChildren="false"
|
|
systemui:viewType="com.android.systemui.plugins.qs.QS" />
|
|
|
|
<!-- Temporary area to test out home controls -->
|
|
<LinearLayout
|
|
android:id="@+id/home_controls_layout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="125dp"
|
|
android:layout_gravity="@integer/notification_panel_layout_gravity"
|
|
android:visibility="gone"
|
|
android:padding="8dp"
|
|
android:layout_margin="5dp"
|
|
android:background="?android:attr/colorBackgroundFloating"
|
|
android:orientation="vertical">
|
|
</LinearLayout>
|
|
|
|
<com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout
|
|
android:id="@+id/notification_stack_scroller"
|
|
android:layout_marginTop="@dimen/notification_panel_margin_top"
|
|
android:layout_width="@dimen/notification_panel_width"
|
|
android:layout_height="match_parent"
|
|
android:layout_gravity="@integer/notification_panel_layout_gravity"
|
|
android:layout_marginBottom="@dimen/close_handle_underlap" />
|
|
|
|
<include layout="@layout/ambient_indication"
|
|
android:id="@+id/ambient_indication_container" />
|
|
|
|
<ViewStub
|
|
android:id="@+id/keyguard_user_switcher"
|
|
android:layout="@layout/keyguard_user_switcher"
|
|
android:layout_height="match_parent"
|
|
android:layout_width="match_parent" />
|
|
|
|
<include
|
|
layout="@layout/keyguard_status_bar"
|
|
android:visibility="invisible" />
|
|
|
|
<Button
|
|
android:id="@+id/report_rejected_touch"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="@dimen/status_bar_header_height_keyguard"
|
|
android:text="@string/report_rejected_touch"
|
|
android:visibility="gone" />
|
|
|
|
</com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer>
|
|
|
|
<include
|
|
layout="@layout/keyguard_bottom_area"
|
|
android:visibility="gone" />
|
|
|
|
<com.android.systemui.statusbar.AlphaOptimizedView
|
|
android:id="@+id/qs_navbar_scrim"
|
|
android:layout_height="96dp"
|
|
android:layout_width="match_parent"
|
|
android:layout_gravity="bottom"
|
|
android:visibility="invisible"
|
|
android:background="@drawable/qs_navbar_scrim" />
|
|
|
|
<include layout="@layout/status_bar_expanded_plugin_frame"/>
|
|
</merge> |