Slot Change Receiver Migration
Implemented slot change cases when pSIM is inserted and removed. Bug: 153811431 Bug: 170508680 Test: Manually tested Change-Id: Ib0a96da1d7d702f7c64e75b929c73b8548f8e459
This commit is contained in:
37
res/drawable/ic_network_signal_blue.xml
Normal file
37
res/drawable/ic_network_signal_blue.xml
Normal file
@@ -0,0 +1,37 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Copyright (C) 2021 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.
|
||||
-->
|
||||
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="32dp"
|
||||
android:height="32dp"
|
||||
android:viewportWidth="32"
|
||||
android:viewportHeight="32">
|
||||
|
||||
<path
|
||||
android:pathData="M 0 0 H 32 V 32 H 0 V 0 Z" />
|
||||
<path
|
||||
android:fillColor="@color/homepage_generic_icon_background"
|
||||
android:pathData="M24,5.33h1.33c0.74,0,1.33,0.6,1.33,1.33v18.67c0,0.74-0.6,1.33-1.33,1.33H24c-0.74,0-1.33-0.6-1.33-1.33
|
||||
V6.67C22.67,5.93,23.26,5.33,24,5.33z" />
|
||||
<path
|
||||
android:fillColor="@color/homepage_generic_icon_background"
|
||||
android:pathData="M8,18.67h1.33c0.74,0,1.33,0.6,1.33,1.33v5.33c0,0.74-0.6,1.33-1.33,1.33H8c-0.74,0-1.33-0.6-1.33-1.33V20
|
||||
C6.67,19.26,7.26,18.67,8,18.67z" />
|
||||
<path
|
||||
android:fillColor="@color/homepage_generic_icon_background"
|
||||
android:pathData="M16,12h1.33c0.74,0,1.33,0.6,1.33,1.33v12c0,0.74-0.6,1.33-1.33,1.33H16c-0.74,0-1.33-0.6-1.33-1.33v-12
|
||||
C14.67,12.6,15.26,12,16,12z" />
|
||||
</vector>
|
48
res/layout/choose_sim_activity.xml
Normal file
48
res/layout/choose_sim_activity.xml
Normal file
@@ -0,0 +1,48 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2021 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.google.android.setupdesign.GlifLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/glif_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:icon="@drawable/ic_network_signal_blue">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
style="@style/SudContentFrame"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="@dimen/subtitle_bottom_padding">
|
||||
<TextView
|
||||
android:id="@+id/subtitle"
|
||||
style="@style/SudDescription.Glif"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
</LinearLayout>
|
||||
|
||||
<com.google.android.setupdesign.GlifRecyclerLayout
|
||||
android:id="@+id/recycler_list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:entries="@xml/items_multiple_carrier" />
|
||||
|
||||
</LinearLayout>
|
||||
</com.google.android.setupdesign.GlifLayout>
|
@@ -21,6 +21,7 @@
|
||||
<style name="GlifTheme.DayNight" parent="GlifTheme" />
|
||||
<style name="GlifV2Theme.DayNight" parent="GlifV2Theme" />
|
||||
<style name="GlifV3Theme.DayNight" parent="GlifV3Theme" />
|
||||
<style name="GlifV3Theme.DayNight.NoActionBar" parent="GlifV3Theme.NoActionBar" />
|
||||
<style name="GlifV2Theme.DayNight.Transparent" parent="GlifV2Theme.Transparent" />
|
||||
<style name="GlifV3Theme.DayNight.Transparent" parent="GlifV3Theme.Transparent" />
|
||||
<style name="SetupWizardTheme.DayNight.Transparent" parent="SetupWizardTheme.Transparent" />
|
||||
|
@@ -440,4 +440,7 @@
|
||||
|
||||
<!-- Text padding for EmptyTextSettings -->
|
||||
<dimen name="empty_text_padding">24dp</dimen>
|
||||
|
||||
<!-- Choose SIM Activity dimens -->
|
||||
<dimen name="subtitle_bottom_padding">24dp</dimen>
|
||||
</resources>
|
||||
|
@@ -12129,6 +12129,34 @@
|
||||
<string name="post_dsds_reboot_notification_title_with_carrier"><xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g> is active</string>
|
||||
<!-- The body text of post DSDS reboot notification. [CHAR LIMIT=NONE] -->
|
||||
<string name="post_dsds_reboot_notification_text">Tap to update SIM settings</string>
|
||||
<!-- Title on a push notification indicating that the user's device switched to a new mobile network. [CHAR LIMIT=NONE] -->
|
||||
<string name="switch_to_removable_notification">Switched to <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g></string>
|
||||
<!-- Title on a push notification indicating that the user's device switched to a new mobile network. [CHAR LIMIT=NONE] -->
|
||||
<string name="switch_to_removable_notification_no_carrier_name">Switched to another carrier</string>
|
||||
<!-- Message in a push notification indicating that the user's phone has connected to a different mobile network. [CHAR LIMIT=NONE] -->
|
||||
<string name="network_changed_notification_text">Your mobile network has changed</string>
|
||||
|
||||
<!-- Strings for choose SIM activity -->
|
||||
<!-- The title text of choose SIM activity. [CHAR LIMIT=NONE] -->
|
||||
<string name="choose_sim_title">Choose a number to use</string>
|
||||
<!-- The body text of choose SIM activity. [CHAR LIMIT=NONE] -->
|
||||
<string name="choose_sim_text"><xliff:g id="number" example="2">%1$d</xliff:g> numbers are available on this device, but only one can be used at a time</string>
|
||||
<!-- String indicating that we are activating the profile [CHAR LIMIT=NONE] -->
|
||||
<string name="choose_sim_activating">Activating<xliff:g id="ellipsis" example="...">…</xliff:g></string>
|
||||
<!-- String indicating that we failed to activate the selected profile [CHAR LIMIT=NONE] -->
|
||||
<string name="choose_sim_could_not_activate">Couldn\u2019t be activated right now</string>
|
||||
<!-- String indicating that the number for the specified profile is unknown [CHAR LIMIT=NONE] -->
|
||||
<string name="choose_sim_item_summary_unknown">Unknown number</string>
|
||||
|
||||
<!-- Strings for switch SIM confirmation dialog. -->
|
||||
<!-- The title text of switch SIM confirmation dialog. [CHAR LIMIT=NONE] -->
|
||||
<string name="switch_sim_dialog_title">Use <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g>?</string>
|
||||
<!-- The body text of switch SIM confirmation dialog. [CHAR LIMIT=NONE] -->
|
||||
<string name="switch_sim_dialog_text"><xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g> will be used for mobile data, calls, and SMS.</string>
|
||||
<!-- The title text of skip sim switch dialog. [CHAR LIMIT=NONE] -->
|
||||
<string name="switch_sim_dialog_no_switch_title">No active SIMs available</string>
|
||||
<!-- The body text of skip sim switch dialog. [CHAR LIMIT=NONE] -->
|
||||
<string name="switch_sim_dialog_no_switch_text">To use mobile data, call features, and SMS at a later time, go to your network settings</string>
|
||||
|
||||
<!-- Button label of the removable sim card. [CHAR LIMIT=NONE] -->
|
||||
<string name="sim_card_label">SIM card</string>
|
||||
|
@@ -133,6 +133,14 @@
|
||||
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
|
||||
</style>
|
||||
|
||||
<style name="GlifV3Theme.Light.NoActionBar" parent="GlifV3Theme.Light">
|
||||
<item name="android:windowActionBar">false</item>
|
||||
</style>
|
||||
|
||||
<style name="GlifV3Theme.NoActionBar" parent="GlifV3Theme">
|
||||
<item name="android:windowActionBar">false</item>
|
||||
</style>
|
||||
|
||||
<style name="GlifV2Theme.Transparent">
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
@@ -216,6 +224,7 @@
|
||||
<style name="GlifTheme.DayNight" parent="GlifTheme.Light" />
|
||||
<style name="GlifV2Theme.DayNight" parent="GlifV2Theme.Light" />
|
||||
<style name="GlifV3Theme.DayNight" parent="GlifV3Theme.Light" />
|
||||
<style name="GlifV3Theme.DayNight.NoActionBar" parent="GlifV3Theme.Light.NoActionBar" />
|
||||
<style name="GlifV2Theme.DayNight.Transparent" parent="GlifV2Theme.Light.Transparent" />
|
||||
<style name="GlifV3Theme.DayNight.Transparent" parent="GlifV3Theme.Light.Transparent" />
|
||||
<style name="SetupWizardTheme.DayNight.Transparent" parent="SetupWizardTheme.Light.Transparent" />
|
||||
|
16
res/xml/items_multiple_carrier.xml
Normal file
16
res/xml/items_multiple_carrier.xml
Normal file
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2021 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.
|
||||
-->
|
||||
<ItemGroup xmlns:android="http://schemas.android.com/apk/res/android" />
|
Reference in New Issue
Block a user