Commit Graph

121288 Commits

Author SHA1 Message Date
Julia Reynolds
ab6266d17b [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours am: 8a344f301b -s ours am: 521e233c51 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: Id79182990b7f428400b9306f964e162fec782c46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 20:42:29 +00:00
Julia Reynolds
521e233c51 [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours am: 8a344f301b -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: Iec1626f7c6ac37a540ca2017998abd1d814a8e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 20:11:42 +00:00
Julia Reynolds
8a344f301b [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: I703bdb03adef5c11693b308a6e2f897417e43b7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 19:45:07 +00:00
Julia Reynolds
7594f2deea [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: I22fe2da8599d3a5b002f6c145a15e71ed06634e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 19:20:42 +00:00
Julia Reynolds
acb5e90d5d [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: I844c70ca3340a3800ca2b88b55094fdb9f111635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 19:08:05 +00:00
Julia Reynolds
a43942b30a Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f am: 1636440ed3 am: 9076122087 am: f3216d6199 am: 25665fe672
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: Iec55f4426f853d4354bacbfcb060b5fcbd4756e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 18:31:06 +00:00
Julia Reynolds
25665fe672 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f am: 1636440ed3 am: 9076122087 am: f3216d6199
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: Ia347aa1553301a35b2f45270dc9dcd6c43c9dc4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 18:16:46 +00:00
Julia Reynolds
f3216d6199 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f am: 1636440ed3 am: 9076122087
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I776ac765405be32ac29c0b164fd1ac4e506ecb20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 17:36:26 +00:00
Julia Reynolds
212368c804 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f am: a39e960067 am: 7bab275fa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: If3859b5a34e150865304bb3d0c5208150950f88f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 17:15:18 +00:00
Julia Reynolds
cbb6811219 [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a
Blank merge reason: Change-Id I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is in history

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

Bug: 260570119
Change-Id: I5b2a0e7a53697962ea7f3b70891f70d687936332
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-28 16:56:20 +00:00
Julia Reynolds
52a102cc2a Don't show NLSes with excessively long component names
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-28 16:56:07 +00:00
Julia Reynolds
9076122087 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f am: 1636440ed3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: Id968cbebe67131d2b75bc4804721faaf7ebae377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 16:55:16 +00:00
Julia Reynolds
7bab275fa4 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f am: a39e960067
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I62ae4a927fc25c4ffbf2630654d3d041caead515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 16:51:14 +00:00
Julia Reynolds
1636440ed3 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I271dc0fe1a1c8bdeb6cebbda04167987f7916cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 16:25:16 +00:00
Julia Reynolds
a39e960067 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: Ie692fc30c4a91f1e318406a000eda9033ca1bcac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 16:24:35 +00:00
Julia Reynolds
0f7287271f Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I65575bb2f0bf4b82498c523f8d0b4b76628e2673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 15:53:58 +00:00
Julia Reynolds
87a1fcbca1 Don't show NLSes with excessively long component names am: 90ced5d2ec am: d9604dbe15 am: cb2e6fba6d am: d15a84022e am: d152770e4c am: 769bc5c7e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: I5221f464d24ce701b5ebc75a725640b98cb62b2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 15:41:58 +00:00
Julia Reynolds
d81920107e Don't show NLSes with excessively long component names am: 793257967f am: f2cdc03837 am: 117072b9fb am: 47554f941d am: 09a28cf844
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290643

Change-Id: I02a7c6a30cb60a2a20f07f4681fc767b7d019603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 15:41:24 +00:00
Julia Reynolds
769bc5c7e0 Don't show NLSes with excessively long component names am: 90ced5d2ec am: d9604dbe15 am: cb2e6fba6d am: d15a84022e am: d152770e4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: Ie08b73df9eaa822434a4ef1aa944e6050161cb33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 15:29:18 +00:00
Julia Reynolds
2e701b29dc Don't show NLSes with excessively long component names am: 1f3969f615
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I6316f0181d44d0d0a83f09d36d27cc4839e4ddfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 15:27:55 +00:00
Julia Reynolds
09a28cf844 Don't show NLSes with excessively long component names am: 793257967f am: f2cdc03837 am: 117072b9fb am: 47554f941d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290643

Change-Id: I5e64815691152a86b09e2b923f3152509823ca85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 15:26:13 +00:00
Julia Reynolds
d152770e4c Don't show NLSes with excessively long component names am: 90ced5d2ec am: d9604dbe15 am: cb2e6fba6d am: d15a84022e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: I9ec4236e79677eca89c8df3ad696b064ac20684a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 14:57:54 +00:00
Julia Reynolds
47554f941d Don't show NLSes with excessively long component names am: 793257967f am: f2cdc03837 am: 117072b9fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290643

Change-Id: I577145a7a91be9b5bb199d99c7bc5f3219d878bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 14:57:10 +00:00
Julia Reynolds
8511353471 Don't show NLSes with excessively long component names am: 90ced5d2ec am: d9604dbe15 am: 5c488e5c5b am: dc875cb639
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: I2f03f964c5d73b0aa80f34ce0dc502eeeccb55cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 14:30:15 +00:00
Julia Reynolds
4ab9f75049 Don't show NLSes with excessively long component names am: 793257967f am: 55b6779852 am: 7f91035871
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290643

Change-Id: Ic441b783491138c5e32e714e94ff61174b776d0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 14:29:40 +00:00
Julia Reynolds
d15a84022e Don't show NLSes with excessively long component names am: 90ced5d2ec am: d9604dbe15 am: cb2e6fba6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: Iba5bef0058876f3a717b9760811eda594a2e5d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 14:16:58 +00:00
Julia Reynolds
117072b9fb Don't show NLSes with excessively long component names am: 793257967f am: f2cdc03837
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290643

Change-Id: I16d4b3b79fb237ddd40a891da0bcb751872c3260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 14:16:17 +00:00
Julia Reynolds
dc875cb639 Don't show NLSes with excessively long component names am: 90ced5d2ec am: d9604dbe15 am: 5c488e5c5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: I029f6805c2ac591b10897addaab575f04a56761b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 14:16:02 +00:00
Julia Reynolds
7f91035871 Don't show NLSes with excessively long component names am: 793257967f am: 55b6779852
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290643

Change-Id: I3ad6aa1f0d06fcfd57a672bfcdec542463e621f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 14:15:16 +00:00
Treehugger Robot
33300618cc Merge "Refresh "Device details" after resuming" am: 1937737393 am: 2a7093f971 am: e31e77f3a2 am: ac23713935
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184940

Change-Id: Ie9ee11df2a79a1e82d6da3ccd3f86a9da9932298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 14:03:04 +00:00
TreeHugger Robot
e6b8dc7fe6 Merge "[Regional prefernce] Remove U extension in locale of app list" into udc-dev am: cdfd4ee9b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22305126

Change-Id: Ie291b4cc07aa8c01d6f072ed3617a262fec9b7da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 14:02:56 +00:00
Treehugger Robot
ac23713935 Merge "Refresh "Device details" after resuming" am: 1937737393 am: 2a7093f971 am: e31e77f3a2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184940

Change-Id: I84b3ccc1d14c06f4a83ca5ccb4f4ce6d4291843f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 13:59:00 +00:00
Julia Reynolds
cb2e6fba6d Don't show NLSes with excessively long component names am: 90ced5d2ec am: d9604dbe15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: I398ee9f0966e462a6270bd37a8dcf5d915a5ddee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 13:48:39 +00:00
Julia Reynolds
f2cdc03837 Don't show NLSes with excessively long component names am: 793257967f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290643

Change-Id: If0f7483eb6d79791ade3f8fb51e6f8852292ff15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 13:48:01 +00:00
Julia Reynolds
5c488e5c5b Don't show NLSes with excessively long component names am: 90ced5d2ec am: d9604dbe15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: I95a372829943314799c06b1bd52594067f43327d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 13:47:32 +00:00
Julia Reynolds
55b6779852 Don't show NLSes with excessively long component names am: 793257967f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290643

Change-Id: Ia55de46522617d022142a6d1e753569689682a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 13:47:02 +00:00
Julia Reynolds
d9604dbe15 Don't show NLSes with excessively long component names am: 90ced5d2ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: Iaf70f837d7d41f485d1b6082aa2af535264de3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 13:45:14 +00:00
TreeHugger Robot
cdfd4ee9b3 Merge "[Regional prefernce] Remove U extension in locale of app list" into udc-dev 2023-03-28 13:33:59 +00:00
Treehugger Robot
e31e77f3a2 Merge "Refresh "Device details" after resuming" am: 1937737393 am: 2a7093f971
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184940

Change-Id: I0df8b25c8672bb9a6114ee132009ccf3bdddc606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 13:31:30 +00:00
Treehugger Robot
2a7093f971 Merge "Refresh "Device details" after resuming" am: 1937737393
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184940

Change-Id: I4cbeb6ab0ba569d49e2c1963df0405c953a7f29d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 13:05:10 +00:00
Treehugger Robot
1937737393 Merge "Refresh "Device details" after resuming" 2023-03-28 12:42:53 +00:00
tom hsu
8477845381 [Regional prefernce] Remove U extension in locale of app list
Bug: b/270251111
Test: Manual Test
Change-Id: I2b3facfc5f7ec40a48379c79a5f0672cfe5fa7af
2023-03-28 20:01:39 +08:00
TreeHugger Robot
2d3e7bfb95 Merge "Change the "Restore" button to "Reset"" into udc-dev am: 600261a484
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22304967

Change-Id: I763e28e86add3c01cf308d34626167db49e70ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 09:51:48 +00:00
Candice Lo
3d583da996 Merge "Create tooltip for notifying auto-adding the font scaling tile" into udc-dev am: 6800d9f6c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135679

Change-Id: Ia84f60838f9275e9d56e9dd30ccebdeaa9b14ad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 09:51:27 +00:00
TreeHugger Robot
600261a484 Merge "Change the "Restore" button to "Reset"" into udc-dev 2023-03-28 09:36:57 +00:00
Ken Lin
c27ee0dca8 Merge "Correct the resolution illustration at the setting page" into udc-dev am: a1da0b8da0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22162065

Change-Id: Ia48c1c6fa76c7795669e043e13668f7e82187015
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 09:35:50 +00:00
Candice Lo
6800d9f6c2 Merge "Create tooltip for notifying auto-adding the font scaling tile" into udc-dev 2023-03-28 09:34:13 +00:00
Ken Lin
a1da0b8da0 Merge "Correct the resolution illustration at the setting page" into udc-dev 2023-03-28 09:06:03 +00:00
TreeHugger Robot
cc7dbb7603 Merge "Handles Flash Notifications intro if there's no valid camera" into udc-dev am: a34ab52d0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22244838

Change-Id: I8ccb0aa36bb4dd4865659de2bb66742f2b422e08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 08:19:51 +00:00
danielwbhuang
a53b093a2b Change the "Restore" button to "Reset"
"Restore" button should be displayed as "Reset", since the string "reset" is used more often and the action is actually "to reset".

Bug: 274714167
Test: manual
Change-Id: Ide6728bba8b17c22fe40b2dc0d65ea6166de44bc
2023-03-28 16:07:20 +08:00