Bonian Chen
718c17039e
Merge "[Settings] Fix failure test case" am: 57a7978f8c
am: 54ee717db8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457
Change-Id: I2da154061359ad72ffa736873f06052be93ed721
2021-12-14 02:46:06 +00:00
Bonian Chen
2bed540284
Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc
am: 54e4845d54
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791
Change-Id: Icba1cb39911ec1e06b3952117e95ccf03630aeae
2021-12-14 02:46:04 +00:00
Bonian Chen
54ee717db8
Merge "[Settings] Fix failure test case" am: 57a7978f8c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457
Change-Id: Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed
2021-12-14 02:30:55 +00:00
Bonian Chen
54e4845d54
Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791
Change-Id: I9c1bd5949a1c76ef3ef97868ada3b850af5bc68e
2021-12-14 02:30:53 +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
Bonian Chen
57a7978f8c
Merge "[Settings] Fix failure test case"
2021-12-14 02:09:36 +00:00
Bonian Chen
078f873ccc
Merge "[Settings] Refactor Wifi Calling description text"
2021-12-14 02:09:36 +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
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
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
Treehugger Robot
eba925809d
Merge "Set the EID in the SIM status page to be copyable"
2021-12-13 14:25:11 +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
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
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
Bonian Chen
6e0429af35
[Settings] Fix failure test case
...
Fix test case in Robolectric.
Bug: 209344934
Test: local test
Change-Id: Ia635f977e2262e08ca6bc56436aed624b49a0e30
(cherry picked from commit c4e09e6950
)
2021-12-09 21:30:06 +08:00
Alex Johnston
51d6a6cc87
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
am: 6f8ba573a8
-s ours am: edb4843063
-s ours am: 179d757227
-s ours
...
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873
Change-Id: I8dd11f5a4baec7dae48303a86373e446d24c5ac4
2021-12-09 12:52:27 +00:00
Alex Johnston
fc4e559d89
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
am: 88b7d05d76
-s ours am: a849920dce
-s ours am: 8d273f425e
-s ours
...
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873
Change-Id: I500cca9261e8f5cda0851a8820e29147a8e16e00
2021-12-09 12:52:21 +00:00
Alex Johnston
179d757227
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
am: 6f8ba573a8
-s ours am: edb4843063
-s ours
...
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873
Change-Id: I2768955dccdde79767163ba69565f67a9646e8e9
2021-12-09 12:37:18 +00:00
Alex Johnston
8d273f425e
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
am: 88b7d05d76
-s ours am: a849920dce
-s ours
...
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873
Change-Id: I1c7f2a199b03858a67d999060a57b14fbe4c5dfb
2021-12-09 12:37:12 +00:00
Alex Johnston
6b792ce56b
Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67
am: c745bc427e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414971
Change-Id: I02c96d91aa737bbe07fe6095be07eda384cc3a17
2021-12-09 12:21:39 +00:00
Alex Johnston
edb4843063
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
am: 6f8ba573a8
-s ours
...
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873
Change-Id: I57cd5f04f66b1874bf1d1e1c164eba7789af9ad8
2021-12-09 12:21:13 +00:00
Alex Johnston
a849920dce
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
am: 88b7d05d76
-s ours
...
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873
Change-Id: Ia158b48a9af8910eff034da0847b1d43aa2dc3a7
2021-12-09 12:19:33 +00:00
Alex Johnston
c745bc427e
Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414971
Change-Id: Ib4a03feff7c118afaeae5553f94d9915881c2e4e
2021-12-09 12:05:20 +00:00
Alex Johnston
6f8ba573a8
Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873
Change-Id: I1a2d3a106cfedb8cb43b2eae446e1de9efef955c
2021-12-09 12:04:49 +00:00
Alex Johnston
88b7d05d76
Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873
Change-Id: I6b616fa81ce4c5c53e553f8e692fdc059bb894fe
2021-12-09 12:03:22 +00:00
Alex Johnston
fca5cb3748
Add non system overlay flag to InstallCaCertificateWarning
...
Bug: 196969991
Test: Manual testing with Settings
Change-Id: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
(cherry picked from commit 2f193c8157
)
2021-12-08 21:18:30 +00:00
Alex Johnston
02e8f56e67
Add non system overlay flag to InstallCaCertificateWarning
...
Bug: 196969991
Test: Manual testing with Settings
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Change-Id: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
(cherry picked from commit 2f193c8157
)
2021-12-08 21:18:03 +00:00
Joe Bolinger
687bccdd6f
Merge "Update biometrics OWNERS." am: fe99de597e
am: 7c939b9e4f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1901117
Change-Id: I24532d402b923f5a4957900e4cf9a5649a9c6919
2021-12-08 18:45:59 +00:00
Joe Bolinger
7c939b9e4f
Merge "Update biometrics OWNERS." am: fe99de597e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1901117
Change-Id: I8cd2a34eed6b830896d1370b877dbfdac15221a8
2021-12-08 18:37:58 +00:00
Joe Bolinger
fe99de597e
Merge "Update biometrics OWNERS."
2021-12-08 18:30:44 +00:00
Etienne Ruffieux
76560b4e5b
Merge "Make BluetoothCodecConfig and BluetoothCodecStatus public" am: 0e1a4d3bdf
am: 328169a11c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1849631
Change-Id: I311cab0f288cdbb93f63f5492c6db17087092bdc
2021-12-06 16:03:50 +00:00
Etienne Ruffieux
328169a11c
Merge "Make BluetoothCodecConfig and BluetoothCodecStatus public" am: 0e1a4d3bdf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1849631
Change-Id: I248efd0968d1a4c3207d78c9d015142ba9e02030
2021-12-06 15:40:19 +00:00
Etienne Ruffieux
0e1a4d3bdf
Merge "Make BluetoothCodecConfig and BluetoothCodecStatus public"
2021-12-06 15:16:44 +00:00
Bill Yi
10d16d80c7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891
-s ours am: 7946a90b42
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: Iea8f622284dc73d2d089d57bc285445c1cbaa2cd
2021-12-01 17:20:34 +00:00
Bill Yi
ae32f7324b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16357024
Change-Id: Ie62fe7a31ad3a11650aa423c0f1b3a6abbe7e23b
2021-12-01 17:19:22 +00:00
Bill Yi
7946a90b42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: I6bda0cb874bb45735cda3852876ace5d8eef1635
2021-12-01 17:18:20 +00:00
Bonian Chen
010306644b
[Settings] Refactor Wifi Calling description text
...
Refactor the display of description text when no wifi calling options available.
Enhancement:
1. These text need to align the style with the summary part of the wifi
calling options.
2. These text need to be scrollable in order to see full description.
3. The link within text need to be clickable.
Bug: 204844012
Test: local
Change-Id: Ie89a5b65e75cdd61fab68c6e1bf7c40bfcc68b6b
2021-11-30 13:57:56 +00:00
Bill Yi
1b3c701077
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic270445cc1d57212de38787fab18a2d7ce937cca
2021-11-29 08:52:04 +00:00
Bill Yi
8e754d6891
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If3e347bcbdb1bda52690caa9ead4a9c913c8e990
2021-11-29 08:48:23 +00:00
Treehugger Robot
7e7b1f720e
Merge "Minor clean-up for LE audio setting" am: e41d1b9761
am: ad041d78ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790
Change-Id: I45b1aa93de3633b6fe2ec8b0605fbeac5a4f3d37
2021-11-29 04:27:25 +00:00
Treehugger Robot
ad041d78ee
Merge "Minor clean-up for LE audio setting" am: e41d1b9761
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790
Change-Id: Icc8ed52e3eeaa0aefe4ccc0e65440e58cb0faedd
2021-11-29 03:58:28 +00:00
Treehugger Robot
e41d1b9761
Merge "Minor clean-up for LE audio setting"
2021-11-29 03:41:49 +00:00
Treehugger Robot
ff1ebb31d4
Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83
am: 0a69b346c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835
Change-Id: I6cbdf1b5d405aceb82b4714b4d8101a1f33de239
2021-11-29 02:48:47 +00:00
Alice Kuo
6097f9b830
Handle csip set member automatic pair in Setting am: 629611a43e
am: eb412a0614
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903834
Change-Id: Ibb8140b8af96036750457a6866eb9ba410bc0b84
2021-11-29 02:48:46 +00:00
Alice Kuo
1da3264140
Do not update the previously connected devices for the sub device am: c78fb83aee
am: f6f0126b8e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833
Change-Id: I2f2bf3cac4b0712b8e06beb84b15e6647ccb3130
2021-11-29 02:48:46 +00:00
Alice Kuo
c932678888
Accept the pairing request automatically for the set member pairing am: 61460a1ab1
am: 6aa53808f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903832
Change-Id: Ic7bc92ee8409a22c74e701b0a7b52d841fc12a4d
2021-11-29 02:48:45 +00:00