This change reuses KeyguardViewMediator for the new Keyguard implementation in status bar. KeyguardViewManager is replaced by StatusBarKeyguardManager which handles adding the view, setting the state etc. StatusBarWindowManager is introduced to managed the window of the status bar, which has the logic of both the old Keyguard window and the old status bar window. In the current implementation, Keyguard gets displayed like it would be in the bouncer state, but that's likely to change in the future. Also, setHidden in IKeyguardService is also renamed to setOccluded, as the word hidden interferes with the terminology when dismissing the Keyguard. Bug: 13635952 Change-Id: I1c5d5a49d810d8532089f464cb2efe35e577f517
166 lines
7.0 KiB
XML
166 lines
7.0 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
/* apps/common/assets/default/default/skins/StatusBar.xml
|
|
**
|
|
** 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:id="@+id/status_bar"
|
|
android:background="@drawable/system_bar_background"
|
|
android:orientation="vertical"
|
|
android:focusable="true"
|
|
android:descendantFocusability="afterDescendants"
|
|
>
|
|
|
|
<ImageView
|
|
android:id="@+id/notification_lights_out"
|
|
android:layout_width="@dimen/status_bar_icon_size"
|
|
android:layout_height="match_parent"
|
|
android:paddingStart="6dip"
|
|
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="6dip"
|
|
android:paddingEnd="6dip"
|
|
android:orientation="horizontal"
|
|
>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/notification_icon_area"
|
|
android:layout_width="0dip"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="1"
|
|
android:orientation="horizontal"
|
|
>
|
|
<com.android.systemui.statusbar.StatusBarIconView android:id="@+id/moreIcon"
|
|
android:layout_width="@dimen/status_bar_icon_size"
|
|
android:layout_height="match_parent"
|
|
android:src="@drawable/stat_notify_more"
|
|
android:visibility="gone"
|
|
/>
|
|
<com.android.systemui.statusbar.StatusBarIconView android:id="@+id/modeIcon"
|
|
android:layout_width="@dimen/status_bar_icon_size"
|
|
android:layout_height="match_parent"
|
|
android:visibility="gone"
|
|
/>
|
|
<com.android.systemui.statusbar.phone.IconMerger android:id="@+id/notificationIcons"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_alignParentStart="true"
|
|
android:gravity="center_vertical"
|
|
android:orientation="horizontal"/>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/system_icon_area"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:orientation="horizontal">
|
|
|
|
<LinearLayout android:id="@+id/statusIcons"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:gravity="center_vertical"
|
|
android:orientation="horizontal"/>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/signal_battery_cluster"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:paddingStart="2dp"
|
|
android:orientation="horizontal"
|
|
android:gravity="center"
|
|
>
|
|
<include layout="@layout/signal_cluster_view"
|
|
android:id="@+id/signal_cluster"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
/>
|
|
<!-- battery must be padded below to match assets -->
|
|
<com.android.systemui.BatteryMeterView
|
|
android:id="@+id/battery"
|
|
android:layout_height="16dp"
|
|
android:layout_width="10.5dp"
|
|
android:layout_marginBottom="0.33dp"
|
|
android:layout_marginStart="4dip"
|
|
/>
|
|
</LinearLayout>
|
|
|
|
<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:singleLine="true"
|
|
android:paddingStart="6dip"
|
|
android:gravity="center_vertical|start"
|
|
/>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/ticker"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:paddingStart="6dip"
|
|
android:animationCache="false"
|
|
android:orientation="horizontal" >
|
|
<ImageSwitcher android:id="@+id/tickerIcon"
|
|
android:layout_width="@dimen/status_bar_icon_size"
|
|
android:layout_height="@dimen/status_bar_icon_size"
|
|
android:layout_marginEnd="4dip"
|
|
>
|
|
<com.android.systemui.statusbar.AnimatedImageView
|
|
android:layout_width="@dimen/status_bar_icon_size"
|
|
android:layout_height="@dimen/status_bar_icon_size"
|
|
android:scaleType="center"
|
|
/>
|
|
<com.android.systemui.statusbar.AnimatedImageView
|
|
android:layout_width="@dimen/status_bar_icon_size"
|
|
android:layout_height="@dimen/status_bar_icon_size"
|
|
android:scaleType="center"
|
|
/>
|
|
</ImageSwitcher>
|
|
<com.android.systemui.statusbar.phone.TickerView android:id="@+id/tickerText"
|
|
android:layout_width="0dip"
|
|
android:layout_weight="1"
|
|
android:layout_height="wrap_content"
|
|
android:paddingTop="2dip"
|
|
android:paddingEnd="10dip">
|
|
<TextView
|
|
android:textAppearance="@style/TextAppearance.StatusBar.PhoneTicker"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:singleLine="true"
|
|
/>
|
|
<TextView
|
|
android:textAppearance="@style/TextAppearance.StatusBar.PhoneTicker"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:singleLine="true"
|
|
/>
|
|
</com.android.systemui.statusbar.phone.TickerView>
|
|
</LinearLayout>
|
|
</com.android.systemui.statusbar.phone.PhoneStatusBarView>
|