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
Betty Chang
f200134fc4
Merge "Make bluetooth switch not discoverable via SliceDeepLinkTrampoline" into tm-qpr-dev am: c8f6bba271
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20410007
Change-Id: I5195b9513c575bc28f0b6930a6c40c570048f6d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 03:10:44 +00:00
TreeHugger Robot
daf43a4605
Merge "Apply feature flag for biometrics"
2022-11-16 02:40:28 +00:00
Betty Chang
c8f6bba271
Merge "Make bluetooth switch not discoverable via SliceDeepLinkTrampoline" into tm-qpr-dev
2022-11-16 02:28:08 +00:00
Joshua McCloskey
88e2f1e0e0
Ensure text doesnt jump during enrollment
...
Test: Verified via fingerprint enrollment that dynamic text no longer
shifts the fingerprint icon view.
Fixes: 251235423
Change-Id: Ia70bb251af9df581e5c1e2b7dfcd9290dcc66b26
2022-11-16 01:45:15 +00:00
Diya Bera
507fae7cbc
Merge "Fixes loop in Fingerprint Enrollment" into tm-qpr-dev am: fe3305016a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20468119
Change-Id: I14371b5a594057c975079438075e7087df16f809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 01:24:40 +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
Diya Bera
fe3305016a
Merge "Fixes loop in Fingerprint Enrollment" into tm-qpr-dev
2022-11-16 01:01:14 +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
Diya Bera
541185d383
Fixes loop in Fingerprint Enrollment
...
Remove "Try again" in error dialog, since credential has timed out and
user needs to use pin/password/pattern before being able to enroll
fingerprint
Bug: 258307019
Test: Try to enroll fingerprint after 10 minutes of entering credential,
timeout dialog is shown with only one button to avoid looping
Change-Id: Ibb9a9e2095a1277fa01adc8eb5ce04af1b9ce495
2022-11-15 18:22:36 +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
sandeepjs
e69ab6cb77
[Android U][eSIM] Modify esim and sim card strings as part of esim primary
...
As part of esim primary, esim and sim card related strings are changed for AndroidSettings project with reference from https://docs.google.com/spreadsheets/d/1RPVnNvmcjd-NSvPGg1jOi0mdC-sbCHvt9HVU4glV8fs/edit#gid=1716745126
Test: build
Bug: 257380320
Change-Id: I984d56e724dbd906e48358a31c6a7cb1e5db4fdf
Merged-In: I984d56e724dbd906e48358a31c6a7cb1e5db4fdf
2022-11-15 11:11:50 +00:00
Wilson Wu
62c6b9f6aa
Merge "Fix show/hide virtual keyboard delay"
2022-11-15 08:48:48 +00:00
Sayak Dutta
e4445a6e86
Modify call to Header function of Glif Layout to disable autosize
...
Bug: 245483008
Change-Id: I117e11f40764bf599bfa655755107342252ca891
2022-11-15 08:24:30 +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
Treehugger Robot
73c0f408a4
Merge "Update owner for Settings project" am: 20a3f8f9e8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2291755
Change-Id: I083eb43c64d81ebc75e33e0abf0fe8d063be1425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-15 06:22:14 +00:00
Treehugger Robot
20a3f8f9e8
Merge "Update owner for Settings project"
2022-11-15 05:43:00 +00:00
sandeepjs
ecdfe28bd2
[Android U][eSIM] Modify esim and sim card strings as part of esim primary
...
As part of esim primary, esim and sim card related strings are changed for AndroidSettings project with reference from https://docs.google.com/spreadsheets/d/1RPVnNvmcjd-NSvPGg1jOi0mdC-sbCHvt9HVU4glV8fs/edit#gid=1716745126
Test: build
Bug: 257380320
Change-Id: I984d56e724dbd906e48358a31c6a7cb1e5db4fdf
2022-11-15 05:33:07 +00:00
Chaohui Wang
a5dfab3fc0
Move security_settings_sfps_enroll_finish to res-product
...
Bug: 253772249
Test: Make Settings
Change-Id: Id57c327573814cc99e11fede56f9a60a215fb494
2022-11-15 13:11:45 +08:00
Edgar Wang
1111e51f2c
Merge "Change preference value changed metrics log format"
2022-11-15 03:05:13 +00:00
Joshua Mccloskey
46b21bbab4
Merge "Centered fingerprint icon" into tm-qpr-dev am: 0fb3dc390c
am: 945d614158
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20447129
Change-Id: Ie1e2f9e7e6ee04d24114eff301a86dd06ba96451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-15 02:41:05 +00:00
Joshua Mccloskey
946185e6e5
[automerger skipped] Merge "Remove sidefps toggle from SUW." into tm-qpr-dev am: 94ddcba809
am: 8bc66cbb9f
-s ours
...
am skip reason: Merged-In I0ea63a61908b45399ba09ff31fd8fe6a4aacfb41 with SHA-1 cfaf707a78
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20442178
Change-Id: I076b8e41b015bf1c4b551d6023bc57a220ea9471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-15 02:39:37 +00:00
Joshua Mccloskey
945d614158
Merge "Centered fingerprint icon" into tm-qpr-dev am: 0fb3dc390c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20447129
Change-Id: I9c88dcafd1cb73dae5dc1a7137ff78337d4d69bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-15 01:51:14 +00:00
Joshua Mccloskey
8bc66cbb9f
Merge "Remove sidefps toggle from SUW." into tm-qpr-dev am: 94ddcba809
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20442178
Change-Id: Ib5ddf26067cdd3e07ebc414aa82306fee68e0add
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-15 01:50:46 +00:00
Joshua Mccloskey
0fb3dc390c
Merge "Centered fingerprint icon" into tm-qpr-dev
2022-11-15 01:14:07 +00:00
Joshua Mccloskey
94ddcba809
Merge "Remove sidefps toggle from SUW." into tm-qpr-dev
2022-11-15 01:14:01 +00:00