Commit Graph

110700 Commits

Author SHA1 Message Date
Joshua Mccloskey
db1ec87cb6 Merge "Ensure text doesnt jump during enrollment" into tm-qpr-dev am: 1d04eb6eb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20488559

Change-Id: I85f20ce7a8c0d4973cdcb42744bb7d04b9a7b548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 17:25:44 +00:00
Joshua Mccloskey
1d04eb6eb7 Merge "Ensure text doesnt jump during enrollment" into tm-qpr-dev 2022-11-17 16:56:48 +00:00
Sam Dubey
48eae58586 Revert "Add configuration for defaulting notification behavior" am: a2d06273c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505171

Change-Id: Ic9b89ba7d709e09be8217252485adcfc49575d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 14:01:32 +00:00
Sam Dubey
a2d06273c1 Revert "Add configuration for defaulting notification behavior"
Likely causing b/259499400

This reverts commit a92688d642.

Change-Id: I781a7ecf9139eca11e1db895f86268b893258543
2022-11-17 07:33:18 +00:00
Sayak Dutta
3765a09a58 Merge "Modify call to Header function of Glif Layout to disable autosize" into tm-qpr-dev am: 03ed8c0477
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20472167

Change-Id: I580b3e0944fe2d232a11e73a7e349c6564debd48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 06:19:40 +00:00
Sayak Dutta
03ed8c0477 Merge "Modify call to Header function of Glif Layout to disable autosize" into tm-qpr-dev 2022-11-17 06:07:12 +00:00
Diya Bera
4688fd9074 Merge "Remove header "When using fingerprint unlock" for Udfps" into tm-qpr-dev am: b4a0a0563d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20499435

Change-Id: I65f8405eda3e12b83a365bd469a3a0ce3f5c9f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 01:13:18 +00:00
Diya Bera
6c1eae8a1e Merge "Device displays fingerprint enrollment after swiping back" into tm-qpr-dev am: dfe2bd2df2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20497232

Change-Id: I3a0bcd951ba560a25e257f3dbe4c9657a1e82134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17 01:12:56 +00:00
Diya Bera
b4a0a0563d Merge "Remove header "When using fingerprint unlock" for Udfps" into tm-qpr-dev 2022-11-17 00:59:35 +00:00
Diya Bera
dfe2bd2df2 Merge "Device displays fingerprint enrollment after swiping back" into tm-qpr-dev 2022-11-17 00:59:16 +00:00
Diya Bera
68903de369 Remove header "When using fingerprint unlock" for Udfps
Fixes: 257272989
Test: Manual - Open Fingerprint Settings and observe the UI
Change-Id: I98235e56a3537eff00490584c88f459ac755433f
2022-11-16 21:08:04 +00:00
TreeHugger Robot
c2e89dcdf8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 73348a8859 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9a4bd0ddf5f03530d0341a999fa9f7c7957cc746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 20:55:09 +00:00
Bill Yi
3cccae71eb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ece082dcaf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id36d81341d34e6d08f6a9c6da0465e7edab36b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 20:54:54 +00:00
TreeHugger Robot
2f21a74dc2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 30522878e9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id1904498bdae09ab404a90553efd70d550dfe108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 20:53:24 +00:00
Bill Yi
34bf7191c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 544000b27b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00eb32fcc48c524b76eb6e73da8cdebd2b088a83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 20:52:56 +00:00
TreeHugger Robot
73348a8859 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-16 20:36:20 +00:00
TreeHugger Robot
30522878e9 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-16 20:18:50 +00:00
Diya Bera
c4b95de536 Device displays fingerprint enrollment after swiping back
Fixes: 259198369
Test: Manual - repro steps in bug
Change-Id: Ide7fa0d16daba795cfc3c63a5da351000f918a81
2022-11-16 18:34:26 +00:00
TreeHugger Robot
6dd4a1c56c Merge "[Settings] Fix merge confliction" into stage-aosp-master am: 2904ea9410
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20490498

Change-Id: Icd89903269969d665772c55f6edb42e7ffd7fbba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 14:28:36 +00:00
TreeHugger Robot
2904ea9410 Merge "[Settings] Fix merge confliction" into stage-aosp-master 2022-11-16 13:42:53 +00:00
Bill Yi
544000b27b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I03421835110a4f99b59f5718e078f167c2b44443
2022-11-16 05:10:21 -08:00
Bill Yi
ece082dcaf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iabd3b4c4146bec3960af589135f39a5e2fe96d03
2022-11-16 05:04:31 -08:00
Treehugger Robot
1b70bcbdc4 Merge "Make p2p start searching after turning off airplane mode." am: adb5c5025a am: 425521478a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267183

Change-Id: I84c783493a82247653fdc60932a0383d0c74d61f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 09:40:56 +00:00
Treehugger Robot
425521478a Merge "Make p2p start searching after turning off airplane mode." am: adb5c5025a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267183

Change-Id: Idb18ef0319f4a36e49cc01f9d9fced1918d12096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 09:08:59 +00:00
Treehugger Robot
adb5c5025a Merge "Make p2p start searching after turning off airplane mode." 2022-11-16 08:23:44 +00:00
Bonian Chen
20bcb7c5fb [Settings] Fix merge confliction
Follow code reviewer's suggestion to further split the code.

Bug: 259333639
Test: build pass
Change-Id: I40ee5f92dbb4550fec7e9bea108c30a2e5a0f770
2022-11-16 07:57:37 +00:00
Binyi Wu
5b4cae3900 Merge "Update survey triggering mechanisms" into tm-qpr-dev am: d5d2dc4e22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454690

Change-Id: I1b60ec07a8eb8efae0859051c923adb13bf07e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 07:55:53 +00:00
Binyi Wu
d5d2dc4e22 Merge "Update survey triggering mechanisms" into tm-qpr-dev 2022-11-16 07:13:53 +00:00
changbetty
4252675ca5 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 am: 8f412f14d2 -s ours am: f79bce9e6a -s ours am: 3da973ce0f -s ours am: 6244c65c24 -s ours am: 2857cae239 -s ours am: 3b388643b0 -s ours am: 125a6fcec9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I66144451350bd1bc891f5285f5762e970cfd3c93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:33:57 +00:00
changbetty
8b7449cfd9 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours am: 990c3d2a45 -s ours am: edc81984ac -s ours am: 0ddaaccbd0 -s ours am: 90b39af26d -s ours am: f8a47d0305 -s ours am: 29a32c0348 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I68a6ec209e332d1e9aa94e3d5fa1e29043bff30c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:33:48 +00:00
changbetty
a8fe473c7e [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: c55c060361 am: 36b97edab0 -s ours am: 5fc32464aa -s ours am: fbaede66b4 -s ours am: 92dfbb3f46 -s ours am: dcf39bd877 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie81e3b5168e08cdcd765d446e5159962deb834fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:33:41 +00:00
changbetty
e1a9e4cd38 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 31fb7bd480 -s ours am: 1cb32c446d -s ours am: cc4dea7377 -s ours am: 6bf913c2cf -s ours am: e1f7628fd4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic2f6b32955056ba7095b2bb1c0c5b3371bfa8163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:33:34 +00:00
changbetty
3d7eb4fc44 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: e644704bee -s ours am: 094c3df0b0 -s ours am: cf8be928f5 -s ours am: 114a948885 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99c8a0cf9d454816371c76a7bc0cffa283b9c155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:33:28 +00:00
changbetty
e71be0dbcd RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: cdbbd7bba4 am: dcbc894b01 am: 83beb1e088
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419505

Change-Id: I6486a6708e26c42647f08d6db1b8b47cd2e21651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:33:15 +00:00
changbetty
125a6fcec9 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 am: 8f412f14d2 -s ours am: f79bce9e6a -s ours am: 3da973ce0f -s ours am: 6244c65c24 -s ours am: 2857cae239 -s ours am: 3b388643b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I623779b926a3fcb7f3089e81cc60e25830111dfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:30:22 +00:00
changbetty
29a32c0348 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours am: 990c3d2a45 -s ours am: edc81984ac -s ours am: 0ddaaccbd0 -s ours am: 90b39af26d -s ours am: f8a47d0305 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id4b0299779cccebd08d3484b9ea1ee50dba527f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:30:16 +00:00
changbetty
dcf39bd877 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: c55c060361 am: 36b97edab0 -s ours am: 5fc32464aa -s ours am: fbaede66b4 -s ours am: 92dfbb3f46 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d5b52a87798eec16874f1ac749b42191c19ac6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:30:11 +00:00
changbetty
e1f7628fd4 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 31fb7bd480 -s ours am: 1cb32c446d -s ours am: cc4dea7377 -s ours am: 6bf913c2cf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I48c5a23d135a7bbb3f551a89ba2168f6ff0f28be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:30:06 +00:00
changbetty
3b388643b0 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 am: 8f412f14d2 -s ours am: f79bce9e6a -s ours am: 3da973ce0f -s ours am: 6244c65c24 -s ours am: 2857cae239 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iec0e0e6e33005b8317a1883f874aaa4b4d30ee97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:01:00 +00:00
changbetty
f8a47d0305 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours am: 990c3d2a45 -s ours am: edc81984ac -s ours am: 0ddaaccbd0 -s ours am: 90b39af26d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I04eb4cbc3c13ee58f22e562f8574f2d803eac304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:00:55 +00:00
changbetty
92dfbb3f46 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: c55c060361 am: 36b97edab0 -s ours am: 5fc32464aa -s ours am: fbaede66b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I80e44ec17a6994e3e074d894b652a9d651c38c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:00:50 +00:00
changbetty
6bf913c2cf [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 31fb7bd480 -s ours am: 1cb32c446d -s ours am: cc4dea7377 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ecd2230b2581f3c1d08948be26ce9165dc999cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:00:45 +00:00
changbetty
114a948885 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: e644704bee -s ours am: 094c3df0b0 -s ours am: cf8be928f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8098b896f573c709c9bfa4bfcdd5d1a56aaf2615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 04:54:22 +00:00
changbetty
83beb1e088 RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: cdbbd7bba4 am: dcbc894b01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419505

Change-Id: I8d4550f29ee050499a5b3fe1c3ca98d9987435f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 04:54:17 +00:00
changbetty
2857cae239 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 am: 8f412f14d2 -s ours am: f79bce9e6a -s ours am: 3da973ce0f -s ours am: 6244c65c24 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib9ec3438440709224cd0d38a412936e286148f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 04:50:57 +00:00
changbetty
90b39af26d [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours am: 990c3d2a45 -s ours am: edc81984ac -s ours am: 0ddaaccbd0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I44d7c5f8834019f02a9b55b46ace4527c36d1d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 04:50:50 +00:00
changbetty
fbaede66b4 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: c55c060361 am: 36b97edab0 -s ours am: 5fc32464aa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I726701dfe9fd97e6282a8c4b7239eb14051fb11e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 04:50:42 +00:00
changbetty
6244c65c24 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 am: 8f412f14d2 -s ours am: f79bce9e6a -s ours am: 3da973ce0f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia2b86041aeec56ba25871ae77b1225e86de40189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 04:21:14 +00:00
changbetty
0ddaaccbd0 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours am: 990c3d2a45 -s ours am: edc81984ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08c5a000495d30dafc6a65b836f1504e4196505f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 04:21:08 +00:00
changbetty
5fc32464aa [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: c55c060361 am: 36b97edab0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I98cd0afdffc2e9afb5a6dd286d80534e8d327e3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 04:21:00 +00:00