Commit Graph

117450 Commits

Author SHA1 Message Date
Adam Bookatz
df48f2777d [automerger skipped] Merge "Introduce concept of DockUser" into tm-qpr-dev am: 9703f6a154 am: 632754a466 -s ours
am skip reason: Merged-In If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd with SHA-1 81e5f3730c is already in history

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

Change-Id: Iaffbe973acd90d54a819bd9002d8f333db5fff13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 18:57:25 +00:00
Arc Wang
6bd49c4f6d Merge "Fix can't access SD card from work profile" 2022-11-16 06:15:05 +00:00
changbetty
1436b66e14 [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: a94922acb7 -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: Ic450d8e1fd50e8ceb0c83fc79aa176226623c8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:30:16 +00:00
changbetty
bc5a1115fc [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: 276a2f896a -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: I27de9a8fed3cc4e2b4e149c0850ba061ba9bcf57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:30:07 +00:00
changbetty
7d571935be [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: 44221056a2 -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: Icbf6294d87521de80f8bd90a9396657d2b11d666
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:29:59 +00:00
changbetty
81b1caf70d [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 31fb7bd480 -s ours am: 1cb32c446d -s ours am: cc4dea7377 -s ours am: 99a0480ef7 -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: Id26a38e362d4e50d92a9e46dbbe143526298c2fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:29:49 +00:00
changbetty
a94922acb7 [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: Ifade6ae4dd915b1bdf2a3316a210fe2db89d7678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:00:49 +00:00
changbetty
276a2f896a [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: Id90971905eea5d5f6ab78bff6d1d20a53b780bbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:00:42 +00:00
changbetty
44221056a2 [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: I0fdd9fd646e789a6919e4b776a958cc154f70354
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:00:36 +00:00
changbetty
99a0480ef7 [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: I1a50c4a56a49368ce376ba55db6d61e4ab4cf34e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 05:00:30 +00:00
changbetty
db04d4ec1a [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: e644704bee -s ours am: 094c3df0b0 -s ours am: a40e441681 -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: I08c05c2776bb05a3e8645c1e50b52928f6ed5222
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 04:54:31 +00:00
changbetty
de35ea2534 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: cdbbd7bba4 am: 26bbfaaad2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I39cc5dcbe03de17c79cdacf73a1eedb2c0948647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 04:53:58 +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
changbetty
cc4dea7377 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 31fb7bd480 -s ours am: 1cb32c446d -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: I8916c1ff5fb21ea05638438be23211412f0ee856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 04:15:22 +00:00
changbetty
a40e441681 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: e644704bee -s ours am: 094c3df0b0 -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: I226955ecb1bab4b578158656cfc5816311a14b65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 03:49:27 +00:00
changbetty
26bbfaaad2 RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: cdbbd7bba4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419505

Change-Id: I54bee9cf10ff7bae72f7de92d2361f4b59e81aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 03:49:17 +00:00
changbetty
3da973ce0f [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 am: 8f412f14d2 -s ours am: f79bce9e6a -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: Id2816ba5e027892be568d216b866da4bfa3c40b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 03:45:52 +00:00
changbetty
edc81984ac [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours am: 990c3d2a45 -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: I0bdc7b00f0bc6c3e64c36d530a9baa331858d92f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 03:45:47 +00:00
changbetty
36b97edab0 RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: c55c060361
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419567

Change-Id: I08ef257f759af3f9840eeee835399cc507d5dd6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 03:45:42 +00:00
changbetty
1cb32c446d [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 31fb7bd480 -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: I0665420077eb3c26cc373d449472dded08bda0be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 03:45:08 +00:00
changbetty
f79bce9e6a [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 am: 8f412f14d2 -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: Icef924bc46f0d32e40ec5a8e603a6b3ce6f6bd84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 03:41:20 +00:00
changbetty
990c3d2a45 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -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: I09f8da9647990cadb9b28f741f2f30e2d70ad783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 03:41:08 +00:00
changbetty
8f412f14d2 RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419569

Change-Id: Ibb68644054e0b89f512a9540958a588a92194443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 03:39:36 +00:00
changbetty
094c3df0b0 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: e644704bee -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: Iae493b9336afdd1d87cdd4772fad8102f0f6c405
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 03:39:32 +00:00
TreeHugger Robot
a4b2bc9b2b Merge "Fix NPE of mDismissListener in Rename Dialog" 2022-11-16 03:26:40 +00:00
TreeHugger Robot
daf43a4605 Merge "Apply feature flag for biometrics" 2022-11-16 02:40:28 +00:00
Adam Bookatz
632754a466 Merge "Introduce concept of DockUser" into tm-qpr-dev am: 9703f6a154
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20406629

Change-Id: I1048ec3d84b6acce75102f449d1fdbd4fde54abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 01:23:04 +00:00
Adam Bookatz
9703f6a154 Merge "Introduce concept of DockUser" into tm-qpr-dev 2022-11-16 00:59:41 +00:00
TreeHugger Robot
148774d287 Merge "Fingerprint Introduction FragmentActivity" 2022-11-16 00:04:49 +00:00
TreeHugger Robot
7765c7129b Merge "Add configuration for defaulting notification behavior" into tm-qpr-dev am: e2e892d46c am: 54170343cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454246

Change-Id: Ic5021313463c2fb955d2e5066a5b8f9dec4603fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 23:40:08 +00:00
TreeHugger Robot
54170343cf Merge "Add configuration for defaulting notification behavior" into tm-qpr-dev am: e2e892d46c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454246

Change-Id: I3f6ad58e5f8292642d7eb958402d172537536d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 23:00:52 +00:00
TreeHugger Robot
e2e892d46c Merge "Add configuration for defaulting notification behavior" into tm-qpr-dev 2022-11-15 22:42:34 +00:00
lbill
c9f58d684e Fix NPE of mDismissListener in Rename Dialog
Bug: 241122882
Test: Enroll 1 fingerprint, and rename in landscape mode, check no
more NPE when focus on inputfield and IME shown

Change-Id: I24fe9aab11cabd67015989cfaaf6a8228ea72b59
2022-11-15 19:06:00 +00:00
Hao Dong
2f0cec804f [automerger skipped] Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." into tm-qpr-dev am: 8a0074e909 am: f5ffb13dc1 -s ours
am skip reason: Merged-In I057b00fbca6660012887ebedf4d65c2c3d35792b with SHA-1 6bed01f315 is already in history

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

Change-Id: I40db91dc44b25ef1d6772c70faa50c13bf3d2f4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 16:25:06 +00:00
Hao Dong
f5ffb13dc1 Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." into tm-qpr-dev am: 8a0074e909
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20414916

Change-Id: Ibbc4c72d598d16b0bc99c36fb311d90bc1765912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 16:04:49 +00:00
Hao Dong
8a0074e909 Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." into tm-qpr-dev 2022-11-15 15:40:37 +00:00
YK Hung
94bd431d34 Merge "Clean up the KEY_ROUTINE from the Settings" 2022-11-15 15:25:04 +00:00
Ankita Vyas
3503cc3cbf Merge "Do not show Choose Profile dialog for clone user." 2022-11-15 11:13:26 +00:00
Wilson Wu
62c6b9f6aa Merge "Fix show/hide virtual keyboard delay" 2022-11-15 08:48:48 +00:00
ykhung
3cf14b682e Clean up the KEY_ROUTINE from the Settings
Fix: 258603978
Test: make RunSettingsRoboTests
Change-Id: I65033ca18953b57317af64418bb0b18d48eaacd8
2022-11-15 16:07:57 +08:00
“Ankita
9304977674 Do not show Choose Profile dialog for clone user.
Bug: 249194639
Test: make RunSettingsRoboTests -j64
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ProfileSelectDialogTest
Change-Id: I35279f643f8c562df7b407fdf2cbfd2ae5ee9890
2022-11-15 07:49:09 +00:00
Treehugger Robot
0fb49d7299 Merge "Update owner for Settings project" am: 20a3f8f9e8 am: 73c0f408a4 am: 486c74f4fa
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2291755

Change-Id: If6ef7e90e3834082c94da696ce81e1ed655b12e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 07:14:53 +00:00
Treehugger Robot
486c74f4fa Merge "Update owner for Settings project" am: 20a3f8f9e8 am: 73c0f408a4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2291755

Change-Id: Id1fe88f9af281f087c1291fa9645fab51ef9295d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 06:53:55 +00:00
TreeHugger Robot
abb864bbaa Merge "Move security_settings_sfps_enroll_finish to res-product" 2022-11-15 06:33:27 +00:00
Sandeep Jawalkar
5ac149af90 Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" 2022-11-15 06:24:41 +00:00