ef81cbdec4
Keyguard default show NO SIM earlier than Telephony/Subscription callback
Refactor CarrierText & KeyguardUpdateMonitor
- Replace setup flag by resource attr(showMissingSim/showAirplaneMode)
- Remove setDiplayFlags API, and add mTelephonyCapable flag
- Implement MSG_TELEPHONY_CAPABLE in KeyguardUpdateMonitor
- Default do not show AirplaneMode & NO_SIM label unless define in xml
Bug: 109731429
Test: atest SystemUITests
atest frameworks/base/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java
Manual:
1) Insert SIM and reboot device, only show "No Service"->"Operator"
2) Remove SIM and reboot device, only show "No SIM"
3) Enable AirplaneMode reboot, only show "Airplane mode"
4) Insert SIM and trigger sysui crash, state same as 1)
5) Remove SIM and trigger sysui crash, state same as 2)
6) Enable APM trigger sysui crash, state same as 3)
7) Enable APM & WFC, turn on wifi in keyguard showing
-> "Airplane mode" -> "" -> "WiFi Calling"
8) Enable APM & WFC, turn off wifi in keyguard showing
-> "Wifi Calling" -> "Airplane mode"
Change-Id: I4459997420484431751a4c088aa3856724affe6a
81 lines
3.5 KiB
XML
81 lines
3.5 KiB
XML
<?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-auto"
|
|
android:id="@+id/keyguard_header"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="@dimen/status_bar_header_height_keyguard"
|
|
android:baselineAligned="false"
|
|
android:gravity="center_vertical"
|
|
>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/status_icon_area"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:layout_alignParentEnd="true"
|
|
android:gravity="center_vertical|end" >
|
|
<FrameLayout android:id="@+id/system_icons_container"
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="1"
|
|
android:layout_marginStart="@dimen/system_icons_super_container_margin_start"
|
|
android:gravity="center_vertical|end"
|
|
android:paddingEnd="@dimen/system_icons_keyguard_padding_end" >
|
|
<include layout="@layout/system_icons" />
|
|
</FrameLayout>
|
|
|
|
<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: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>
|
|
|
|
<Space
|
|
android:id="@+id/cutout_space_view"
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:gravity="center"
|
|
android:visibility="gone" />
|
|
|
|
<com.android.keyguard.CarrierText
|
|
android:id="@+id/keyguard_carrier_text"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_marginStart="@dimen/keyguard_carrier_text_margin"
|
|
android:layout_toStartOf="@id/system_icons_container"
|
|
android:gravity="center_vertical"
|
|
android:ellipsize="marquee"
|
|
android:textDirection="locale"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?attr/wallpaperTextColorSecondary"
|
|
android:singleLine="true"
|
|
systemui:showMissingSim="true"
|
|
systemui:showAirplaneMode="true" />
|
|
|
|
</com.android.systemui.statusbar.phone.KeyguardStatusBarView>
|