Bill Yi
d0a8df6667
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8156cb9555
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17784480
Change-Id: I4f40fdfb2fe2a2fc910ba6fb23a82a75d258c186
2022-04-17 04:26:19 +00:00
Bill Yi
8156cb9555
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If527551275eb8fc20bc08cea699b786b52ce97e3
2022-04-17 04:26:06 +00:00
YK Hung
c35bdcf6a0
Merge "Use the custom name in the battery attribution if it is unknown item" into tm-dev am: c4801433d9
am: 7511d1ed16
am: a219fa179b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730656
Change-Id: I60f81180dc86ceacc6f488b71f7a105032d6dba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 14:33:41 +00:00
YK Hung
a219fa179b
Merge "Use the custom name in the battery attribution if it is unknown item" into tm-dev am: c4801433d9
am: 7511d1ed16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730656
Change-Id: I58362e6e9ac5a07d582e9c43e7b10da116d02bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 14:13:19 +00:00
YK Hung
5084bf8b35
Merge "Use the custom name in the battery attribution if it is unknown item" into tm-dev am: c4801433d9
am: 84e451d784
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730656
Change-Id: Ie15b204a471c88ecb8792dae932b7980aab84dd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 14:12:55 +00:00
YK Hung
7511d1ed16
Merge "Use the custom name in the battery attribution if it is unknown item" into tm-dev am: c4801433d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730656
Change-Id: I3b891f73ada7ec1e53d7e0fe1c7ade81cc23fe0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 13:30:12 +00:00
YK Hung
84e451d784
Merge "Use the custom name in the battery attribution if it is unknown item" into tm-dev am: c4801433d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730656
Change-Id: I0cba8a3bce94abccacae54146411ef6474e2082a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 13:29:16 +00:00
TreeHugger Robot
0170078348
Merge "Remove singeLine attribute in the usage chart divider" into tm-dev am: 36414eab28
am: 5d53c96d6b
am: 555d08b837
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17771974
Change-Id: Ic534036fed481b5e4cfe59fad7f38327e3ff9a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 13:08:51 +00:00
YK Hung
c4801433d9
Merge "Use the custom name in the battery attribution if it is unknown item" into tm-dev
2022-04-15 13:06:04 +00:00
TreeHugger Robot
555d08b837
Merge "Remove singeLine attribute in the usage chart divider" into tm-dev am: 36414eab28
am: 5d53c96d6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17771974
Change-Id: I6c50421d9a3e2ea3e7f9f204e6d335f4d9be5564
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 12:44:45 +00:00
TreeHugger Robot
96d95b237d
Merge "Remove singeLine attribute in the usage chart divider" into tm-dev am: 36414eab28
am: 3d851dd1c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17771974
Change-Id: I52fedbc8e00f36a6d3373097bf018514f424f667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 12:36:53 +00:00
TreeHugger Robot
5d53c96d6b
Merge "Remove singeLine attribute in the usage chart divider" into tm-dev am: 36414eab28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17771974
Change-Id: I51e7338ef9c804968a6fd9e8324841c9563bc9a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 12:22:49 +00:00
TreeHugger Robot
3d851dd1c9
Merge "Remove singeLine attribute in the usage chart divider" into tm-dev am: 36414eab28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17771974
Change-Id: I03c03d46964c01495d4188b1581bc65e8449d67a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 12:21:57 +00:00
TreeHugger Robot
36414eab28
Merge "Remove singeLine attribute in the usage chart divider" into tm-dev
2022-04-15 11:47:55 +00:00
ykhung
1c6695951f
Use the custom name in the battery attribution if it is unknown item
...
Keep the queried name is null to use the custom provided battery attribution name (avoid to replace it with POWER_COMPONENT_ prefix name), such that we can show "TPU", "GPU" ... attribution.
old screenshot: https://screenshot.googleplex.com/8KGNxW2eHFY85zw
new screenshot: https://screenshot.googleplex.com/8KVj3jBjShfa8wK
Bug: 227749579
Test: make RunSettingsRoboTests
Change-Id: I22fba3c252a92f7d64670ad5d0f6f3548374968a
2022-04-15 11:20:46 +00:00
Chaohui Wang
4ae0c7a6f1
Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev am: fdc32b765d
am: 538990be94
am: 9f782f4707
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17679969
Change-Id: I1f3b5f0e17023684094e9cc79d904c68bf4aa91c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 11:01:56 +00:00
Chaohui Wang
9f782f4707
Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev am: fdc32b765d
am: 538990be94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17679969
Change-Id: I57e60e0268c51bd864c928f3f2842dc3cec0bcf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 10:33:16 +00:00
Chaohui Wang
e138cffb1b
Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev am: fdc32b765d
am: d0e84aed9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17679969
Change-Id: Idf3f54519d51010ddc2dc3ff50066ed81c468ff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 10:32:54 +00:00
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
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