SongFerng Wang
d42db7ebbf
[automerger skipped] Merge "To disable the preferred network mode UI during calling." am: 9dec28892c
am: a74e6cd2ec
am: 38a109d745
am: 81d58df274
-s ours
...
am skip reason: Merged-In Ibb2904b4c6ff6de82063862188cc57e5c14b3aa5 with SHA-1 19a5b81eb0
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331
Change-Id: I90c26f124e0c8514759a27dfa2c96f623e268887
2021-12-14 03:02:02 +00:00
SongFerng Wang
81d58df274
Merge "To disable the preferred network mode UI during calling." am: 9dec28892c
am: a74e6cd2ec
am: 38a109d745
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331
Change-Id: Ie25bb9a2faee5e4ed58591e903778e3db21ef838
2021-12-14 02:44:15 +00:00
SongFerng Wang
38a109d745
Merge "To disable the preferred network mode UI during calling." am: 9dec28892c
am: a74e6cd2ec
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331
Change-Id: Id3a811f5d3d37fc0e361811b27d76c8a0806c95b
2021-12-14 02:22:54 +00:00
SongFerng Wang
a74e6cd2ec
Merge "To disable the preferred network mode UI during calling." am: 9dec28892c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331
Change-Id: Ibdad65e0fc67eed1f57bcf076fe5e8ea577fa21d
2021-12-14 01:58:22 +00:00
SongFerng Wang
9dec28892c
Merge "To disable the preferred network mode UI during calling."
2021-12-14 01:40:36 +00:00
SongFerngWang
ce7d4b730c
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
Merged-In: Ibb2904b4c6ff6de82063862188cc57e5c14b3aa5
2021-12-14 04:16:44 +08:00
SongFerng Wang
f0b89531b2
Merge "To disable the preferred network mode UI during calling."
2021-12-13 18:53:01 +00:00
Treehugger Robot
06504aeb5f
Merge "Set the EID in the SIM status page to be copyable" am: eba925809d
am: 43c08cc42f
am: 38d4bfc954
am: d3548f5ac3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715
Change-Id: I2f1db1fb485603284d060fd1d7359047d80886a0
2021-12-13 15:43:42 +00:00
Treehugger Robot
d3548f5ac3
Merge "Set the EID in the SIM status page to be copyable" am: eba925809d
am: 43c08cc42f
am: 38d4bfc954
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715
Change-Id: I022e833b6ffbb07055fb52234a9ca4de0b394a22
2021-12-13 15:26:45 +00:00
Treehugger Robot
38d4bfc954
Merge "Set the EID in the SIM status page to be copyable" am: eba925809d
am: 43c08cc42f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715
Change-Id: Ib89b68b80bbfec649ddf54b50de568c94ce8d6b3
2021-12-13 15:03:49 +00:00
Bonian Chen
7b4ba32bbe
Merge "[Settings] Fix failure test case" into sc-v2-dev am: 4b9b6b632a
am: 5b9bb1ea02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16430896
Change-Id: I3a2e04b99e58a24206a8e5cce132026de92af733
2021-12-13 15:03:32 +00:00
Bonian Chen
b4d099c0c8
[automerger skipped] Merge "[Settings] Refactor Wifi Calling description text" into sc-v2-dev am: 05836450f9
-s ours am: 7fe06efc03
-s ours
...
am skip reason: Merged-In I60f339bf4adf50236d80176669a557c77f0d97ca with SHA-1 5de864ae93
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16376597
Change-Id: I16abb6fe7c029e2b750c84a9bf3dc00a35244be2
2021-12-13 15:03:27 +00:00
tom hsu
58244b1b74
[Panlingual] Implement entries of Panlingual in settings UI part.
...
- Path 1 : System -> Language & Input -> App Languages -> per app
language
- path 2 : System -> Apps -> App Info -> per app language
Video: https://screencast.googleplex.com/cast/NjUyNTUzMDY0MTc5MzAyNHxjNTg2MzMwYS0yOA
Bug: 206854105
Test: local test pass
Test: atest pass
Change-Id: Ic06fa4f0c6ec68680eb828032b6e3f479b412dc4
2021-12-13 22:54:40 +08:00
Treehugger Robot
43c08cc42f
Merge "Set the EID in the SIM status page to be copyable" am: eba925809d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715
Change-Id: Icbf909388b53ab1846fc2fca27c7c6bb7201a3e6
2021-12-13 14:48:47 +00:00
Bonian Chen
5b9bb1ea02
Merge "[Settings] Fix failure test case" into sc-v2-dev am: 4b9b6b632a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16430896
Change-Id: If58037882a6c4ee60cb799cd9d8b673097d87ea9
2021-12-13 14:48:27 +00:00
Bonian Chen
7fe06efc03
[automerger skipped] Merge "[Settings] Refactor Wifi Calling description text" into sc-v2-dev am: 05836450f9
-s ours
...
am skip reason: Merged-In I60f339bf4adf50236d80176669a557c77f0d97ca with SHA-1 5de864ae93
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16376597
Change-Id: I0f7920647fa91ff0bf49ce3f4e4133e5d0e72645
2021-12-13 14:48:21 +00:00
Treehugger Robot
eba925809d
Merge "Set the EID in the SIM status page to be copyable"
2021-12-13 14:25:11 +00:00
Bonian Chen
4b9b6b632a
Merge "[Settings] Fix failure test case" into sc-v2-dev
2021-12-13 14:19:44 +00:00
Bonian Chen
05836450f9
Merge "[Settings] Refactor Wifi Calling description text" into sc-v2-dev
2021-12-13 14:19:44 +00:00
Bonian Chen
f731c74fb4
Merge "[Settings] Support phone number talkback" into sc-v2-dev am: 14d03e77ad
am: 3900342c14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16430899
Change-Id: Ib1c74a5099164c0c31dc2c0dd3398c714195dac3
2021-12-13 10:01:17 +00:00
Bonian Chen
3900342c14
Merge "[Settings] Support phone number talkback" into sc-v2-dev am: 14d03e77ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16430899
Change-Id: I4492b8cd17c4ad4b288a356722a92936d97898f5
2021-12-13 09:46:35 +00:00
Zoey Chen
a6c50cac45
Merge changes Icda934a2,Ic07b18b3
...
* changes:
[Large Screen] Launch MobileNetworkSettings by SubSettingsLauncher
[Large Screen] Launch MobileNetworkActivity as a fragment for split mode
2021-12-13 09:25:38 +00:00
Bonian Chen
14d03e77ad
Merge "[Settings] Support phone number talkback" into sc-v2-dev
2021-12-13 09:23:17 +00:00
Bonian Chen
d6482baa2b
Merge "[Settings] Fix failure test case" into sc-v2-dev-plus-aosp am: f72035735c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16430897
Change-Id: I21cd55b4a400e1a87745b9d1aca6cc1ecc7d45b3
2021-12-13 07:46:59 +00:00
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
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