Jason Hsu
437f7c1662
Merge "Add new string to hint user of triple-tap shortcut delay" into sc-v2-dev am: dc0ee218e9
am: 22d79fabb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16419877
Change-Id: I60bced8f5d6919fc223cbee145b413f6f033ba27
2021-12-09 13:35:12 +00:00
Alex Johnston
5b848403df
[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: 2dae4fdcc8
-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: I659fd7bf93b43079fa93ccae4b827964a7d1861b
2021-12-09 13:35:03 +00:00
Alex Johnston
9141bc5ce0
[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: f583dd9b48
-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: Id715b6e17e2268d28e74bbda0261635b89e2c4fb
2021-12-09 13:34:56 +00:00
Alex Johnston
9ac648e7d7
[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: 5d995a27fb
-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: I0e3368ffcdc052df4db8594dcefc24bb1f4b0d0b
2021-12-09 13:34:49 +00:00
Alex Johnston
ff82ed5d3c
[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: 9cce03bd7f
-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: I2ecb06c6f0ede43e5c619d2dc28a223b60dd73bc
2021-12-09 13:34:40 +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
Rubin Xu
70172863a7
Remove subtext from work challenge screens
...
Bug: 201045654
Test: manual
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: Ibd65e27d5ed2762d04aa7750908506d0353a0727
2021-12-09 13:27:03 +00:00
TreeHugger Robot
9673300ea4
Merge "Remove the replaced activity checking to impact launching performance" into sc-v2-dev am: 6dbc3835f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16426486
Change-Id: Iadc95c4f5961003d562982148f9e916cf2cf97c6
2021-12-09 13:16:54 +00:00
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
TreeHugger Robot
6dbc3835f8
Merge "Remove the replaced activity checking to impact launching performance" into sc-v2-dev
2021-12-09 13:09:31 +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
03e6833766
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67
am: c745bc427e
-s ours am: ab28d070b4
-s ours am: 76870c6509
-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: Iaffd9d570cf5fb634c4733150700b563a1436837
2021-12-09 12:51:36 +00:00
Alex Johnston
c7125cf607
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67
am: c745bc427e
am: 6b792ce56b
-s ours am: 64f416950d
-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: Ib941a0d8c0524642defb25d1f0127adaa849907b
2021-12-09 12:51:12 +00:00
Alex Johnston
9397518988
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
am: 6f8ba573a8
-s ours am: edb4843063
-s ours am: bad8e1ccfa
-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: I6079fd23c6d143dabb782ea9182907f0260e42d7
2021-12-09 12:50:39 +00:00
Alex Johnston
34765198c6
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
am: 88b7d05d76
-s ours am: a849920dce
-s ours am: 6ce0fffbb3
-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: I85514b7dc229f446b466a922740ef630f64dd7d6
2021-12-09 12:50:28 +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
bad8e1ccfa
[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: I337e79d206987b608a6cbadd53f8f63d30b545f5
2021-12-09 12:35:26 +00:00
Alex Johnston
6ce0fffbb3
[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: Id700cc25a0a5c7aec4704368c00864733482de46
2021-12-09 12:35:20 +00:00
TreeHugger Robot
66db4b4641
Merge "Revert "Revert "Device do network scan after user rotates NetworkSelection page"""
2021-12-09 12:34:54 +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
Bonian Chen
e8711bd32c
[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 12:28:47 +00:00
Bonian Chen
5fa5323d3b
[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 12:26:52 +00:00
Bonian Chen
67b1ed67cf
Merge "[Settings] Fix failure test case"
2021-12-09 12:26:17 +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
9b734f8830
[automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67
am: 11b874264d
-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: I755574c846bcd3da85ee7334495230bed8349e17
2021-12-09 12:19:38 +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
11b874264d
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: Icaa7eecb1381615c7e2081b697e1529c5c9a4aea
2021-12-09 12:03:38 +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
ykhung
b3f3f3d4f2
Remove the replaced activity checking to impact launching performance
...
Bug: 209081502
Test: make SettingsRoboTests
Change-Id: Id8e2144a5965601be9c290bc4df6db0d0beb0917
Merged-In: Id8e2144a5965601be9c290bc4df6db0d0beb0917
2021-12-09 11:51:11 +00:00
Alex Li
aad70e4cea
Merge "[Settings] Remove override the transition to fade during the Suw flow." into sc-v2-dev am: b1a91c9f95
am: 1ed0cd05c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16413592
Change-Id: I635c9101377046d974a020a23debef671073d5a8
2021-12-09 11:42:38 +00:00
TreeHugger Robot
249c7613e6
Merge "Remove the replaced activity checking to impact launching performance"
2021-12-09 11:34:10 +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
Jason Chiu
209df88d9d
Set the package name to the deep link intent
...
If a deep link intent is not specified a package name, the intent action
will be resolved to ForwardIntentToParent in some cases.
Fix: 209928944
Test: manual
Change-Id: I502be6be550ba817b4337f2d0793a7b3678fc8d2
2021-12-09 10:20:34 +00:00
Jason Chiu
f39248af7a
Merge "Fix the highlight error and remove the empty card" into sc-v2-dev am: e06fb6348a
am: 802c59c52e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16421586
Change-Id: I016bec5503b2e526e6ec62a9e50a0c3cf3227ef6
2021-12-09 10:10:16 +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