Commit Graph

102425 Commits

Author SHA1 Message Date
Lucas Silva
28b4fe2363 Update dream settings strings with sensible char limits.
Also removes some unused strings

Bug: 228790933
Test: n/a
Change-Id: I42fd1954242dc12370982bfbc0e18389e9a7c3dc
2022-04-18 17:00:50 +00:00
TreeHugger Robot
2c1171000f Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev am: 708c2d2fd5 am: d9db15cd77
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799704

Change-Id: I0306a9b7d37caaba971c167500b731180ce0316f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 09:02:22 +00:00
TreeHugger Robot
d9db15cd77 Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev am: 708c2d2fd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799704

Change-Id: Ifa16e70b61a75252c8a5ba9f6fc25f7786be8349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 08:44:14 +00:00
TreeHugger Robot
708c2d2fd5 Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev 2022-04-18 08:20:48 +00:00
Edgar Wang
45603532b0 Merge "Adjust the padding between profile tab and app filter spinner" into tm-dev am: 4dc79d92f0 am: 4d63cf51b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799703

Change-Id: I6942517ab8e6d6732f0cfd454f5ae98e034971e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 07:35:36 +00:00
Edgar Wang
4d63cf51b0 Merge "Adjust the padding between profile tab and app filter spinner" into tm-dev am: 4dc79d92f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799703

Change-Id: I0b82a1fc8f57cd969185f746e85b6b33469ddbf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 07:12:08 +00:00
Edgar Wang
4dc79d92f0 Merge "Adjust the padding between profile tab and app filter spinner" into tm-dev 2022-04-18 06:45:02 +00:00
ykhung
0f8ee91e1e Remove the legacy getReplacingActivity() method from feature provider
Bug: 195306545
Test: make RunSettingsRoboTests
Change-Id: Ie7ae30ad671ec2ee2659e64ee4f191728edab4e8
2022-04-18 05:59:58 +00:00
Kedar Chitnis
ba15580112 Merge "Guest mode UX flow updates to user settings" into tm-qpr-dev 2022-04-18 05:34:56 +00:00
TreeHugger Robot
35f7037272 Merge "Fix sub status of LocationSettings" into tm-dev am: edf39d0e45 am: eec3d74bba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730657

Change-Id: I2a5fa158c213c3292ac073867bbb27f613b7d272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 04:56:47 +00:00
Edgar Wang
ca7f11d965 Adjust the padding between profile tab and app filter spinner
Bug: 223952727
Test: visual
Change-Id: I88411d554975953d29a24a88b6cf948f7f6d7ac8
2022-04-18 12:48:35 +08:00
TreeHugger Robot
eec3d74bba Merge "Fix sub status of LocationSettings" into tm-dev am: edf39d0e45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730657

Change-Id: I7fed1181a83f6a6246bba3edb5e7be59d98f0263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 04:42:15 +00:00
TreeHugger Robot
edf39d0e45 Merge "Fix sub status of LocationSettings" into tm-dev 2022-04-18 04:20:09 +00:00
Hugh Chen
7fdda75184 Merge "Change "Previously connected devices" string to "Saved devices"" into tm-dev am: 3c354a2d38 am: e16da63b95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17774547

Change-Id: I2ec548308ce469e0c720a5288c343133b4cf8664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 02:26:50 +00:00
Hugh Chen
e16da63b95 Merge "Change "Previously connected devices" string to "Saved devices"" into tm-dev am: 3c354a2d38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17774547

Change-Id: I12c700ace3faca6c3688de630f9dedf787075f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 02:09:56 +00:00
Hugh Chen
3c354a2d38 Merge "Change "Previously connected devices" string to "Saved devices"" into tm-dev 2022-04-18 01:50:07 +00:00
ykhung
07ffd41883 Use en-dash in the time range instead of a hyphen for different format am: 91adbd3b16 am: 24707ec043
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17782706

Change-Id: Ic4d40a82533cef9fb9792016bd0eda6044ef8ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-17 15:38:29 +00:00
ykhung
1d135d8660 Format BatteryEntry and BatteryDiffEntry class am: b593e00af0 am: 83a47bfa33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17782705

Change-Id: I88423fb9f773122310449b590942ddd0497a3982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-17 15:38:23 +00:00
ykhung
24707ec043 Use en-dash in the time range instead of a hyphen for different format am: 91adbd3b16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17782706

Change-Id: I4616826eb10441dd13c2eeec9c09262d86e23bcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-17 15:23:35 +00:00
ykhung
83a47bfa33 Format BatteryEntry and BatteryDiffEntry class am: b593e00af0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17782705

Change-Id: I1193e3e0638dab1b35865f8523cf08764fb0d58d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-17 15:23:29 +00:00
Chaohui Wang
37375565e5 Fix sub status of LocationSettings
Fix the followings:
Recent access apps are not displayed after toggling off/on
"Use location".
When "Use location" is enabled, "Location for work profile" switch is
disable and gray out.

Fix: 227621199
Fix: 227265216
Test: manual
Change-Id: I9f955a381827eb020fbd0d6ebeb9fced3dec1dcf
2022-04-17 19:38:39 +08:00
ykhung
91adbd3b16 Use en-dash in the time range instead of a hyphen for different format
Expected format: 00:00–02:00 or (2pm – 4pm)

Screenshots:
https://screenshot.googleplex.com/4RvaovK6RN7kjqo
https://screenshot.googleplex.com/ADZRr2TPuuctFre

Bug: 229264053
Test: make RunSettingsRoboTests
Change-Id: Ifd9bea0ce4525c8b582778e255104e875d365563
2022-04-17 06:52:24 +00:00
ykhung
b593e00af0 Format BatteryEntry and BatteryDiffEntry class
Bug: N/A
Test: make RunSettingsRoboTests
Change-Id: I14e2ef4c455209e58edc5ccdbe064f469815cccd
2022-04-17 06:23:47 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
fbafdbdd8f Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev 2022-04-14 23:22:19 +00:00