Merge "Slot Change Receiver Migration" into sc-dev (42827376) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+20 −0

Original line number	Diff line number	Diff line
		@@ -3669,6 +3669,26 @@
		</intent-filter>
		</receiver>

		<activity
		android:name=".sim.ChooseSimActivity"
		android:theme="@style/GlifV3Theme.DayNight.NoActionBar"
		android:launchMode="singleInstance"
		android:exported="false"/>

		<activity
		android:name=".sim.SwitchToEsimConfirmDialogActivity"
		android:exported="false"
		android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
		android:launchMode="singleInstance"
		android:theme="@style/Transparent" />

		<activity
		android:name=".sim.DsdsDialogActivity"
		android:exported="false"
		android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
		android:launchMode="singleInstance"
		android:theme="@style/Transparent" />

		<service android:name=".sim.SimNotificationService"
		android:permission="android.permission.BIND_JOB_SERVICE" />

res/drawable/ic_network_signal_blue.xml

0 → 100644

+37 −0

Original line number	Diff line number	Diff line
		<?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>

res/layout/choose_sim_activity.xml

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		<?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>

res/values-night/themes_suw.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -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" />

res/values/dimens.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -444,4 +444,7 @@

		<!-- Text padding for EmptyTextSettings -->
		<dimen name="empty_text_padding">24dp</dimen>

		<!-- Choose SIM Activity dimens -->
		<dimen name="subtitle_bottom_padding">24dp</dimen>
		</resources>