Commit Graph

117262 Commits

Author SHA1 Message Date
Hao Dong
1fc440a8b5 Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." 2022-11-08 20:40:10 +00:00
TreeHugger Robot
9a0bd369d3 Merge "Fix b/257404630 Inconsistent strings in battery chart" 2022-11-08 11:14:41 +00:00
TreeHugger Robot
612e6c1ddd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b93416b26d -s ours am: 4f30faa91c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I471d71a1e704e8cf8ef552180b16f79455ce28f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 10:35:27 +00:00
Bill Yi
40f3de5c51 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef39119269 -s ours am: 9e26f13061 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f67ac3b78c93c8117efd22fbfeb80cd15454c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 10:35:15 +00:00
TreeHugger Robot
4f30faa91c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b93416b26d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad18fe9860c68c39e3590c3e33b7dbd2b13bd60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 10:10:13 +00:00
Bill Yi
9e26f13061 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef39119269 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6edfc370be502fd83a20e6f8a5be5b024f81d85d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 10:09:52 +00:00
TreeHugger Robot
b93416b26d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-08 09:30:47 +00:00
Jason Chiu
7fd3621809 Merge "Reserve the icon space to avoid preference padding change" into tm-qpr-dev am: b9b1225ac3 am: 2cbced55a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20392450

Change-Id: Ib44c08584f56e992d2caa26ee8018f6724993390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 05:34:41 +00:00
Jason Chiu
2cbced55a4 Merge "Reserve the icon space to avoid preference padding change" into tm-qpr-dev am: b9b1225ac3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20392450

Change-Id: I848120e8276098a0df41c2c1d8cea68682c21e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 05:02:35 +00:00
TreeHugger Robot
292593f515 Merge "Fix NPE crash in TextToSpeechSettings" into tm-qpr-dev am: a6e8ddda16 am: 6d16483eee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20383946

Change-Id: I48e4b0bf19fd97704911211a4717474903fdf29d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 04:37:35 +00:00
Jason Chiu
b9b1225ac3 Merge "Reserve the icon space to avoid preference padding change" into tm-qpr-dev 2022-11-08 04:34:19 +00:00
TreeHugger Robot
6d16483eee Merge "Fix NPE crash in TextToSpeechSettings" into tm-qpr-dev am: a6e8ddda16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20383946

Change-Id: I381b2accad394334310db3b8b384fa4a114991a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 04:05:35 +00:00
TreeHugger Robot
26b806629d Merge "Clean bluetooth code" into tm-qpr-dev am: 19278b9477 am: fec63bdb5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20377860

Change-Id: I6630576b731ff2c589b01520be45f55cf3f0e275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 03:53:22 +00:00
TreeHugger Robot
a6e8ddda16 Merge "Fix NPE crash in TextToSpeechSettings" into tm-qpr-dev 2022-11-08 03:34:11 +00:00
TreeHugger Robot
fec63bdb5b Merge "Clean bluetooth code" into tm-qpr-dev am: 19278b9477
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20377860

Change-Id: I68469b235bf57c254cfc9d5aaa8580e4f1abd141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 03:20:12 +00:00
Zaiyue Xue
1cf801e793 Fix b/257404630 Inconsistent strings in battery chart
Change all the "from last full charge" to "since last full charge".

Bug: 257404630
Fix: 257404630
Test: presubmit
Change-Id: Ib316e9fecac60f388e2b1810de9a65c540c52358
2022-11-08 10:43:35 +08:00
TreeHugger Robot
19278b9477 Merge "Clean bluetooth code" into tm-qpr-dev 2022-11-08 02:37:30 +00:00
Jason Chiu
fb95451369 Reserve the icon space to avoid preference padding change
If the injection icon is to be retrieved from a provider, the preset
transparent drawable is a 1x1 icon, which may cause the preference
padding change before and after the injection icon reloading.

Bug: 253471066
Test: robotest, visual
Change-Id: Ie88f69bb047a64a6a0ee30c060d8cbb8fe27b3d7
2022-11-07 10:11:20 +00:00
Tetiana Meronyk
61d661feb9 Merge "Disable toggle on managed device with "Disallow add user" or "Disallow switch user"" 2022-11-07 09:27:30 +00:00
TreeHugger Robot
e09381cf36 Merge "Remove Fix connectivity menu for guest" 2022-11-07 08:41:30 +00:00
Tsung-Mao Fang
70b8bd92c9 Fix NPE crash in TextToSpeechSettings
Recyclerview's getItemAnimator() is nullable so we need a null check.

Bug: 254330134
Test: Manual
Change-Id: Iba5b0d68740c430fd1143d38ccf344afef486784
Merged-In: fa6a8e9767
2022-11-07 05:43:40 +00:00
Bonian Chen
4cff396b56 Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev am: af96b1ea7a am: 59969d6aab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20269273

Change-Id: I7aee58dcd1b7276c9b37e57f102c575655d5fcfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 03:09:33 +00:00
Bonian Chen
bf669d2c89 Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev am: 15f0cd6428 am: 16b35935c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20269272

Change-Id: I2f0026a350034570a3f129ebb26196f4ae88ffe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 03:09:31 +00:00
Bonian Chen
85fc4fe93c Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev am: ab2e7bf6a5 am: 8e69ab3dea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20269271

Change-Id: I53c925d5bbf7f3b592db153ba432a9c8adb97199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 03:09:29 +00:00
Bonian Chen
3aad1fc4da Merge "[Settings][Back port] configuration for hidding SIM settings UI" into tm-qpr-dev am: 0eab03a862 am: 72d697ad24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20269270

Change-Id: I7ddc5ae3be7e421a813ccd00b610edc5ba7069f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 03:09:27 +00:00
Bonian Chen
aa429f23f2 [automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev am: 0b80576a34 -s ours am: b352ffc366 -s ours
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423 is already in history

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

Change-Id: Id4abfd6ec5f4cec9415655aae36bf5b6d3f923c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 03:09:26 +00:00
Bonian Chen
ad5b6855db [automerger skipped] [Settings][Back port] configuration for hidding SIM related UI am: bf55048799 -s ours am: 63034bfd38 -s ours
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423 is already in history

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

Change-Id: I44713e6c5058440dc5460c0b5530b21c68668b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 03:09:24 +00:00
Bonian Chen
47681935ac Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev am: 3423f0cb9b am: dbc0fc9e55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20267717

Change-Id: Ie1ebf0775a22d9fd28f75a40a0364fb620dd1b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 03:09:16 +00:00
Wesley Wang
5664ebc351 Merge "Add BatteryHistoricalLogUtil class" 2022-11-07 03:08:17 +00:00
Bonian Chen
59969d6aab Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev am: af96b1ea7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20269273

Change-Id: I614d5b67168449c865907a9f886796b13bb2da4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 02:39:07 +00:00
Bonian Chen
16b35935c2 Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev am: 15f0cd6428
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20269272

Change-Id: I2f92749b38bdcb9b5a4474a01d57fb18c51115a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 02:39:05 +00:00
Bonian Chen
8e69ab3dea Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev am: ab2e7bf6a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20269271

Change-Id: Ic04d0df359dea768adbdab2d1ef745d62abcfa04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 02:39:02 +00:00
Bonian Chen
72d697ad24 Merge "[Settings][Back port] configuration for hidding SIM settings UI" into tm-qpr-dev am: 0eab03a862
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20269270

Change-Id: Ie19efee6f9bc6d949f670d4e59f990cef94edc64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 02:39:00 +00:00
Bonian Chen
b352ffc366 [automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev am: 0b80576a34 -s ours
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423 is already in history

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

Change-Id: Idde859643c4cc069b5db5ca97b3ad9f72c5a8178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 02:38:58 +00:00
Bonian Chen
63034bfd38 [automerger skipped] [Settings][Back port] configuration for hidding SIM related UI am: bf55048799 -s ours
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423 is already in history

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

Change-Id: Ia6b46142d09c9c582611f55318728e7562b4d233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 02:38:54 +00:00
Bonian Chen
dbc0fc9e55 Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev am: 3423f0cb9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20267717

Change-Id: I16263c928efba0b64d7316b65ab5adb028edc2b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 02:38:49 +00:00
Bonian Chen
af96b1ea7a Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Bonian Chen
15f0cd6428 Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Bonian Chen
ab2e7bf6a5 Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Bonian Chen
0eab03a862 Merge "[Settings][Back port] configuration for hidding SIM settings UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Bonian Chen
0b80576a34 Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Bonian Chen
3423f0cb9b Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev 2022-11-07 02:05:50 +00:00
Bill Yi
ef39119269 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I41070a70d395daf355411c00a1e551d0e532671a
2022-11-06 14:02:33 -08:00
Arc Wang
3866acaea0 [automerger skipped] Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2 am: 5292e9e085 am: 76f12ccdca am: c8fd92dc66 -s ours
am skip reason: Merged-In I8b3b936de490f09f4be960fdafc6e66a1d858ee2 with SHA-1 3b1587d6b2 is already in history

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

Change-Id: If826cf1c9ee6ef8c0d247f406b4aad983b67d17f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 06:55:54 +00:00
Arc Wang
c8fd92dc66 Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2 am: 5292e9e085 am: 76f12ccdca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: I695908089058699e6cea14385c4261a69e821159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 06:23:27 +00:00
Arc Wang
76f12ccdca Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2 am: 5292e9e085
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: Icb4fc96a1fe5903b7d09157d552c6782b6db2036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 05:56:25 +00:00
Arc Wang
241f207333 [automerger skipped] Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2 am: bff1d6c14e -s ours
am skip reason: Merged-In I8b3b936de490f09f4be960fdafc6e66a1d858ee2 with SHA-1 3b1587d6b2 is already in history

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

Change-Id: I3e185c81c6b74854f0c824d3110ccababc17280f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 05:55:47 +00:00
Arc Wang
5292e9e085 Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: I66b28ac40ee6c50c10e51cff6844c17f91ac5e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 05:26:26 +00:00
Arc Wang
bff1d6c14e Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a am: 923ba5fcb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: Ifb26edc4549aa01324d6a4fe55150f61c35043c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 05:25:29 +00:00
Arc Wang
923ba5fcb2 Remove Intent selector from 2-pane deep link Intent am: dd7d2d766a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20349285

Change-Id: I766b9fa3ccd6c7d690275292b84efbddb19c651e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 04:23:18 +00:00