Commit Graph

102887 Commits

Author SHA1 Message Date
Bill Yi
17910cdfa7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: 4970b3783e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f22457acc29a66c5caddecc896a4c3988061e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:24:30 +00:00
Bill Yi
4970b3783e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83d9202789b11983a8bf6e1c2d157330e16c8fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:16:32 +00:00
TreeHugger Robot
341a2953e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d8d5dc02d5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I85cd0b7257faf828bdddc4139510757047829e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 21:02:03 +00:00
Bill Yi
bfb7bb08ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d251c2e700 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5b2d6adaff63ca1bf03755d251d23fb99955a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 21:01:47 +00:00
TreeHugger Robot
053bd1f8ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c63cd3cce5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5430188911ae3f1c178a87369f7f1a20f47b1c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 20:49:40 +00:00
Bill Yi
1025a9751f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3a2158816 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic6c9925cdfc653205b4c4377c19848ea74eee704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 20:49:11 +00:00
TreeHugger Robot
d8d5dc02d5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-03 20:48:07 +00:00
TreeHugger Robot
c63cd3cce5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-03 20:45:40 +00:00
Vadim Caen
615b7cf8ac Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev am: 0be85b0811 am: 7acb9238f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: Iea0a7a11e0419a3bff6655a0c46d26b2f0bf1c4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:43:28 +00:00
Vadim Caen
2e067e8150 Add Settings for back animation developer option DO NOT MERGE am: d268b11e85 am: 47ff8119f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: I48312e373563856975f703212f96c478a1b17b26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:43:24 +00:00
Vadim Caen
74d2c5e3e7 Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev am: 0be85b0811 am: 4f14fd577d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: I22da33381cb7b749f839523c4d46c55834718019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:42:03 +00:00
Vadim Caen
f272d41840 Add Settings for back animation developer option DO NOT MERGE am: d268b11e85 am: ae9ed5fdbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: Ibaef0d6525ddc7dd72996972ea9d7b932ffe0e10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:42:01 +00:00
Vadim Caen
4f14fd577d Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev am: 0be85b0811
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: I47209f2db1dcd605880feecb8ec2bcf75dd6f6c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:17:40 +00:00
Vadim Caen
ae9ed5fdbc Add Settings for back animation developer option DO NOT MERGE am: d268b11e85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: I190a1cbcb0513efff5180d1fa79fa8fe7baef1ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:17:38 +00:00
Vadim Caen
7acb9238f8 Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev am: 0be85b0811
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: I3a34eb81f5c4f8e1bc14c623481504028b3b2bd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:17:27 +00:00
Vadim Caen
47ff8119f2 Add Settings for back animation developer option DO NOT MERGE am: d268b11e85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: Iaa035592fa20b3bd3f29a0f7fab782a66d7e75c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:17:25 +00:00
Victor Chang
09a7871c30 Merge "Titlecasing time zone summary" am: 1d6e9cfdf2 am: 16aca1db9f am: e12caf5c9b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2077567

Change-Id: Id21cf24c3006b91f7518a580100b6fb1868ad6db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 14:15:59 +00:00
Vadim Caen
0be85b0811 Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev 2022-05-03 14:13:56 +00:00
Victor Chang
e12caf5c9b Merge "Titlecasing time zone summary" am: 1d6e9cfdf2 am: 16aca1db9f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2077567

Change-Id: I03fa697dd0ff7197852b6c8aee1256e549ca52d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:57:43 +00:00
Bonian Chen
9ea2bfeb9a Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e am: cf9ca3fbe6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662

Change-Id: Ie1a5d4a2a105a1162398b9d99e7d572319aa7e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:43:15 +00:00
Bonian Chen
54d8d163c9 Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 am: d4440db4bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902

Change-Id: Ieb67fb55701c141d8f44e88f07a8cc71db39a455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:43:08 +00:00
Bonian Chen
9e5ec54ab8 Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e am: 35913be5b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662

Change-Id: Ida65eaa888a1dc39537426516a26763d4ea2d2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:42:49 +00:00
Bonian Chen
5e1c22ad19 Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 am: 260871d57f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902

Change-Id: I6a738bc71f4c0f8b05691974f8d1bb6843d6b194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:42:27 +00:00
Victor Chang
16aca1db9f Merge "Titlecasing time zone summary" am: 1d6e9cfdf2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2077567

Change-Id: If1ab5d3f0934a3803ae81b45aedbcfa41bcc8590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:32:43 +00:00
Bonian Chen
35913be5b4 Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662

Change-Id: Ic93714fee975bccfb00c686ae6d99d932f681f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:26:16 +00:00
Bonian Chen
cf9ca3fbe6 Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662

Change-Id: I2dd55f7ccac5fc66518c24f51ed8943ae3a8719b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:25:26 +00:00
Bonian Chen
260871d57f Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902

Change-Id: I310ec2cf32fa57ed984836c66f3930baf641d1dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:24:32 +00:00
Bonian Chen
d4440db4bf Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902

Change-Id: Iaf30815c9394744995289d44eb097340663b992b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:23:53 +00:00
Bonian Chen
e83d2a5e0e Merge "[Settings] Fix missing part for refactor" into tm-dev 2022-05-03 12:33:36 +00:00
Victor Chang
1d6e9cfdf2 Merge "Titlecasing time zone summary" 2022-05-03 11:10:20 +00:00
Bonian Chen
55d722c2b0 Merge "[Settings] Preferred network mode appears during in-call" into tm-dev 2022-05-03 09:46:47 +00:00
TreeHugger Robot
17adac466d Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev am: cf52a8ea7d am: 23dab0bb02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18126022

Change-Id: I7b9a16ddf662f810d9657e58d27a3455e43a56ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 09:18:52 +00:00
TreeHugger Robot
790d9b3ff6 Merge "Fix the flashing list on Opening link page" into tm-dev am: e99683f013 am: c916acb354
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087633

Change-Id: I38b039d43b63befc9f5959866d626102b8f86eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 09:18:46 +00:00
Bonian Chen
deefe93992 Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0 am: 99724f3a70
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786

Change-Id: I7a02dca4ed4a638fbf3f3b520e1aefeab401b495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 09:18:39 +00:00
TreeHugger Robot
9586e56f1e Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev am: cf52a8ea7d am: f70b302fa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18126022

Change-Id: I2c37c9f9ceea250740dbc8ce9c22ca028ed876c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 09:10:26 +00:00
TreeHugger Robot
cec1726eae Merge "Fix the flashing list on Opening link page" into tm-dev am: e99683f013 am: 5db41eb95c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087633

Change-Id: Iaca63a888f7aed061afb268b8e89b6c3b64082ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 09:10:20 +00:00
TreeHugger Robot
23dab0bb02 Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev am: cf52a8ea7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18126022

Change-Id: I6dba2fe60e39a3647bc236322a6b1a5b17d4d7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 09:10:11 +00:00
Bonian Chen
030f62f25f Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0 am: f861ceb41f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786

Change-Id: I05ae035ea8708461a5ee92a5e1d352416cb4a059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 09:09:58 +00:00
TreeHugger Robot
f70b302fa4 Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev am: cf52a8ea7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18126022

Change-Id: I7823a1d61468e649e5cff84212cb117cd975c895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 09:09:00 +00:00
TreeHugger Robot
cf52a8ea7d Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev 2022-05-03 08:58:13 +00:00
TreeHugger Robot
c916acb354 Merge "Fix the flashing list on Opening link page" into tm-dev am: e99683f013
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087633

Change-Id: I41d3aa20a651b9609422db2f6a8cb8433450118d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 08:46:01 +00:00
Bonian Chen
99724f3a70 Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786

Change-Id: I5f8425eba72a9aea2810c5c41a8018497182a477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 08:45:54 +00:00
TreeHugger Robot
5db41eb95c Merge "Fix the flashing list on Opening link page" into tm-dev am: e99683f013
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087633

Change-Id: I263fed6c58354340c74968b7a46d818c36d1309c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 08:44:44 +00:00
Bonian Chen
f861ceb41f Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786

Change-Id: I42dbfcdfa635bfe50523384497352882fc27fd55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 08:44:33 +00:00
Betty Chang
4585c29c55 Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 am: b1fa93e7ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886

Change-Id: I92c9a3b60291fb3951d62d4a75581ad5232526a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 08:14:59 +00:00
Betty Chang
c6df4e4c63 Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 am: e076e599b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886

Change-Id: I1d6f0633d64a3ad0ecefa943e59455d3c1a69211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 08:14:55 +00:00
Automerger Merge Worker
f95ffa849c Merge "Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 am: 585552149e" into tm-d1-dev-plus-aosp 2022-05-03 08:14:51 +00:00
Edgar Wang
2063f2a646 Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 am: 585552149e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962

Change-Id: I4430220d278c6bde99701a9ca0addcf4fae8db0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 08:14:48 +00:00
Edgar Wang
21625de764 Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 am: 22f7ab59c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962

Change-Id: Ib0e765d83cde49c35d7f20897ac79e8a9eb717d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 08:14:41 +00:00
TreeHugger Robot
e99683f013 Merge "Fix the flashing list on Opening link page" into tm-dev 2022-05-03 07:59:17 +00:00