Bonian Chen
4da1d87a20
[automerger skipped] Revert "[Settings] configuration for hidding SIM notification UI" am: 26aa2414a0 -s ours am: a4c9dbd3db -s ours am: 9ee0d947ea -s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75bhttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310155
Change-Id: I7bc8c88f3edaba0f165fc0b01c4883c58331326a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 15:00:55 +00:00
Bonian Chen
9ee0d947ea
[automerger skipped] Revert "[Settings] configuration for hidding SIM notification UI" am: 26aa2414a0 -s ours am: a4c9dbd3db -s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75bhttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310155
Change-Id: I68206f2dce0bd4b5bee117ad4f056dd1d9d05e17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 14:27:56 +00:00
Bonian Chen
a4c9dbd3db
[automerger skipped] Revert "[Settings] configuration for hidding SIM notification UI" am: 26aa2414a0 -s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75bhttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299466
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310155
Change-Id: I31ef77d9a714c6ff87b3bd07b91e11cd050e6270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 14:08:25 +00:00
Chaohui Wang
8ac4bd98d2
Merge "Reduce flaky of SettingsSpaUnitTests"
2022-11-22 13:57:06 +00:00
Zhenwei Chen
5281b5e770
Merge "Clean up useless defender dialog code"
2022-11-22 13:32:12 +00:00
Bonian Chen
26aa2414a0
Revert "[Settings] configuration for hidding SIM notification UI"
...
Revert submission 2299468-settings_without_siminfo
Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI
Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log
Bug: 260055628
Merged-In: I07d9ddeb96ca590decf28126ce97fba4c1783304
Merged-In: I7a912a3393694155d29614d325796e08598985bf
Merged-In: I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f
Change-Id: Ib366c3fca7433e58d1925f27af11a794afb3ca00
2022-11-22 11:57:34 +00:00
Bonian Chen
0a4295d688
Revert "[Settings] configuration for hidding SIM related UI"
...
Revert submission 2299468-settings_without_siminfo
Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI
Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log
Bug: 260055628
Merged-In: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Change-Id: Idb765be594a55e9f26bf378656d6b18c8f3e37c0
2022-11-22 11:52:05 +00:00
Bonian Chen
3165056c63
[automerger skipped] Merge "[Settings] configuration for hidding SIM settings UI" am: 769d773997 am: 0a733a9ed9 am: 135392ec6d -s ours
...
am skip reason: Merged-In If1df99a79e51125d03f534cdfc9408b01c61024f with SHA-1 5bcfa284a9https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299468
Change-Id: I8f47d9e605f255d978c3afab3e8ce753bb957554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:38 +00:00
Bonian Chen
f63489eb13
[automerger skipped] Merge "[Settings] configuration for hidding SIM remove UI" am: 889c81f77a am: 68a039754a am: e71a029160 -s ours
...
am skip reason: Merged-In Iea40b89733cc75a41f960fecb2ac24177a4cbd3d with SHA-1 69f6e76f2chttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299467
Change-Id: I82cc3bccadb68aece589a3efde3f4f434c07f35d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:37 +00:00
Bonian Chen
8f97723204
[automerger skipped] Merge "[Settings] configuration for hidding SIM notification UI" am: 56ff3fd99a -s ours am: e1d5ccf789 -s ours am: 255d36821b -s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75bhttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299466
Change-Id: Ia0a514c951e270cf158dd24a863fc42b911f752b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:35 +00:00
Bonian Chen
acca0d2e75
[automerger skipped] [Settings] configuration for hidding SIM notification UI am: 5c595b3789 -s ours am: 933dbbd5a4 -s ours am: 62360d4f2e -s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75bhttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299466
Change-Id: Iab91d0436d4da075c28282121ad68a2b1f25c31d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:33 +00:00
Bonian Chen
37148a0ca1
[automerger skipped] Merge "[Settings] configuration for hidding SIM provider UI" am: f7ec7e66c4 am: f901e617c1 am: 3150fa819d -s ours
...
am skip reason: Merged-In I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b with SHA-1 2f07595eb0https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299465
Change-Id: I27f1ee6be1c18490d07bdfe76a60e5bf2514ecdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:32 +00:00
Bonian Chen
f7d2fc878c
[automerger skipped] Merge "[Settings] configuration for hidding SIM related UI" am: d40fd7c597 -s ours am: 5104a1bee0 -s ours am: 6242806577 -s ours
...
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299464
Change-Id: Ie63f2f0662a777f17041cbdac733f2c87e271931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:30 +00:00
Bonian Chen
d3294b194b
[automerger skipped] [Settings] configuration for hidding SIM related UI am: 7dc161dcc8 -s ours am: 5b9e71b0c5 -s ours am: 32b9504f73 -s ours
...
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299464
Change-Id: I749f7dea32c3e7c8cb2cc4a022772c88e5f77568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:29 +00:00
Bonian Chen
3b3dab8a1f
[automerger skipped] Merge "[Settings] configuration for hidding SIM lock UI" am: 1ab73b934b am: 2a98e2a4fe am: aa7fcd1c05 -s ours
...
am skip reason: Merged-In I870c0b53112db56b7bc80bfd585f6f7b3cf82737 with SHA-1 7c3f04aa11https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299463
Change-Id: I0b1e90cfb696fcc9a4559e54bd38d6bea948ba88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 10:17:26 +00:00
Bonian Chen
135392ec6d
Merge "[Settings] configuration for hidding SIM settings UI" am: 769d773997 am: 0a733a9ed9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299468
Change-Id: I0ed0a83df84bdc76991778f8d37f69ee49872b94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:39 +00:00
Bonian Chen
e71a029160
Merge "[Settings] configuration for hidding SIM remove UI" am: 889c81f77a am: 68a039754a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299467
Change-Id: Ie6a0f43399c016fadc058e2d161f1046b8721058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:37 +00:00
Bonian Chen
255d36821b
[automerger skipped] Merge "[Settings] configuration for hidding SIM notification UI" am: 56ff3fd99a -s ours am: e1d5ccf789 -s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75bhttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299466
Change-Id: I1e0cc1d7f50e26d3aa72bd129dd3ca8d16466ef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:36 +00:00
Bonian Chen
62360d4f2e
[automerger skipped] [Settings] configuration for hidding SIM notification UI am: 5c595b3789 -s ours am: 933dbbd5a4 -s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75bhttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299466
Change-Id: I5961afb9592438dcea63e774da9584ab46b413bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:35 +00:00
Bonian Chen
3150fa819d
Merge "[Settings] configuration for hidding SIM provider UI" am: f7ec7e66c4 am: f901e617c1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299465
Change-Id: Ie51d253cc9be1c313fc2fd88d875305b3fd9dd86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:33 +00:00
Bonian Chen
6242806577
[automerger skipped] Merge "[Settings] configuration for hidding SIM related UI" am: d40fd7c597 -s ours am: 5104a1bee0 -s ours
...
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299464
Change-Id: I4c37d3ad1d003f47558e5bb825dbb347d02e90c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:32 +00:00
Bonian Chen
32b9504f73
[automerger skipped] [Settings] configuration for hidding SIM related UI am: 7dc161dcc8 -s ours am: 5b9e71b0c5 -s ours
...
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299464
Change-Id: Id247dbbd5b5fad1219825861d0d528d0e8dc7074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:31 +00:00
Bonian Chen
aa7fcd1c05
Merge "[Settings] configuration for hidding SIM lock UI" am: 1ab73b934b am: 2a98e2a4fe
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299463
Change-Id: I7acaa73cec8fb623a9d9db6a524e86acb48d5cdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:22 +00:00
Chaohui Wang
92d766300d
Reduce flaky of SettingsSpaUnitTests
...
Bug: 236346018
Test: Unit test
Change-Id: I8069a9dcb80f0379f1113c3dbfa5784efcdc8601
2022-11-22 17:29:29 +08:00
Bonian Chen
0a733a9ed9
Merge "[Settings] configuration for hidding SIM settings UI" am: 769d773997
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299468
Change-Id: I4950a96f8637c06eadcf9f1248dc56b129dfca36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:15 +00:00
Bonian Chen
68a039754a
Merge "[Settings] configuration for hidding SIM remove UI" am: 889c81f77a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299467
Change-Id: I1b3e4fc3208e4476e81030319cec4b5705190c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:14 +00:00
Bonian Chen
e1d5ccf789
[automerger skipped] Merge "[Settings] configuration for hidding SIM notification UI" am: 56ff3fd99a -s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75bhttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299466
Change-Id: I4fe15b89021796089a625b3474dec0de68302e8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:12 +00:00
Bonian Chen
933dbbd5a4
[automerger skipped] [Settings] configuration for hidding SIM notification UI am: 5c595b3789 -s ours
...
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75bhttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299466
Change-Id: Ib9c1e811a17bc7923467b6f0c846aac7c6e804fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:11 +00:00
Bonian Chen
f901e617c1
Merge "[Settings] configuration for hidding SIM provider UI" am: f7ec7e66c4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299465
Change-Id: Ibd2bc810f356beb375870fecafd73116ed0b5593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:09 +00:00
Bonian Chen
5104a1bee0
[automerger skipped] Merge "[Settings] configuration for hidding SIM related UI" am: d40fd7c597 -s ours
...
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299464
Change-Id: Id886c8f56c33571dcfca29741d50e248babe8218
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:08 +00:00
Bonian Chen
5b9e71b0c5
[automerger skipped] [Settings] configuration for hidding SIM related UI am: 7dc161dcc8 -s ours
...
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299464
Change-Id: I39b6582327344a55219b960285add58422f69ca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:19:06 +00:00
Bonian Chen
2a98e2a4fe
Merge "[Settings] configuration for hidding SIM lock UI" am: 1ab73b934b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299463
Change-Id: If39c1f00449571d803eeeff89bb69ff2a789382c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:18:59 +00:00
Bonian Chen
769d773997
Merge "[Settings] configuration for hidding SIM settings UI"
2022-11-22 08:51:53 +00:00
Bonian Chen
889c81f77a
Merge "[Settings] configuration for hidding SIM remove UI"
2022-11-22 08:51:53 +00:00
Bonian Chen
56ff3fd99a
Merge "[Settings] configuration for hidding SIM notification UI"
2022-11-22 08:51:53 +00:00
Bonian Chen
f7ec7e66c4
Merge "[Settings] configuration for hidding SIM provider UI"
2022-11-22 08:51:53 +00:00
Bonian Chen
d40fd7c597
Merge "[Settings] configuration for hidding SIM related UI"
2022-11-22 08:51:53 +00:00
Bonian Chen
1ab73b934b
Merge "[Settings] configuration for hidding SIM lock UI"
2022-11-22 08:51:53 +00:00
TreeHugger Robot
f137463ddc
Merge "Add biometric2 unit test owner"
2022-11-22 05:48:45 +00:00
Zhenwei Chen
a725bac68c
Clean up useless defender dialog code
...
Test: Unit test passed
Bug: 256523123
Change-Id: If3cbe4072c891f1af6b5aa4fb624e4e486c78ad6
Signed-off-by: Zhenwei Chen <zhenwec@google.com >
2022-11-22 12:22:08 +08:00
TreeHugger Robot
f4b81c8207
Merge "Adds settings item for quick affordances." into tm-qpr-dev am: 6f908bae6f am: 6c7910557e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20427460
Change-Id: I734695139164190b049052af8456dfb8127202d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 03:52:37 +00:00
Milton Wu
f5e631dd77
Add biometric2 unit test owner
...
Bug: 236072782
Test: Build pass
Change-Id: Iea90eb418eb61087c44c037356a4171197f9f6c7
2022-11-22 03:20:52 +00:00
TreeHugger Robot
6c7910557e
Merge "Adds settings item for quick affordances." into tm-qpr-dev am: 6f908bae6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20427460
Change-Id: Idb43b7a13130da5c2aa84df780d42aeca0771b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 03:17:16 +00:00
TreeHugger Robot
6f908bae6f
Merge "Adds settings item for quick affordances." into tm-qpr-dev
2022-11-22 02:59:15 +00:00
Chaohui Wang
407560fde4
Merge "Move ComposeContentTestRuleExt to SpaLibTestUtils"
2022-11-22 02:39:36 +00:00
Alejandro Nijamkin
01df2b4ee2
Adds settings item for quick affordances.
...
This is in Display > Lock screen. It reads "Buttons" and the summary
text below it is a comma delimited list of the names of the
currently-selected quick affordances.
Fix: 256662519
Test: Manual verification that the lock screen and wallet
items are gone and the new item is visible and clicking it opens the
Wallpaper & style settings screen
Change-Id: If3746b5d0eb8c61edb9378cdb217ca248b999944
2022-11-21 16:42:45 -08:00
Florian Mayer
2a1f7cb453
[MTE] fix broken test
...
Bug: 245624194
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MemtagHelperTest
Change-Id: I71ad79270a5f538bf7a447345aa610c514683fec
2022-11-21 11:19:06 -08:00
Florian Mayer
dbc8874386
Merge "[MTE] disable dev option if security setting is on"
2022-11-21 18:57:49 +00:00
Chaohui Wang
3d10bebe06
Move ComposeContentTestRuleExt to SpaLibTestUtils
...
Also fix some failed tests.
Bug: 259520506
Test: Unit test
Change-Id: I0eaf00defdad2b90bf4e67476e33a86751488bc0
2022-11-22 00:30:52 +08:00
Chaohui Wang
d89bb9d7c8
Merge "Set configChanges for Spa Browser Activity"
2022-11-21 15:55:11 +00:00
