Commit Graph

104676 Commits

Author SHA1 Message Date
Chaohui Wang
538990be94 Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev am: fdc32b765d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17679969

Change-Id: I0f994cb1cdbad4fb6b963ba2d8ec288968b3545e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 10:16:47 +00:00
Chaohui Wang
d0e84aed9b Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev am: fdc32b765d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17679969

Change-Id: If145441cd05cc9a1b4b98cba4229d1797ea3e141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 10:15:51 +00:00
SongFerng Wang
930d588a88 Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75 am: 6296df10da am: 9b6c604742 am: 0abc32a7de am: 48fa329f50
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750

Change-Id: I857ef55f46838d7a715df9c01d2b53a3862198ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 10:02:02 +00:00
Chaohui Wang
fdc32b765d Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev 2022-04-15 09:55:48 +00:00
Hugh Chen
e9864510ab Change "Previously connected devices" string to "Saved devices"
Bug: 215230194
Test: local test
Change-Id: I0ae7f71b798f5582ff62f20ce639133242c30b3f
2022-04-15 09:51:30 +00:00
SongFerng Wang
1928926c66 Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75 am: 6296df10da am: 9b6c604742 am: 3f701d6924
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750

Change-Id: If92c47e6bbf93652ff43cb4102946146bc36bdcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 09:41:25 +00:00
SongFerng Wang
48fa329f50 Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75 am: 6296df10da am: 9b6c604742 am: 0abc32a7de
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750

Change-Id: Ide4293ab460caa2b86755943e8bb40bda696c7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 09:40:49 +00:00
TreeHugger Robot
c6e4554848 Merge "When in guest mode hide the rename button" 2022-04-15 09:07:20 +00:00
SongFerng Wang
0abc32a7de Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75 am: 6296df10da am: 9b6c604742
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750

Change-Id: Id5187d02b82315ffd9c7490a71ab5ddd3cec9579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 08:57:50 +00:00
SongFerng Wang
3f701d6924 Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75 am: 6296df10da am: 9b6c604742
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750

Change-Id: I676f29fb0d25c814f466a9f4fbe8706b12a0e286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 08:56:56 +00:00
SongFerng Wang
9b6c604742 Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75 am: 6296df10da
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750

Change-Id: I2b87ec33acef3ff86422ac715a30973fa6fd837a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 08:42:48 +00:00
SongFerng Wang
6296df10da Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750

Change-Id: Ib36f32c745b571d18e09e2a5f5ae81220e441fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 08:22:54 +00:00
SongFerng Wang
3b66c18d75 Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750

Change-Id: Ie05c32e8c7d358d4cfad14cee4dc5f8849384d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 08:06:58 +00:00
SongFerng Wang
48967e6466 Merge "[LE unicast] Change the default value for LeContactSharingEnabled" 2022-04-15 07:23:39 +00:00
SongFerngWang
b50430e09d [LE unicast] Change the default value for LeContactSharingEnabled
Bug: 229322144
Test: build pass.
Change-Id: I7673397b9f04df8acb551bdad42dea1f3ece72ff
2022-04-15 15:19:17 +08:00
ykhung
e431df2036 Remove singeLine attribute in the usage chart divider
Remove the android:singleLine attribute in the expand divider layout to support other language to avoid the content is truncated.
old screenshot: https://screenshot.googleplex.com/7JCnrQAXJM8zjMM

Bug: 229265247
Test: N/A
Change-Id: I9038e69a9ab035b4e0599ca20e11fbccd471f76f
2022-04-15 07:00:57 +00:00
Menghan Li
794faa1cb9 Merge "Fix inconsistent shortcut strings on accessibility setting and edit dialog" into tm-dev am: 361d42afe5 am: 19846d0c9a am: 800664ab83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17759934

Change-Id: I7251dad22daafc167377f9f6b7aa3d292f463f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 05:14:30 +00:00
Menghan Li
800664ab83 Merge "Fix inconsistent shortcut strings on accessibility setting and edit dialog" into tm-dev am: 361d42afe5 am: 19846d0c9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17759934

Change-Id: I41a3edd826ad44c75e3c03c432019648db98d892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 04:46:18 +00:00
Menghan Li
7878848acc Merge "Fix inconsistent shortcut strings on accessibility setting and edit dialog" into tm-dev am: 361d42afe5 am: 5e8bdb4332
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17759934

Change-Id: I9dfd907c21980e8165b55029b575709458a3959a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 04:45:52 +00:00
Menghan Li
19846d0c9a Merge "Fix inconsistent shortcut strings on accessibility setting and edit dialog" into tm-dev am: 361d42afe5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17759934

Change-Id: Id50e2858b4791c58b66d1d21a157c94ad60ec8be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 04:22:30 +00:00
Menghan Li
5e8bdb4332 Merge "Fix inconsistent shortcut strings on accessibility setting and edit dialog" into tm-dev am: 361d42afe5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17759934

Change-Id: Ie6bcab5a52d6b7f68f30f16e8b251d8afcbacbca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 04:21:33 +00:00
Menghan Li
361d42afe5 Merge "Fix inconsistent shortcut strings on accessibility setting and edit dialog" into tm-dev 2022-04-15 04:00:11 +00:00
Chaohui Wang
3ce806d870 Fix scrolling position not kept in Trusted Credentials
For example when changing display states.

Save view states to solve this issue.
 - Save current tab. (System / User)
 - Save group expanded state. (Personal / Work)
 - Save scrolling position of each group.

Also updated to ViewPager2 and updated the styles.

Bug: 204839552
Test: manual
Change-Id: Ibeda50b50e7dfd2ba071b75fe2aa88ef560f4c88
2022-04-15 10:12:36 +08:00
Chaohui Wang
31c580a1c2 Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev am: fbafdbdd8f am: d9c7a49ce7 am: 31d75e1d5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17607148

Change-Id: I33ce9f0c9b5608d1da488b7f1f32c9530d138eed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 00:34:55 +00:00
menghanli
50520c2d3f Fix inconsistent shortcut strings on accessibility setting and edit dialog
Root cause: Base class provides an override function for accessibility settings shortcut preference. But, it cannot update to the edit dialog.
Solution: Refine the resilience function and base class apply into accessibility settings shortcut preference and edit dailog.

Bug: 228830417
Test: Manual testing on all accessibility page and edit dialog
Change-Id: I84bc63a39cd9cfa7e12944dff20ee6b92879008d
2022-04-15 00:31:03 +00:00
Chaohui Wang
31d75e1d5f Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev am: fbafdbdd8f am: d9c7a49ce7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17607148

Change-Id: I8e962446f293aa5caca634a72a6346ed1f2cf450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 00:04:06 +00:00
Chaohui Wang
4d0df6d16f Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev am: fbafdbdd8f am: 467676063e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17607148

Change-Id: I696518d33b0e79f5b297c99829cf884de1a1b2be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 00:03:52 +00:00
Chaohui Wang
d9c7a49ce7 Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev am: fbafdbdd8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17607148

Change-Id: I06abe7c118003f5b1230b77d1c3bdd724095eb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 23:42:01 +00:00
Chaohui Wang
467676063e Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev am: fbafdbdd8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17607148

Change-Id: I3c042e5201702cfc140a823e340ded7b96cc55f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 23:39:58 +00:00
Chaohui Wang
fbafdbdd8f Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev 2022-04-14 23:22:19 +00:00
TreeHugger Robot
9f0e4f4975 Merge "Update dream settings categories, to fix padding." into tm-dev am: dc8b0a5e2d am: 8a4420f4a6 am: 8bb469669f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760488

Change-Id: Ic59684289ca93cb005e65c8630b3b8c584e635c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 22:25:50 +00:00
TreeHugger Robot
8bb469669f Merge "Update dream settings categories, to fix padding." into tm-dev am: dc8b0a5e2d am: 8a4420f4a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760488

Change-Id: I77394db8cc266937713fabeb0e1c7e44f7c97c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 22:02:13 +00:00
TreeHugger Robot
acfae4627d Merge "Update dream settings categories, to fix padding." into tm-dev am: dc8b0a5e2d am: 7d8a2c0978
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760488

Change-Id: Id5292daf9d70c36055c2819d8045bb61d0fc99b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 21:54:20 +00:00
TreeHugger Robot
8a4420f4a6 Merge "Update dream settings categories, to fix padding." into tm-dev am: dc8b0a5e2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760488

Change-Id: I0487097adc087bc2b9aa540de02fa49c600ee487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 21:39:35 +00:00
TreeHugger Robot
7d8a2c0978 Merge "Update dream settings categories, to fix padding." into tm-dev am: dc8b0a5e2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760488

Change-Id: I9806d5a0a35cda34662ec03d81472fb950f7e6da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 21:38:26 +00:00
TreeHugger Robot
dc8b0a5e2d Merge "Update dream settings categories, to fix padding." into tm-dev 2022-04-14 21:21:22 +00:00
TreeHugger Robot
ee85c5ba8f Merge "Set Active dream to not be clickable when active." into tm-dev am: 2f178cfdf3 am: 89fdd90031 am: 008a6bf002
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760486

Change-Id: Id2c8db14f0d76aaac608f1f8afe831ed3c2825ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 21:01:32 +00:00
TreeHugger Robot
008a6bf002 Merge "Set Active dream to not be clickable when active." into tm-dev am: 2f178cfdf3 am: 89fdd90031
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760486

Change-Id: I0d7eac15bb2d358517550111b2634b25e871c673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 20:44:48 +00:00
TreeHugger Robot
5b8ba0b768 Merge "Set Active dream to not be clickable when active." into tm-dev am: 2f178cfdf3 am: 1a83cbde6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760486

Change-Id: I7d0dfc26c91e24bbae3f3458d44215856cec5537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 20:43:42 +00:00
TreeHugger Robot
89fdd90031 Merge "Set Active dream to not be clickable when active." into tm-dev am: 2f178cfdf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760486

Change-Id: I7627384562f1382494f857c8baee444ba9e3539b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 20:08:17 +00:00
TreeHugger Robot
1a83cbde6d Merge "Set Active dream to not be clickable when active." into tm-dev am: 2f178cfdf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760486

Change-Id: I8d698fa9b66d38751155cc03d5cbfc6b9a5165e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 20:07:17 +00:00
TreeHugger Robot
280ae3e061 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours am: d22b43c6a5 -s ours am: a5a1c5710e -s ours am: a0e140b728 -s ours am: 39c44e1f75 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I890180ada26d344b330dc8f5f929f685617544ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 19:51:27 +00:00
Bill Yi
b0f9799f2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -s ours am: db2dfb95da -s ours am: a14e9514c3 -s ours am: 17e37dda74 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d7e1b495c2ae5aa2824361b48c2b7f9be8581ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 19:51:27 +00:00
TreeHugger Robot
1c99f3bd79 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -s ours am: c53da610b2 -s ours am: f26007c8ef -s ours am: c0473f683a -s ours am: a647630996 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id591438e5bdb9790c0febd8d3920830ec1620812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 19:50:02 +00:00
Bill Yi
64a010bc01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours am: 57b6374513 -s ours am: 006db32086 -s ours am: d975bfd607 -s ours am: 4a6742b964 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I931b949f140688e98c205c02ba0c2003c2f17624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 19:50:01 +00:00
TreeHugger Robot
2f178cfdf3 Merge "Set Active dream to not be clickable when active." into tm-dev 2022-04-14 19:41:32 +00:00
TreeHugger Robot
39c44e1f75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours am: d22b43c6a5 -s ours am: a5a1c5710e -s ours am: a0e140b728 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0013303c804f05b284dd1acfeb75c816615917d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 19:26:52 +00:00
Bill Yi
17e37dda74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -s ours am: db2dfb95da -s ours am: a14e9514c3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I592f88ed869f8ee5710d24526bb6783fc46fc05d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 19:26:51 +00:00
TreeHugger Robot
2a432ad89c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours am: d22b43c6a5 -s ours am: a5a1c5710e -s ours am: edfab288ee -s ours
am skip reason: subject contains skip directive

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

Change-Id: If485ca1366d2287a342fbc364feb0a134f8f6533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 19:26:12 +00:00
Bill Yi
7edc91c3d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -s ours am: db2dfb95da -s ours am: 51bb20b3d5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c67dfbf73937717828280dd12e5585246d92075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 19:26:11 +00:00