PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,198 Commits 1 Branch 0 Tags
e16da63b95af21e603fe5c8512f9f7ce6d74481e
Commit Graph

102198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
dc8b0a5e2d Merge "Update dream settings categories, to fix padding." into tm-dev 2022-04-14 21:21:22 +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
2f178cfdf3 Merge "Set Active dream to not be clickable when active." into tm-dev 2022-04-14 19:41:32 +00:00
Lucas Silva
d8b90650d3 Update dream settings categories, to fix padding. 
The extra PreferenceCategory is adding some unnecessary padding, so
removing it. Instead of using a preference category to enable/disable
all items, we just iterate through all the preferences when
enabling/disabling items.

Bug: 227139218
Test: locally on device
Change-Id: I403295fbccb7b135b7d603cd1fc713c4c0189569
 2022-04-14 18:59:53 +00:00
TreeHugger Robot
a0e140b728 [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 skip reason: subject contains skip directive

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

Change-Id: I5dbab8c22aa49cfed736a1ef24e739b3e70acc90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:37:17 +00:00
Bill Yi
a14e9514c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -s ours am: db2dfb95da -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: I4ab2b23eb3b46e580cc43d0ca3afc149631c81d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:37:16 +00:00
TreeHugger Robot
c0473f683a [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 skip reason: subject contains skip directive

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

Change-Id: Ic25e06d7ff34f2d46236d40b25a3b6d2e5336c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:36:31 +00:00
Bill Yi
d975bfd607 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours am: 57b6374513 -s ours am: 006db32086 -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: Ifb5919cb0820eb6489fca924977c81612cbc3b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:36:28 +00:00
TreeHugger Robot
a5a1c5710e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours am: d22b43c6a5 -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: I6370b4b7c11bdb4d2514c601acd93b141060e7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:14:55 +00:00
Bill Yi
db2dfb95da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -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: I86f0b1dc43806b330b5d18f36aba3dea181b14ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:14:52 +00:00
TreeHugger Robot
f26007c8ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -s ours am: c53da610b2 -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: Id50ca54e69d4273ef635cce3db7f15ded82a0163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:14:04 +00:00
Bill Yi
006db32086 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours am: 57b6374513 -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: I511a9059ccf3c323d7eb7cc96438b3c27bff6bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:14:00 +00:00
TreeHugger Robot
d22b43c6a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -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: Ib8d08684f79433ec17dfad8daf29de4e23b28eb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:26 +00:00
Bill Yi
812e79c8cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -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: Ic507bfd58ddae3eef0b30505327b18ceac24e676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:24 +00:00
Bill Yi
57e6a29f1a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b67694c1cb -s ours am: 20efc0cc64 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27a6f80388bbf495a621c9323c3e21d905773f8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:16 +00:00
TreeHugger Robot
c53da610b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -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: If3fcaae0791677a5244d0006375b38f09847194a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:15 +00:00
Bill Yi
d700cfe212 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384 -s ours am: 4b073cf421 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8151cc6183dee4aca9e57a8884ef975c08f38f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:15 +00:00
Bill Yi
57b6374513 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -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: I1a89457b55725eb781c4106d2a15ee53a15d7dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:01 +00:00
TreeHugger Robot
1fd59e05d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350 -s ours am: 0312b67407 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied28975e9ee048034465f7a680b2349d52133e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:46:03 +00:00
Lucas Silva
f8c7a84eb8 Merge "Add hyphenation to customize button text." into tm-dev am: b31dbbb1cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17758405

Change-Id: I087523825288400c738a188c04ac5d9bea53a3da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:45:16 +00:00
TreeHugger Robot
e9c60d9d72 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2212edb907 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I504a845295c3f73bf08f3f26e464c412789f36f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:45:00 +00:00
Bill Yi
942891fc3c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23f2bfb3a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I427dcfa9066828733b05add13eaff191c9d0180b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:44:59 +00:00