Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,507 Commits 1 Branch 0 Tags
637ff8a720c528ef0865506ff80c1f0d4b0a6a6a
Commit Graph

100507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
637ff8a720 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 24bd47eda7 -s ours am: 7b4af603b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ed14fd6f982b4570fe15cf296aa85485f229bd3
 2022-02-24 19:04:16 +00:00
Bill Yi
9d87ccd670 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3ce34203a -s ours am: 4c23b861ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe351b4744fee6ca004f488266f50b482f49a94f
 2022-02-24 19:04:15 +00:00
Bill Yi
f4a111cdcf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 85de1c63a0 -s ours am: 1f54a37763 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iacb71005a26e2918a715925d4f739412e5319b8d
 2022-02-24 19:03:33 +00:00
TreeHugger Robot
7b4af603b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 24bd47eda7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08953b72649f22b940aa71035fd74d5f168143c9
 2022-02-24 18:26:32 +00:00
Bill Yi
4c23b861ce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3ce34203a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idec4de9dc19f222445eb564a4ddaf75425f96f14
 2022-02-24 18:26:30 +00:00
Bill Yi
1f54a37763 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84 am: 85de1c63a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7933a10f4846837ef65d4cb98a0e896bef9db840
 2022-02-24 18:26:06 +00:00
Bill Yi
dc4656cb7c Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-02-24 18:05:43 +00:00
TreeHugger Robot
e79968b58b Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-02-24 18:02:28 +00:00
TreeHugger Robot
24bd47eda7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-02-24 18:00:29 +00:00
TreeHugger Robot
139331e47f Merge "[Panlingual] Adds log and have small refactor." 2022-02-24 17:08:44 +00:00
Julia Reynolds
6a663c3dff Merge "Remove unnecessary async" into tm-dev am: 1d15b24da2 am: 9d01ed5377 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16990592

Change-Id: Ia62d904084968418387dd231bbd58430afb98977
 2022-02-24 16:43:23 +00:00
Julia Reynolds
9d01ed5377 Merge "Remove unnecessary async" into tm-dev am: 1d15b24da2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16990592

Change-Id: I748563c902ee32443596e6e95a5784dfdcbd6b9d
 2022-02-24 15:46:23 +00:00
Julia Reynolds
1d15b24da2 Merge "Remove unnecessary async" into tm-dev 2022-02-24 15:30:02 +00:00
TreeHugger Robot
4257b0e1e8 Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2e3 am: fd9774a633 am: 606488fea8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955

Change-Id: I244fdc314d97d6a5ce4a87293689735326ee8af1
 2022-02-24 14:52:48 +00:00
Bill Yi
c6def3b1bf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 8e58f10261 -s ours am: 23bac2fa39 -s ours am: 548359ddf9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4719d2d642a7d6fc6ea521454c4c2b95b13ae530
 2022-02-24 14:52:46 +00:00
TreeHugger Robot
d8dcff4eac Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2e3 am: fd9774a633 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955

Change-Id: I91779796d31881527854776514ce87e4e6751365
 2022-02-24 14:52:30 +00:00
Bill Yi
efdd5ffb3b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 8e58f10261 -s ours am: 23bac2fa39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I96fbfaef0a0b0d9708aa1b449cde3c513cdaf516
 2022-02-24 14:52:24 +00:00
Bill Yi
16408207f9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 41068978bb -s ours am: fd463afb87 -s ours am: a6182064cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3dea6959f89028575d626fa81f1faa84df09d8fe
 2022-02-24 14:41:10 +00:00
tom hsu
f2613fc56b [Panlingual] Adds log and have small refactor. 
Bug: 218660171
Test: local
Change-Id: Icedc6808c9115afc996f435bfd4ca59e20c781ab
 2022-02-24 22:34:10 +08:00
Bill Yi
41275380bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 41068978bb -s ours am: fd463afb87 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f5e60d154f979c6e744ee5a0df3d35585efeddc
 2022-02-24 14:31:01 +00:00
PETER LIANG
7ed4f3343e Merge "Polish and humanize the summary for Display/Font size." into tm-dev am: 78310383b0 am: 713208f556 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16996808

Change-Id: Ie015fe844099333b27fd9968931171578a7605d4
 2022-02-24 14:17:45 +00:00
Marie Matheson
15c15ecdad Merge "Rename safety source ids to match format from other apps." into tm-dev am: aa43d6f06b am: 079d7f45e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16981670

Change-Id: Ibc3df37f6755b12a0f0ac0ca89925d5c8ae8971a
 2022-02-24 14:06:33 +00:00
TreeHugger Robot
606488fea8 Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2e3 am: fd9774a633 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955

Change-Id: I3aa3946eb83e2f47bf155d3a147d04390ec91234
 2022-02-24 13:57:29 +00:00
Bill Yi
548359ddf9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 8e58f10261 -s ours am: 23bac2fa39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id021f7b3061fc2b31c5d7c5d52f6cd1e3b571a58
 2022-02-24 13:57:25 +00:00
Bill Yi
a6182064cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 41068978bb -s ours am: fd463afb87 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5dc2b64ab281b5f5a47654b6e0d7953b852871e8
 2022-02-24 13:57:18 +00:00
TreeHugger Robot
fd9774a633 Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955

Change-Id: I6c5a360d12c0b093f960a4916173d6e58549cfbd
 2022-02-24 13:56:58 +00:00
Bill Yi
23bac2fa39 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 8e58f10261 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic540fe2f3bf75422c829fb89b022e69cc9535fad
 2022-02-24 13:56:47 +00:00
Marie Matheson
b44774b3af Merge "Rename safety source ids to match format from other apps." into tm-dev am: aa43d6f06b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16981670

Change-Id: I2a0dbc58ee5eafa8ded57a83e96af1d1fa686cb9
 2022-02-24 13:56:09 +00:00
PETER LIANG
713208f556 Merge "Polish and humanize the summary for Display/Font size." into tm-dev am: 78310383b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16996808

Change-Id: Iaa997f919b2ba28d352de910d53f0bb78316c906
 2022-02-24 13:54:51 +00:00
Bill Yi
fd463afb87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 41068978bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad43b14f466e956f7d7df3e6ff3cbff9b195d448
 2022-02-24 13:52:48 +00:00
PETER LIANG
78310383b0 Merge "Polish and humanize the summary for Display/Font size." into tm-dev 2022-02-24 13:28:17 +00:00
Peter_Liang
e9b6679971 Polish and humanize the summary for Display/Font size. 
Fix: 220071533
Test: manual test
Change-Id: Id09e97f23263bd118c461b6570165f55d62f9881
 2022-02-24 13:26:13 +00:00
Marie Matheson
079d7f45e4 Merge "Rename safety source ids to match format from other apps." into tm-dev am: aa43d6f06b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16981670

Change-Id: I3e0a3006dd8227b71367378d47792b35ffdd6c49
 2022-02-24 13:16:53 +00:00
Marie Matheson
aa43d6f06b Merge "Rename safety source ids to match format from other apps." into tm-dev 2022-02-24 12:56:23 +00:00
Yuri Ufimtsev
23785a116c Merge "Use FakeFeatureFactory in SafetySourceBroadcastReceiverTest" into tm-dev am: d27a463baf am: 181326d5d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987665

Change-Id: I017acaf3e00469cfadf6b30746b3a6d6119d1997
 2022-02-24 11:41:27 +00:00
SongFerng Wang
be494d6cb6 Merge "Fix the settings crash when SimDialogActivity is null" 2022-02-24 10:38:37 +00:00
Yuri Ufimtsev
b2e524bce6 Merge "Use FakeFeatureFactory in SafetySourceBroadcastReceiverTest" into tm-dev am: d27a463baf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987665

Change-Id: I222f80685744c4158775d8ac380d3eda43a7ed01
 2022-02-24 09:44:12 +00:00
Yuri Ufimtsev
181326d5d8 Merge "Use FakeFeatureFactory in SafetySourceBroadcastReceiverTest" into tm-dev am: d27a463baf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987665

Change-Id: Ifbed99b2e62e3eafe1b32c8b80134aa22fb27d5c
 2022-02-24 09:42:41 +00:00
Yuri Ufimtsev
d27a463baf Merge "Use FakeFeatureFactory in SafetySourceBroadcastReceiverTest" into tm-dev 2022-02-24 08:54:01 +00:00
SongFerngWang
70bf76a436 Fix the settings crash when SimDialogActivity is null 
The PreferredSimDialogFragment did updateDialog after SimDialogActivity
was finished. It caused the settings crash. This is similar to b/184899699

Bug: 220803944
Test: build pass
Change-Id: I9a5964400a63053e362632944b9e7aa8ec1bbea8
 2022-02-24 15:50:39 +08:00
Xiao Ma
170d39dd63 Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3 am: b3fedd0633 am: 397b3fe978 am: 2771fcaa8e am: 498c9a8da0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461

Change-Id: If8ec8f12b4bf19f04df0fb8dca2e68e1a332d39c
 2022-02-24 07:16:44 +00:00
Xiao Ma
07cbeebbf8 Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3 am: b3fedd0633 am: 397b3fe978 am: 2771fcaa8e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461

Change-Id: I9e8354211cf47c460ab282f555e8e3224519226f
 2022-02-24 07:06:49 +00:00
Xiao Ma
498c9a8da0 Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3 am: b3fedd0633 am: 397b3fe978 am: 2771fcaa8e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461

Change-Id: I7d261fdbdbdd53ede11916398e136d54687a2bd0
 2022-02-24 06:30:16 +00:00
Xiao Ma
2771fcaa8e Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3 am: b3fedd0633 am: 397b3fe978 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461

Change-Id: Ie5150b1987653c52d922af1a057df39553ccf7b4
 2022-02-24 06:07:48 +00:00
Xiao Ma
397b3fe978 Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3 am: b3fedd0633 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461

Change-Id: Ifd244bd60e65937c510a5447c9642225be400e3f
 2022-02-24 05:46:28 +00:00
Xiao Ma
b3fedd0633 Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461

Change-Id: Icc3b8d9fd42ee9712cfc81c74ae886576695ee2a
 2022-02-24 05:22:10 +00:00
TreeHugger Robot
b25fe95eb4 Merge "Update TARE UI." into tm-dev am: 2164070f4a am: 17df4d8268 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987400

Change-Id: I2c3177da8be3ac968fc00365189731b178431d56
 2022-02-24 05:11:07 +00:00
Xiao Ma
3340b8e3c3 Merge "Adapt new EthernetManager APIs in Settings." 2022-02-24 04:58:26 +00:00
TreeHugger Robot
d5e3d2e1fe Merge "Reset all TARE constants." into tm-dev am: 42156e7ba9 am: 747eed42fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16989250

Change-Id: I53206a2d64d904146c00e952b8909d753128816d
 2022-02-24 02:53:04 +00:00
TreeHugger Robot
37cd69b941 Merge "Update TARE UI." into tm-dev am: 2164070f4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987400

Change-Id: I176dcf67f12f05cc2f2f7678908cd4f1692bf5ea
 2022-02-24 02:08:01 +00:00