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

122319 Commits

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

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

Change-Id: If25ef7cfa3408e664db2f506304d2c8ec7a665b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-24 00:10:27 +00:00
Bill Yi
6dd5206cab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: a35176545a -s ours 
am skip reason: subject contains skip directive

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

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

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

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

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

Change-Id: I4dacd8d123551565d05bcdb7444b33051e1a74ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 23:19:35 +00:00
Bill Yi
e2abc0ab7a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia036b42598639dac49342562f238cb378b3f6091
 2023-06-22 22:06:04 -07:00
Bill Yi
364eb998be Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9aa9cc04f3cff9f455ced6d6fe8b384c4954b21f
 2023-06-22 21:57:59 -07:00
Bill Yi
000297ad9a [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: I4d9440a38e60d8fb826e1caeeeb5661b01eb9529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:07:18 +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
78a32c7356 [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: I445eea06270f50a1abb08f9679d3f331031e096f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:12:09 +00:00
Bill Yi
de521fb53b [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: I14c4576863c97d3be64c38f91da093b98b8698a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:11:56 +00:00
Bill Yi
029261778c [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: Ie5f2127333c621a9c00421b76d95cd68f1f79dee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:11:37 +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
f40225f1e1 [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: Ie011ba7a5d738ccb6f09eb99619292e6aa83a380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 20:38:30 +00:00
Bill Yi
1d4c5c240c [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: I121c518a3b86727ace4ffabd7586846225347332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 20:38:24 +00:00
Bill Yi
6b8b091653 [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: Ie238c049642fb1e34b01e0d81cdc94b37e9cf009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 20:38:13 +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
8287f6dd2e [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: I7a4e67426ddf14b771962c356e1a629a12401934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:37:02 +00:00
Bill Yi
6ddbc5e6be [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: I7c9097d1415a6163ad859ea747049eeaec25861e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:36:56 +00:00
Bill Yi
3ecb491af2 [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: I333952a9b0a5ee8f37b620f38a122f9bde4d5125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:36:31 +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
4e6fecc6d7 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: I70c6b9024fe1cbb7cf37bfea71225a8bebe5df50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 17:06:04 +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
YK Hung
94f5c7a913 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: I3b226770289800cec4196a6b34ceb05f090a6d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 07:05:34 +00:00
YK Hung
a4f67e02c8 Merge "Update tablet help article link (1/2)" into udc-dev 2023-06-20 06:34:46 +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
Yanli Wan
2db0f47240 Merge "Hide Device Lock settings screen if device lock manager is not available" into udc-devicelock-prod 2023-06-15 20:34:59 +00:00
Treehugger Robot
009c112db2 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: Ifc2273400ae00b6add2c4b20fce660b90bcdd886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 12:05:18 +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
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
3485607020 [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: I4a3a1c7258601783f412fc27f25deb72aba0d10e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 18:09:14 +00:00
Matías Hernández
4a9679b295 [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: I970dbe856c2659411d4ebf2d760b9e98d931a645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 18:08: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
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
Matías Hernández
14ddd8b659 [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 skip reason: subject contains skip directive

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

Change-Id: I1e9ff332c0169848a83062c594bb07b30151e9f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 16:40:44 +00:00
Matías Hernández
14c85fff7d [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 skip reason: subject contains skip directive

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

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

Change-Id: I48ce75b801813466df2d70d1fb647004f207a711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 16:38:24 +00:00
Matías Hernández
0bb6ddf0b6 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

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

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

Change-Id: I91e72e84a4f239501953dbcf048f6043ea588ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 15:55:36 +00:00
Matías Hernández
dcbe38baa9 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I69d2ef43afb54ce3b9d141d4f676b688dd1c5c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 15:52:58 +00:00
Matías Hernández
897c8321a6 [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 skip reason: subject contains skip directive

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

Change-Id: I8136b7f814d25c104f28ebf4714b0f814bdc9d53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 15:50:49 +00:00
Matías Hernández
d185f3aebf [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 skip reason: subject contains skip directive

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

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

Change-Id: I33040a000b1bc4e90b9e76c8e751bca2e09959d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 15:10:59 +00:00