Matías Hernández
b0bf5532ff
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours am: df3f3ff5c2
-s ours am: a590ecb718
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Iecd927edd6e7728b40e80e75b82240cc4634a4dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 13:03:54 +00:00
Matías Hernández
e1745a9d28
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours am: 476dd8fba2
-s ours am: c1d4561832
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Id55e3ebb96a70e610c47a6df16c537a0691416fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 13:03:48 +00:00
Matías Hernández
c1d4561832
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours am: 476dd8fba2
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I89b51fbd2791e323be34fc92d128095a093c9e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 12:24:58 +00:00
Matías Hernández
a590ecb718
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours am: df3f3ff5c2
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Iab97bd80d0e4ed0fa4391efc43a05f23f8095f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 12:22:27 +00:00
Matías Hernández
476dd8fba2
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Id6a9b6a60b2455596795c11b3d286cc84a71d42b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 11:41:09 +00:00
Matías Hernández
df3f3ff5c2
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I635acdf5b2b37d084c6e43a33fa3406402b49177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 11:40:04 +00:00
Matías Hernández
8c1394e58e
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I729b32b7ace1c1679c14ed555fd7d87e8d86f72d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 10:52:31 +00:00
Matías Hernández
95fbc856ad
Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Ic711190cfc7ce3437e324a96d97c628b52d48480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 10:13:23 +00:00
Matías Hernández
5985612633
Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I51744909a3ef6fcb1406dcc24d857d9b9eb88057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 09:29:06 +00:00
Matías Hernández
e1ebb40236
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 7847d336d9
am: 253f948aad
am: e94f056ca9
-s ours am: a0891e388f
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: I618bbb606303efd996e3f49c6e93ef677be4e701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 02:27:36 +00:00
Matías Hernández
b6d8bfb999
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 7847d336d9
am: 253f948aad
-s ours am: e385aee1cd
-s ours am: 534649a24d
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: I3a26b3f8f4a3374c71cc8edf4d1b1802268a1d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 02:27:22 +00:00
Matías Hernández
0a176d50ef
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 42afd3c182
-s ours am: 9dbcbfaa12
-s ours am: ddbd590054
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: Ia10582e59b33839f3dab65c927fcaf827aa8feee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 02:26:50 +00:00
Matías Hernández
a0891e388f
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 7847d336d9
am: 253f948aad
am: e94f056ca9
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: I945b9ce686bd13fe1668ce5ca695ef545ba58770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 02:26:15 +00:00
Matías Hernández
a62896fe2c
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 7847d336d9
am: 253f948aad
-s ours am: e385aee1cd
-s ours am: 7e8f8e9306
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: I86d1e29706d7c51b5d0b5641f6a55bb89f55b1b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 02:25:14 +00:00
Matías Hernández
4bd74857ef
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 42afd3c182
-s ours am: 9dbcbfaa12
-s ours am: 29aa0ee34a
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: Ifc658393bd4f0fb5bffffc7d6bdb78d55761af94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 02:24:57 +00:00
Matías Hernández
534649a24d
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 7847d336d9
am: 253f948aad
-s ours am: e385aee1cd
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: Ib9974bab70303328e9f590bfe31f81f361cd91c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 01:43:06 +00:00
Matías Hernández
ddbd590054
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 42afd3c182
-s ours am: 9dbcbfaa12
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: Ib95833caa889adc369770b1fe1a4c8407db10a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 01:42:51 +00:00
Matías Hernández
e94f056ca9
Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 7847d336d9
am: 253f948aad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: Id04b928ff2c2bcf702bd836c72d53b8acfc1b75d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 01:42:39 +00:00
Matías Hernández
7e8f8e9306
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 7847d336d9
am: 253f948aad
-s ours am: e385aee1cd
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: I0aa292fc9a772c1e6e46a46e02b65f666e643136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 01:42:27 +00:00
Matías Hernández
29aa0ee34a
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 42afd3c182
-s ours am: 9dbcbfaa12
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: Iafe3f0f2f3f0cfa1b8a553953565032dec0c2e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 01:42:12 +00:00
Matías Hernández
e385aee1cd
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 7847d336d9
am: 253f948aad
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: Iddc7166a9254597a82d5a19f144429e712faec14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 01:41:21 +00:00
Matías Hernández
253f948aad
Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 7847d336d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: I84d8aa08502725d1e24d80946884eb8cab9287ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 00:59:57 +00:00
Matías Hernández
9dbcbfaa12
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 42afd3c182
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: Idd23bcdf229afda6451ad92e7c13cb7410d5a869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 00:57:12 +00:00
Matías Hernández
7847d336d9
Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: Ib235490bd7dc40a1d5146cdb8ea20abed4406996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 00:16:39 +00:00
Matías Hernández
42afd3c182
Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: I3228d4d29e905c0481fe1637580aaf2caaab9cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 00:15:34 +00:00
Grace Cheng
71671c1eca
[automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
-s ours am: d7e397e97c
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I7d179a1b1ac8465fea36a14ca04e57aed6db1cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:59:50 +00:00
Grace Cheng
2ee3088167
[automerger skipped] Fix NPE in updateAddPreference am: f58714496a
-s ours am: 0dcfdacc25
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I40e8eaf893dac682f8120213c32c28025fbbf29f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:59:47 +00:00
Grace Cheng
60f4e180a2
[automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
am: f73f073643
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I6581685284601d4ee82c4585a922092c17e12856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:41:14 +00:00
Grace Cheng
d7e397e97c
[automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I76d59e589e5f8882f2872da723dc20975ea60a1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:40:15 +00:00
Grace Cheng
0dcfdacc25
[automerger skipped] Fix NPE in updateAddPreference am: f58714496a
-s ours
...
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: Ie5120e61d7df71adf77970088a3be7334ed6a4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:40:12 +00:00
Matías Hernández
63a50999f5
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
am: 0d21526217
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I66d6a9ce28f475dfb2d130bcaccdc3d2c6b8623d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:39:45 +00:00
Grace Cheng
f73f073643
Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I691796e372f65ffec44954a850d462f796c19f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:36:58 +00:00
Matías Hernández
9feb898da7
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
am: aaddfd88e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I0f6901ca11f07090c15146dac2b0b39c67db8eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:35:52 +00:00
Grace Cheng
25b489e212
Merge "Fix NPE in updateAddPreference" into udc-dev
2023-06-28 17:41:13 +00:00
Matías Hernández
aaddfd88e9
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: If35fbb5c16a642b56de29012ce43ecd7f068d5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 17:14:55 +00:00
Matías Hernández
0d21526217
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I1e1dbbdf2b1834da763835c1bbcd263cdb27eb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 17:10:34 +00:00
Matías Hernández
4d34eb2c7a
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev
2023-06-28 16:42:13 +00:00
Hao Dong
7b99d92464
Fix pattern rotation header text.
...
Bug: 278055194
Test: atest ChooseLockPatternTest
Change-Id: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
Merged-In: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
2023-06-27 17:50:15 +00:00
Hao Dong
2ca3f3232c
Fix Fingerprint enrollment UI when display size is largest.
...
1. Remove land/udfps_enroll_enrolling and use the default land layout
instead. Swap header and content when necessary to avoid overlap.
2. Add UdfpsEnrollEnrollingView.java
Test: manual test - 1. Set system display and font size largest
2. Launch fingerprint enrollment and check UI.
Test: atest FingerprintEnrollEnrollingTest
Bug: 269060514
Bug: 283169056
Change-Id: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
Merged-In: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
2023-06-27 17:48:16 +00:00
Michael Mikhail
6308e3fb2a
Trigger talkback for notification volume change
...
Triggers talkback to say the content description of the title of
notification volume when notification volume is set to vibrate or silent
mode.
Fixes: 285453719
Fixes: 285455826
Test: manually checked when the ring volume is set to 0% and when the
notification volume is set to 0%. Check the video in the bug link.
Change-Id: I4bd65bdbfa41793fc8e32c295185363ca36cc0d7
2023-06-27 17:01:18 +00:00
Xin Li
e849e3a643
[automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f
-s ours am: c61819e807
-s ours am: 164acf327a
-s ours am: bcc898dbed
-s ours
...
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2635192
Change-Id: I2d0bd47af32ef241bc25755f8deedc5950716c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 01:15:56 +00:00
Xin Li
c9bfd995a9
[automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75
-s ours am: ba9cb49565
-s ours am: e7ba843385
-s ours am: 8244a2aeb4
-s ours
...
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2635192
Change-Id: I823fb94c9e393c6f3de5538dd1330906d11f801b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 01:14:07 +00:00
Xin Li
bcc898dbed
[automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f
-s ours am: c61819e807
-s ours am: 164acf327a
-s ours
...
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2635192
Change-Id: Idb89b852b5efc879a47552fdab0ca72a8169a756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 00:34:24 +00:00
Xin Li
8244a2aeb4
[automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75
-s ours am: ba9cb49565
-s ours am: e7ba843385
-s ours
...
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2635192
Change-Id: I10491b313218cc917510d28164cf1758adbab070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 00:32:37 +00:00
Michael Mikhail
499f965c1c
Add content description to volume title in settings.
...
Adds content description that is announced by talkback when a11y focus
is on volume preference. This improves talkback announcement when view changes.
Fixes: 285529113
Bug: 285455826
Fixes: 285487766
Test: atest VolumeSeekBarPreferenceControllerTest
Test: atest VolumeSeekBarPreferenceTest
Change-Id: Ibe80b4b1d489dc058df1cc79c96b034d5ddc6e56
2023-06-26 23:35:39 +00:00
TreeHugger Robot
48fa611907
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b
-s ours am: 60f8d67f1d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23788721
Change-Id: Ia5603c0cf61378817b36a2d933667220f536ac32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-26 23:34:14 +00:00
Bill Yi
f44874ca83
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3
-s ours am: 6cb8b3b00c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23788721
Change-Id: I30bda311566714246e07507b8c664dfba85c6066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-26 23:34:10 +00:00
Bill Yi
dac919f41a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a
-s ours am: 392e63d166
-s ours am: e4a787f1f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23789283
Change-Id: I8e49ca184085c44061792d9fd8247b4193938b3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-26 23:33:14 +00:00
Hao Dong
93bcf8122c
Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463
Change-Id: I0b509bd402107442b93f6855f34389dfa61c59e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-26 23:26:53 +00:00
Xin Li
164acf327a
[automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f
-s ours am: c61819e807
-s ours
...
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2635192
Change-Id: Id8b3ff644094f429231676ca4b4aa34a23ac4062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-26 23:12:11 +00:00