Bonian Chen
b99a56d3f5
[automerger skipped] Merge "[Settings] Refactor Wifi Calling description text" into sc-v2-dev-plus-aosp am: 5a36357d63
-s ours
...
am skip reason: Merged-In I60f339bf4adf50236d80176669a557c77f0d97ca with SHA-1 8a892271da
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16401525
Change-Id: I33b3302bcae2d8d70fb9a0de05e487e40a1444f1
2021-12-13 07:46:55 +00:00
Bonian Chen
f72035735c
Merge "[Settings] Fix failure test case" into sc-v2-dev-plus-aosp
2021-12-13 07:32:06 +00:00
Bonian Chen
5a36357d63
Merge "[Settings] Refactor Wifi Calling description text" into sc-v2-dev-plus-aosp
2021-12-13 07:32:06 +00:00
jason thedjoisworo
5923723b4d
Set the EID in the SIM status page to be copyable
...
Add new textIsSelectable attributes to the EID textview
Bug: 210374141
Change-Id: I3b4f223319ee0ab8ae89dc2b0984ae9f9dbe32ae
2021-12-13 06:39:20 +00:00
SongFerngWang
19a5b81eb0
To disable the preferred network mode UI during calling.
...
It is the modem limitation, so disable the preferred network mode UI
during calling.
Bug: 206973375
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Ibb2904b4c6ff6de82063862188cc57e5c14b3aa5
2021-12-13 09:35:08 +08:00
Jason Chiu
4f5f174a5e
Merge "Fix the highlight error after unfolding the device" into sc-v2-dev am: d4b1048dbf
am: 844a21e394
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16440317
Change-Id: Ic8a87daefbc9d86ef11846bcea895c4c91661838
2021-12-10 17:34:44 +00:00
Jason Chiu
844a21e394
Merge "Fix the highlight error after unfolding the device" into sc-v2-dev am: d4b1048dbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16440317
Change-Id: I8a94d8977bd583a59ddd4a658ca50fd6708c2684
2021-12-10 17:16:51 +00:00
Jason Chiu
d4b1048dbf
Merge "Fix the highlight error after unfolding the device" into sc-v2-dev
2021-12-10 17:01:50 +00:00
TreeHugger Robot
38fa2c195d
Merge "Fix the onCreate crash happened among zen mode rule pages" into sc-v2-dev am: 56c49091a0
am: 5302093d5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16432138
Change-Id: Ieba60e9cebdc683fbaa8e382a80d9e4efe666c8f
2021-12-10 17:01:15 +00:00
TreeHugger Robot
5302093d5c
Merge "Fix the onCreate crash happened among zen mode rule pages" into sc-v2-dev am: 56c49091a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16432138
Change-Id: Id8a2517aadca439e98c6ba978652689898b442fd
2021-12-10 16:43:42 +00:00
TreeHugger Robot
56c49091a0
Merge "Fix the onCreate crash happened among zen mode rule pages" into sc-v2-dev
2021-12-10 16:28:29 +00:00
Jason Chiu
11d3b19c51
Fix the highlight error after unfolding the device
...
Unfolding a device generates mutiple lifecycle events and resets the
highlight key.
Check if there's only one activity in the task and then perform the
reset.
Fix: 209016927
Test: manual
Change-Id: I49988fa913270d35a04436777433b7669afb72df
2021-12-10 22:37:22 +08:00
Jan Tomljanovic
0bf0a9acf9
Merge changes I4c813a35,I9bedb58a
...
* changes:
Toggle Security and Privacy entries depending on SafetyCenter status.
Add SafetyCenter entry to Settings.
2021-12-10 11:12:34 +00:00
Zoey Chen
6f914da06a
[Large Screen] Launch MobileNetworkSettings by SubSettingsLauncher
...
Test: atest
Bug: 197609014
Bug: 209606859
Change-Id: Icda934a26daeee13f663c986ebcbc92c952f9c2e
2021-12-10 08:33:58 +00:00
Zoey Chen
989dd669b2
[Large Screen] Launch MobileNetworkActivity as a fragment for split mode
...
Receive intent in MobileNetworkActivity and launch a activity which extend SettingsActivity
Test: atest
Bug: 197609014
Bug: 209606859
Change-Id: Ic07b18b3ea11744f240b25a0986474df763a199b
2021-12-10 08:33:33 +00:00
SongFerng Wang
3b4bb3a0db
[automerger skipped] Merge "[Settings] Avoid crash from rotation screen." am: 04e416d68c
am: 095e4093b0
am: 80aafc5629
-s ours am: d7196d57b0
-s ours
...
am skip reason: Merged-In Ie25b2ab4284d47abdd5db23676d05b6d547b2a73 with SHA-1 e53d70babc
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916818
Change-Id: Ib0c4d22e3067f462f9ef4854880fb828732a5124
2021-12-10 07:42:37 +00:00
SongFerng Wang
d7196d57b0
[automerger skipped] Merge "[Settings] Avoid crash from rotation screen." am: 04e416d68c
am: 095e4093b0
am: 80aafc5629
-s ours
...
am skip reason: Merged-In Ie25b2ab4284d47abdd5db23676d05b6d547b2a73 with SHA-1 e53d70babc
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916818
Change-Id: I4f6270d4d2d79fec98b31a11d68cd8b230885c22
2021-12-10 07:25:28 +00:00
SongFerng Wang
80aafc5629
Merge "[Settings] Avoid crash from rotation screen." am: 04e416d68c
am: 095e4093b0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916818
Change-Id: If245b0d5fd4eeb161effae1c4f26c9cab6ed9860
2021-12-10 07:12:54 +00:00
SongFerng Wang
095e4093b0
Merge "[Settings] Avoid crash from rotation screen." am: 04e416d68c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916818
Change-Id: I33dcb20edcdd04ba2401df931ce8c345341ce3d2
2021-12-10 06:57:58 +00:00
SongFerng Wang
04e416d68c
Merge "[Settings] Avoid crash from rotation screen."
2021-12-10 06:33:59 +00:00
SongFerng Wang
8d135bc9a9
Merge "switch SIM refactor to support MEP"
2021-12-10 06:33:41 +00:00
tom hsu
4a7f809e41
[Settings] Avoid crash from rotation screen.
...
Bug: b/200822579
Test: Local test
Change-Id: Ie25b2ab4284d47abdd5db23676d05b6d547b2a73
Merged-In: Ie25b2ab4284d47abdd5db23676d05b6d547b2a73
2021-12-10 05:14:46 +00:00
Michael Groover
911f7e7aa9
Add unaudited exported flag to exposed runtime receivers
...
Android T allows apps to declare a runtime receiver as not exported
by invoking registerReceiver with a new RECEIVER_NOT_EXPORTED flag;
receivers registered with this flag will only receive broadcasts from
the platform and the app itself. However to ensure developers can
properly protect their receivers, all apps targeting T or later
registering a receiver for non-system broadcasts must specify either
the exported or not exported flag when invoking #registerReceiver;
if one of these flags is not provided, the platform will throw a
SecurityException. This commit updates all the exposed receivers
with a new RECEIVER_EXPORTED_UNAUDITED flag to maintain the existing
behavior of exporting the receiver while also flagging the receiver
for audit before the T release.
Bug: 161145287
Test: Build
Change-Id: Ie97372efebd8258d9a4c503771d55109a85e6ae9
2021-12-09 20:34:02 -08:00
Tsung-Mao Fang
4f9fca877a
Merge "Turn off deep link components by default" into sc-v2-dev am: c496858824
am: edd47e0bdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16419878
Change-Id: I28ba7c4f11fe581391c4f5cbaa110ac7ec38265f
2021-12-10 04:05:44 +00:00
Tsung-Mao Fang
edd47e0bdf
Merge "Turn off deep link components by default" into sc-v2-dev am: c496858824
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16419878
Change-Id: I31adc78d2ccbdc72805278d6dcd2bf08a55ac785
2021-12-10 03:50:32 +00:00
Jason Chiu
bd8f45b9d4
Fix the onCreate crash happened among zen mode rule pages
...
Fix: 199229588
Test: manual
Change-Id: I7b0116de8d9760f420c026a8d65b019e6d2d00df
2021-12-10 11:36:55 +08:00
Tsung-Mao Fang
c496858824
Merge "Turn off deep link components by default" into sc-v2-dev
2021-12-10 03:30:19 +00:00
TreeHugger Robot
b8c35bc89f
Merge "Move the text under slider bar to the description under title" into sc-v2-dev am: 0f0e27cf6a
am: b944d7f110
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16379115
Change-Id: I0d00297b4bdb9844b569f40a6d5cae56929b8f0c
2021-12-10 01:39:54 +00:00
SongFerngWang
22ab05b420
switch SIM refactor to support MEP
...
To create new dialog for MEP. It is a simple UI for testing,
not the final version.
Bug: 199902896
Test: local build pass.
Change-Id: Ief4299e775c0758e4b886d5eff13bd482f8c8ab3
2021-12-10 09:30:30 +08:00
SongFerng Wang
7ab01bb4f6
Merge "switch SIM refactor to support MEP"
2021-12-10 01:24:49 +00:00
TreeHugger Robot
b944d7f110
Merge "Move the text under slider bar to the description under title" into sc-v2-dev am: 0f0e27cf6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16379115
Change-Id: I5cf2e273ae5dda74a8491a85588e795203b73c43
2021-12-10 01:23:35 +00:00
TreeHugger Robot
0f0e27cf6a
Merge "Move the text under slider bar to the description under title" into sc-v2-dev
2021-12-10 01:03:24 +00:00
TreeHugger Robot
37af4dab6d
Merge "add post_notification permission to manifest so the package can send notifications on T+"
2021-12-10 00:17:02 +00:00
TreeHugger Robot
10593796f0
Merge "Remove subtext from work challenge screens"
2021-12-09 22:51:33 +00:00
Joe Bolinger
6f35ae6fcb
Update remove face enrollment strings for convenience. am: 493e889dd6
am: a0fcc6e18e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16433461
Change-Id: Id17a7dede2acc2d5b7824100a98fb3adc1f3ba2f
2021-12-09 21:41:16 +00:00
Joe Bolinger
a0fcc6e18e
Update remove face enrollment strings for convenience. am: 493e889dd6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16433461
Change-Id: Ib3901ce16b07b3ee5d8554cc62acae5bbf4a76d6
2021-12-09 21:23:35 +00:00
Joe Bolinger
493e889dd6
Update remove face enrollment strings for convenience.
...
Fix: 209877102
Test: manual (enroll & delete)
Change-Id: Idb3a8d3622574edc47673e8fe6a72a5b9d449c7b
2021-12-09 19:24:27 +00:00
Joe Bolinger
1e5d475fdc
Merge "Update enrollment edu animation." into sc-v2-dev am: e8d9c1e1d3
am: 2782c90f66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16389834
Change-Id: Ia9b7908bb2e28d4a897ba44d73609b9e34a4bd4b
2021-12-09 19:02:03 +00:00
Joe Bolinger
2782c90f66
Merge "Update enrollment edu animation." into sc-v2-dev am: e8d9c1e1d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16389834
Change-Id: I7c4794b8a5b385fc341e207384d91703a6e509af
2021-12-09 18:38:40 +00:00
Joe Bolinger
e8d9c1e1d3
Merge "Update enrollment edu animation." into sc-v2-dev
2021-12-09 18:09:34 +00:00
Tom Hsu
382a53c9fd
Merge "[Provider Model] fix incorrect signal icon on internet picker" into sc-v2-dev am: c51a58d819
am: 7dc4aafbc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16422508
Change-Id: I498179cab9d352d480b5699c1c356ae2a2b6c616
2021-12-09 16:40:41 +00:00
Tom Hsu
7dc4aafbc6
Merge "[Provider Model] fix incorrect signal icon on internet picker" into sc-v2-dev am: c51a58d819
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16422508
Change-Id: I0c858bb26f99a4fc52955b6f513ff09c2e0c7d1e
2021-12-09 16:25:00 +00:00
Tom Hsu
c51a58d819
Merge "[Provider Model] fix incorrect signal icon on internet picker" into sc-v2-dev
2021-12-09 16:11:13 +00:00
TreeHugger Robot
e91ef41e9b
Merge "Set the package name to the deep link intent" into sc-v2-dev am: 46655e62ef
am: 2d9dc7df45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16426484
Change-Id: If3f645bb0c778632662cf74c8049771319bcd57c
2021-12-09 15:34:05 +00:00
TreeHugger Robot
2d9dc7df45
Merge "Set the package name to the deep link intent" into sc-v2-dev am: 46655e62ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16426484
Change-Id: I34fb5b76c1a984f02995539d9ab6f0679a924ae4
2021-12-09 15:19:13 +00:00
SongFerng Wang
00e72c417d
[automerger skipped] Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev am: c350919fa4
am: d06e52bc4b
-s ours
...
am skip reason: Merged-In Ic933c2294401bc50e105ddcfd2a17886d0bbefc3 with SHA-1 f54ead1f94
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16182703
Change-Id: I7a4da0e76c926f806b98c7fac223f031eb71f15c
2021-12-09 15:04:29 +00:00
tom hsu
90274b2033
[Provider Model] fix incorrect signal icon on internet picker
...
- Modify incorrect sub id to TelephonyManager
Bug: 204411539
Test: b/204411539#17
Change-Id: I7453267a1cd6158f03aa9b94f780fc2faa06d990
2021-12-09 15:03:10 +00:00
TreeHugger Robot
46655e62ef
Merge "Set the package name to the deep link intent" into sc-v2-dev
2021-12-09 15:01:26 +00:00
SongFerng Wang
d06e52bc4b
Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev am: c350919fa4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16182703
Change-Id: I0a22265ceeab9ccddca467338ed4a43f7636f3b7
2021-12-09 14:49:14 +00:00
SongFerng Wang
c350919fa4
Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev
2021-12-09 14:24:43 +00:00