Jason Hsu
22d79fabb6
Merge "Add new string to hint user of triple-tap shortcut delay" into sc-v2-dev am: dc0ee218e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16419877
Change-Id: I44ab328eff53752e188dd84e9284ff65686f7b64
2021-12-09 13:16:26 +00:00
Alex Johnston
2dae4fdcc8
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
am: 6f8ba573a8
-s ours am: edb4843063
-s ours am: 179d757227
-s ours am: a418a3add2
-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: I200dd8595a060258e915803c87196ff1cf28822a
2021-12-09 13:16:17 +00:00
Alex Johnston
f583dd9b48
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
am: 88b7d05d76
-s ours am: a849920dce
-s ours am: 8d273f425e
-s ours am: 2e2c6def05
-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: Ife35fe3502424e416fa273ce01b7a05d8a6127aa
2021-12-09 13:16:10 +00:00
Alex Johnston
5d995a27fb
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
am: 6f8ba573a8
-s ours am: edb4843063
-s ours am: 179d757227
-s ours am: 51d6a6cc87
-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: Ib23487c71a9611a9ffe85bb3403494961f995b85
2021-12-09 13:14:44 +00:00
Alex Johnston
9cce03bd7f
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
am: 88b7d05d76
-s ours am: a849920dce
-s ours am: 8d273f425e
-s ours am: fc4e559d89
-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: I57a454853de25105e7c124165ee92648620a42e3
2021-12-09 13:14:35 +00:00
Jason Hsu
dc0ee218e9
Merge "Add new string to hint user of triple-tap shortcut delay" into sc-v2-dev
2021-12-09 13:03:12 +00: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
a418a3add2
[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: I8f067f8e33a35eb03fb1fd15fcb631d7c0faf923
2021-12-09 12:52:25 +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
2e2c6def05
[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: I3d9ce05df1c0a3a596c46dce3f1f5fc839a263ba
2021-12-09 12:52:20 +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
76870c6509
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67
am: c745bc427e
-s ours am: ab28d070b4
-s ours
...
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 2f193c8157
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414971
Change-Id: I9db20a1e0edc8eb1e51abaea77693f207d9e683a
2021-12-09 12:36:27 +00:00
Alex Johnston
64f416950d
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67
am: c745bc427e
am: 6b792ce56b
-s ours
...
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 2f193c8157
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414971
Change-Id: I63216f302139b131c1f316f06dedf73681d3b9aa
2021-12-09 12:32:09 +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
ab28d070b4
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67
am: c745bc427e
-s ours
...
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 2f193c8157
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414971
Change-Id: I151c19730fffe923ad1be87430c43301dad46ebc
2021-12-09 12:21:28 +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 Li
1ed0cd05c0
Merge "[Settings] Remove override the transition to fade during the Suw flow." into sc-v2-dev am: b1a91c9f95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16413592
Change-Id: I9db4d5e802cf658ae12c7141b53b30fb77a1c77c
2021-12-09 11:09:05 +00:00
Alex Li
b1a91c9f95
Merge "[Settings] Remove override the transition to fade during the Suw flow." into sc-v2-dev
2021-12-09 10:43:56 +00:00
jasonwshsu
dc156e77b4
Add new string to hint user of triple-tap shortcut delay
...
* Original content in magnification switch shortcut dialog needs to have
different versions for different accessibility software shortcuts. Use
this generic content to replace them.
Bug: 208749782
Test: manual test
Change-Id: Ifc6591625c92ea04f6637ecfe90ce7d7b528b295
2021-12-09 10:00:58 +00:00
Jason Chiu
802c59c52e
Merge "Fix the highlight error and remove the empty card" into sc-v2-dev am: e06fb6348a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16421586
Change-Id: Idacf7580710ead66aeec0c46261e447865f6247d
2021-12-09 09:23:57 +00:00
Jason Chiu
e06fb6348a
Merge "Fix the highlight error and remove the empty card" into sc-v2-dev
2021-12-09 08:59:23 +00:00
Jason Chiu
8c559c2788
Fix the highlight error and remove the empty card
...
Fix: 209918251
Test: manual
Change-Id: I2a5afceea18cd4e1009114091433a2da22ac105e
2021-12-09 15:09:09 +08:00
Tsung-Mao Fang
b559eecc57
Merge "Revert "Device do network scan after user rotates NetworkSelection page"" into sc-v2-dev am: e386d498d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16419883
Change-Id: Iae6baf8a58291ec45acffafa0b5a9487274e4d9a
2021-12-09 06:14:20 +00:00
Tsung-Mao Fang
e386d498d6
Merge "Revert "Device do network scan after user rotates NetworkSelection page"" into sc-v2-dev
2021-12-09 05:53:33 +00:00
Jason Chiu
56c54e4bd9
Merge "Do not show the redundant RemoveAccountFailureDialog" into sc-v2-dev am: 5377da37f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16413584
Change-Id: Ia3f4875855d0e722b178b6bd5cea391db6b4803c
2021-12-09 02:56:29 +00:00
Jason Chiu
5377da37f1
Merge "Do not show the redundant RemoveAccountFailureDialog" into sc-v2-dev
2021-12-09 02:40:05 +00:00
Joe Bolinger
ecb88bace4
Merge "Update biometrics OWNERS." am: fe99de597e
am: 7c939b9e4f
am: 687bccdd6f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1901117
Change-Id: I871c18cedf70a2cd608b1401fee7f1a139a675f0
2021-12-08 23:30:58 +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
Tsung-Mao Fang
f848cd8156
Revert "Device do network scan after user rotates NetworkSelection page"
...
This reverts commit 13aadad7fa
.
Reason for revert: b/207587612
Change-Id: I8bef41eb43088d4a118de30eab0ac3ddc6c7c79c
2021-12-08 14:19:33 +00:00
alexylli
2a7069f561
[Settings] Remove override the transition to fade during the Suw flow.
...
Because Suw side has already override the transition when calling the
font size.
video: https://drive.google.com/file/d/1Lihpj3PFX4-xpg1d3pT3pBqm99noQL-k/view?usp=sharing
Bug: 208374725
Test: manual
Change-Id: Idaa56cdbdc7b9f76fe370ba79130007f7359557c
2021-12-08 17:06:44 +08:00
Joshua Mccloskey
73d9752eea
Merge "Added sensorPrivacyDialog to face settings" into sc-v2-dev am: af87b942f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276448
Change-Id: I94b47b11890b5e7751fad60378128f1f2ee17802
2021-12-08 07:26:21 +00:00
Joshua Mccloskey
af87b942f6
Merge "Added sensorPrivacyDialog to face settings" into sc-v2-dev
2021-12-08 07:01:57 +00:00
Jason Chiu
e5f1d24913
Do not show the redundant RemoveAccountFailureDialog
...
When the AccountManager's confirm remove dialog is canceled, a redundant
ConfirmRemoveAccountDialog showed up.
- Only show the dialog when a real error reported from AccountManager
- Also change RemoveAccountFailureDialog's title to remove the redundant
question mark
Fix: 204948166
Test: manual
Change-Id: If712e120938e80e1bf4593fa78a1a2a70684fc2a
2021-12-08 06:29:19 +00:00
Lucas Dupin
435f0ac1f8
Merge "[Settings] Expose Bluetooth Pairing settings page" into sc-v2-dev am: f6354d8af7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16386048
Change-Id: I53ed6d54a6f50da601a2b2eaaaa229ef5fc76562
2021-12-07 17:57:09 +00:00
Lucas Dupin
f6354d8af7
Merge "[Settings] Expose Bluetooth Pairing settings page" into sc-v2-dev
2021-12-07 17:44:25 +00:00
Betty Chang
7e1d82caad
Merge "To get Display name by active subscription info" into sc-v2-dev am: a22e367fca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341977
Change-Id: I5cd1fb261043cfe4ff478792c11367f249e5c385
2021-12-07 06:00:02 +00:00
Betty Chang
a22e367fca
Merge "To get Display name by active subscription info" into sc-v2-dev
2021-12-07 05:41:11 +00:00
Etienne Ruffieux
3a0084534f
Merge "Make BluetoothCodecConfig and BluetoothCodecStatus public" am: 0e1a4d3bdf
am: 328169a11c
am: 76560b4e5b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1849631
Change-Id: I50c12636bb26250d58a6bd69dc1887e304fb876a
2021-12-06 16:18:10 +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