Commit Graph

110775 Commits

Author SHA1 Message Date
YK Hung
7336fbfcc8 [automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8de -s ours am: ab48f9ba47 -s ours
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772

Change-Id: I0b3a6d8f77a24cc8536503e1f1bedbb35ad54130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 03:00:26 +00:00
Cole Faust
a5572aff15 [automerger skipped] Fix errorprone warnings that should be errors am: 37cfdc7536 -s ours am: a0dd446e61 -s ours
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772

Change-Id: Ie609432ec4075f105f4a89b0702d03d78ef9db17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 03:00:18 +00:00
YK Hung
ab48f9ba47 [automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8de -s ours
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772

Change-Id: I1c3342037844ada6a10e6b822940d0541ec4ce19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 02:32:00 +00:00
Cole Faust
a0dd446e61 [automerger skipped] Fix errorprone warnings that should be errors am: 37cfdc7536 -s ours
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772

Change-Id: I8b1ab784d4aca65eec06c6bf80817c9d043f0acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 02:31:59 +00:00
YK Hung
3836a8a8de Merge "Fix errorprone warnings that should be errors" 2022-11-23 02:07:10 +00:00
Steve Elliott
81fc1b0b4d Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev am: fece948623
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20530303

Change-Id: I9cd33ea6d02cf1243034a399162dfffcd0fd8f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 23:05:49 +00:00
Steve Elliott
fece948623 Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev 2022-11-22 22:50:10 +00:00
Hao Dong
a538195c3c Merge "Use the internal max faces number to check enrolled." into tm-qpr-dev am: a01a1857ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20518779

Change-Id: Id63f4f017a8e2af8ceb03dfbb2f662026839b9eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 17:46:29 +00:00
Hao Dong
a01a1857ec Merge "Use the internal max faces number to check enrolled." into tm-qpr-dev 2022-11-22 17:10:49 +00:00
Bonian Chen
8f936c0bdb Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" am: 5125477d7b am: d33fbde071
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310159

Change-Id: Idc1ee6fcf8fc403ed9592adf34417ebe2b15b7da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:28:07 +00:00
Bonian Chen
4e1a1e65b9 Revert "[Settings] configuration for hidding SIM settings UI" am: 8e98f5a852 am: e4fbf9d941
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310157

Change-Id: I1bcbe2f57013ace3641937897ae2d0d8b64e2f76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:28:05 +00:00
Bonian Chen
52bae42964 Revert "[Settings] configuration for hidding SIM lock UI" am: ead8a35720 am: 2decf2ae45
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310156

Change-Id: I57d2afd3af39506a35ea369ab561d02d039884ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:28:03 +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 188ccde75b is already in history. Merged-In was found from reverted change.

Original change: https://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
d33fbde071 Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" am: 5125477d7b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310159

Change-Id: Ic919498fda4172ede68fcd431b8bdd18056fada6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:08:33 +00:00
Bonian Chen
e4fbf9d941 Revert "[Settings] configuration for hidding SIM settings UI" am: 8e98f5a852
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310157

Change-Id: I76eae77bcd825e7fa5fbc12b46eb72a7f9ddfd02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:08:31 +00:00
Bonian Chen
2decf2ae45 Revert "[Settings] configuration for hidding SIM lock UI" am: ead8a35720
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310156

Change-Id: I91a72f38cc22583202c9c707463735d3f436aac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:08:29 +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 188ccde75b is already in history. Merged-In was found from reverted change.

Reverted change: https://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
Bonian Chen
5125477d7b Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA"
* changes:
  Revert "[Settings] configuration for hidding SIM provider UI"
  Revert "[Settings] configuration for hidding SIM remove UI"
  Revert "[Settings] configuration for hidding SIM settings UI"
  Revert "[Settings] configuration for hidding SIM lock UI"
  Revert "[Settings] configuration for hidding SIM notification UI"
  Revert "[Settings] configuration for hidding SIM related UI"
2022-11-22 13:15:49 +00:00
Bonian Chen
a1c1bd0f81 Revert "[Settings] configuration for hidding SIM provider 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: I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b
Change-Id: If1951dde860bb49e3ea4cd5603ed92ef18bd1f0d
2022-11-22 11:59:26 +00:00
Bonian Chen
3b7d0d2e17 Revert "[Settings] configuration for hidding SIM remove 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: Iea40b89733cc75a41f960fecb2ac24177a4cbd3d
Change-Id: I5c52b841955f5be41ce861aca740147061fc7d3f
2022-11-22 11:59:15 +00:00
Bonian Chen
8e98f5a852 Revert "[Settings] configuration for hidding SIM settings 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: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: I646d664b83d3db12cca81f53f7f5cd82a38e34d0
2022-11-22 11:59:02 +00:00
Bonian Chen
ead8a35720 Revert "[Settings] configuration for hidding SIM lock 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: I870c0b53112db56b7bc80bfd585f6f7b3cf82737
Change-Id: Ie157c9d85b5cea9ded8c4b7928a10e7ae401ab09
2022-11-22 11:58:48 +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
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 188ccde75b is already in history

Original change: https://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 188ccde75b is already in history

Original change: https://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 ed95f35423 is already in history

Original change: https://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 ed95f35423 is already in history

Original change: https://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
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 188ccde75b is already in history

Original change: https://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 188ccde75b is already in history

Original change: https://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 ed95f35423 is already in history

Original change: https://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 ed95f35423 is already in history

Original change: https://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
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
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
Steve Elliott
30ccc43ae1 Revert^2 "Add configuration for defaulting notification behavior"
Test: go through SUW on affected device, view notification screen
Bug: 240472040
Change-Id: I34dbe28226d830bc5ba633e72cd529d97021de85
2022-11-21 15:16:40 +00:00