PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,750 Commits 1 Branch 0 Tags
ced4e8df8b5e3671b023359570c68ff55ec2cf05
Commit Graph

122750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
ced4e8df8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28473ca95c4f26f45811162685f95dfad0d1c57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:07:56 +00:00
Bill Yi
24a7a54341 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8fceb2c2cb46e03d76cab54b1348030cf61b788c
 2023-06-22 10:35:13 -07:00
TreeHugger Robot
1485ceaf97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I17a6c8a571b4a0b7d943dfd710cde0f18d03da39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:09:42 +00:00
Bill Yi
422c0622e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib724a8c68b2b9ec7fb438719c227094605d3efac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:09:30 +00:00
Bill Yi
121dcd4d85 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14a0dc3b2435e511beec62e65281374249e704f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:09:10 +00:00
TreeHugger Robot
3f85afaad5 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-22 07:13:52 +00:00
Bill Yi
65122fc3d2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaff205a3b097d4239074e483525f0ab12f97d493
 2023-06-21 16:33:47 -07:00
Bill Yi
588001801a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic6f318bc10b367849754f16f9c02a9aa75a24b74
 2023-06-21 16:32:09 -07:00
Bill Yi
196592ee78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b5c0743698cc167f7852176ed4f619cb515902b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 20:39:03 +00:00
Bill Yi
1ca0379e99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I626aca749292a50a5c1eb0755d4801cefd85ca0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 20:38:58 +00:00
Bill Yi
e6bbf4c0ab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1355b8c0575e2d4cae4a1ebe2284d4fcbca5009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 20:38:47 +00:00
Bill Yi
bfde831c44 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-21 19:19:29 +00:00
Bill Yi
6072ca10ec Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8c5e78d87373a142a4082f9081a28027d239af45
 2023-06-21 07:16:56 -07:00
Bill Yi
b37162ce4a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia31b10a26fde9ae0f51940ad59e4746ead5fa70b
 2023-06-21 07:15:19 -07:00
Treehugger Robot
3cc206bb14 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6db3e162b26a8ab0355ba8c39834756850a89f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:36:44 +00:00
Bill Yi
c8daf1ce7c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b4e859b86c5039e4aebd961d5e0fd476c73cf4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:36:41 +00:00
Bill Yi
9c5a967922 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieabe6679580ea0eb03115372f46ec06be1925f5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:36:15 +00:00
Treehugger Robot
8e3c231438 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-21 06:19:35 +00:00
Bill Yi
dd95a8a7c8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3c3068ef9ae4cfd121798c3247328a8ebaadf22a
 2023-06-20 19:30:31 -07:00
Bill Yi
d0213cd684 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7725eba9eba2160e5a330d92a312f45d677b91a7
 2023-06-20 19:28:50 -07:00
Julia Tuttle
ee0d1171aa Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613

Change-Id: Ieaf111aae95150c6c7480ee0693478be934d6353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 17:06:47 +00:00
Julia Tuttle
bd74e47e5e Merge "Fix colors in importance and conversation priority preferences" into udc-dev 2023-06-20 16:21:01 +00:00
Treehugger Robot
975e782dd4 Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf am: e1858cab06 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212

Change-Id: I4b486b4da6d99522ab004876fb1abdc2f45766dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 14:37:21 +00:00
Treehugger Robot
e1858cab06 Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 am: 45918b72bf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212

Change-Id: I41a6347afc1fe6a038ac75bf6a76855b42268f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 13:50:31 +00:00
Treehugger Robot
45918b72bf Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212

Change-Id: I11e6110ba0b640be8b373d9afd45f806c005b05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 13:13:42 +00:00
Treehugger Robot
aa3dc53d97 Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" 2023-06-20 12:13:34 +00:00
YK Hung
5007841ebd Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: Id6b352d47918565fac42659529c97d1b4c89606f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 07:01:29 +00:00
YK Hung
a4f67e02c8 Merge "Update tablet help article link (1/2)" into udc-dev 2023-06-20 06:34:46 +00:00
Dmitrii Merkurev
d7d4ec224f Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE 
Currently factory reset action is ignored if
PERSISTENT_DATA_BLOCK_SERVICE isn't presented on device.
Make sure that we can execute regular factory reset without
it by utilizing the logic from shouldWipePersistentDataBlock.

Test: manual verify on aosp build
Bug: 129137473
Bug: 196634851
Change-Id: I2abcb93cbc0872dd920c1dd62152596ddd723691
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
 2023-06-19 21:06:25 +01:00
Chaohui Wang
6bceb29408 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 am: b1231c5f15 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: I936a6e4a4f24a7f8c238662ec09a02f7a3e985e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 10:45:36 +00:00
Chaohui Wang
b1231c5f15 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: I9e87eec0995e9dde010a51e3a7ccbaf68839a696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 09:56:38 +00:00
Chaohui Wang
7fdf1c4b17 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: Ia337805f374b7c05bac8902ff9add84ced999f9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 09:17:09 +00:00
Chaohui Wang
6b2f2ab205 Merge "Update the OWNERS for bluetooth & connecteddevice" 2023-06-19 08:29:54 +00:00
Chaohui Wang
85c1dea20a Update the OWNERS for bluetooth & connecteddevice 
Bug: N/A
Test: N/A
Change-Id: I72b4b6f47586b2dd13cfcc4a642c817c93e4ded0
 2023-06-19 07:35:20 +00:00
Julia Tuttle
b23136041d Fix colors in importance and conversation priority preferences 
This would have been simpler and faster, but the ChannelPanelActivity
was giving me a context where Material colors always inflated in light
theme even if the device was in dark theme, so I had to work around it.

On the plus side, whoever next needs to change these colors will find
them neatly organized in themes.xml!

Bug: 284380876
Test: manual
Change-Id: I2eee877fe44d307a96d60168d0317444ff002669
 2023-06-16 19:17:09 +00:00
Treehugger Robot
c14daa817b Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723

Change-Id: I1e96376f6aec9cce89f71117474bace2d1364505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 12:06:30 +00:00
Treehugger Robot
2d23561a25 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I575d1fc77fefd4bd5b441403f0bc88cf7ede8b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 11:44:07 +00:00
Treehugger Robot
08366227b5 Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev 2023-06-15 11:18:51 +00:00
Treehugger Robot
2010c175a6 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I9c423f5290eec4f6a8ac68aca4ece6b6675e7a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 10:33:50 +00:00
Treehugger Robot
2c73cc8ca8 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: Id3c8af985ccaaa05e29238bc3c0bcda257fe132e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 09:50:45 +00:00
Treehugger Robot
a3f9f42b71 Merge "'Mobile plan' is searchable even if it is unavailable" 2023-06-15 08:57:32 +00:00
Wesley Wang
ddbb5bcd5c Update tablet help article link (1/2) 
Bug: 287122689
Test: make SettingsRoboTests
Change-Id: If09f7a6aab01f00bdb1675444237698643e6ba93
 2023-06-15 14:38:59 +08:00
Matías Hernández
dfef40cb74 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 2f1883c397 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8aaec15d21be327b17e6a2645ef04ac431633afd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 18:55:17 +00:00
Matías Hernández
5a51d41a4c [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 42339b4e56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f6a9dd6f7ca79d0c34386d907282b4870c9ccc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 18:13:14 +00:00
Matías Hernández
2f1883c397 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic98a1c7f24ecc89b74dae1d1edcee9bdf0bab335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 18:09:45 +00:00
Matías Hernández
5a43ab914c [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14c85fff7d -s ours am: 41d3ecca1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I721a9e800419dbb55903f02021734b741c1fec95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 18:09:33 +00:00
Matías Hernández
42339b4e56 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I103eab934503369ef57e0e76b50e3cd299b75e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 18:08:32 +00:00
Matías Hernández
85cad88256 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifbc950729fb38065185e73d74e6e5f86f85865bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 17:26:05 +00:00
Matías Hernández
ed1b91ffdc Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e am: bbfe425326 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I5eb0d7fef7ecf45c9cd471d3298150445bc84ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 17:22:52 +00:00
Matías Hernández
41d3ecca1c [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14c85fff7d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I557b5bc86b14e222cbe5624504ac3cd34ff0124d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 17:22:29 +00:00