Bonian Chen
e977eb8100
Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 am: d4440db4bf am: 54d8d163c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902
Change-Id: Ie8045ad3b03c7dd31697513bc03f2a105c6322d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 14:06:12 +00:00
Bonian Chen
6e0eca36fa
Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e am: 35913be5b4 am: 9e5ec54ab8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662
Change-Id: I50e3b7b26d6624b8af3f4cd69535bbb32fe47f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 14:06:05 +00:00
Bonian Chen
854a251602
Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 am: 260871d57f am: 5e1c22ad19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902
Change-Id: I0403ba03221ea83c6e63a6fe455b0473f2252d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 14:04:52 +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
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
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
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
e1f3c5b883
Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev am: cf52a8ea7d am: 23dab0bb02 am: 17adac466d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18126022
Change-Id: Ice5e03cffbb79cf45d6b016fb4a392fad290f6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 09:25:38 +00:00
TreeHugger Robot
5354c95b18
Merge "Fix the flashing list on Opening link page" into tm-dev am: e99683f013 am: c916acb354 am: 790d9b3ff6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087633
Change-Id: I37cc1f15e29b3e0a9fed95d7edbd779c133760d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 09:25:31 +00:00
Bonian Chen
14a571d743
Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0 am: 99724f3a70 am: deefe93992
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786
Change-Id: Id4aaa0fbbe533e4ce42ca3ecc803bc75afb293b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 09:25:25 +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
03121e1ee0
Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev am: cf52a8ea7d am: f70b302fa4 am: 9586e56f1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18126022
Change-Id: Ic664ff2498db1dc858f45316f6fc2c4a0dc44a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 09:17:54 +00:00
TreeHugger Robot
5b17fe9709
Merge "Fix the flashing list on Opening link page" into tm-dev am: e99683f013 am: 5db41eb95c am: cec1726eae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087633
Change-Id: I05d064151b42362eb3accd26fcff7d6d4170e1b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 09:17:48 +00:00
Bonian Chen
3adc2acf70
Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0 am: f861ceb41f am: 030f62f25f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786
Change-Id: Idc829e60734e53e7a8f93f68443fa9e960f7c258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 09:17:33 +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
Betty Chang
e5ab7c6d28
Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 am: b1fa93e7ef am: 4585c29c55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886
Change-Id: I13986772ddf3445b470fc659e9d11bffec5eb8c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 09:09:21 +00:00
Betty Chang
105d875367
Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 am: e076e599b5 am: c6df4e4c63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886
Change-Id: Ib2df72e8ef2b7cd4bc35b16f8da1d64efcc04906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 09:09:14 +00:00
Automerger Merge Worker
070221bb39
Merge "Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 am: 585552149e" into tm-d1-dev-plus-aosp am: f95ffa849c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962
Change-Id: I63b1ca132cb833f49cc80657528f2ba34cb9b5b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 09:09:01 +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
Edgar Wang
f711771cdb
Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 am: 22f7ab59c0 am: 21625de764
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962
Change-Id: Ia77e9f8730d2f11c48ed62287a584ae23bab336b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 09:08:43 +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
15d1a490a4
Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be am: 70e4a209c8 am: 4942694f50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584
Change-Id: Ib4bf0b6e2f10428b9ab831c37d2e738752abd669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 08:57:54 +00:00
YK Hung
89fc432521
Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca am: fc95a8f973 am: 6ff7a106b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883
Change-Id: If52afa9fb982f716c7b500525af874008d2d5da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 08:57:34 +00:00
Bill Yi
ac9a918825
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 2p: 737ee1e1a7 am: fa29c0c3bc -s ours am: f7c06375b1 -s ours am: 61ba40c852 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Change-Id: I336b65e817657758d81f616a052c1f275f3f57a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 08:56:54 +00:00
Amy Hsu
0797510276
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: 19b9978591 am: d99149b0b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983872
Change-Id: I2f17ed3429db499bc5868a569be7fd6a14292d6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 08:54:38 +00:00
Prabal Singh
d1dc631f0e
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e am: 89e0eda197 am: 158164e219
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: I1032cac0698bd647baa40d13afd8c558f36a7971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 08:49:02 +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
Bonian Chen
337cfe6fc0
Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev
2022-05-03 07:54:30 +00:00
Betty Chang
b1fa93e7ef
Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886
Change-Id: Ifde61888817130fd5902812a1230ba07f732c670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 07:34:14 +00:00
Edgar Wang
22f7ab59c0
Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962
Change-Id: I21dc53385d41f1bfc5db2e11535b11902434d3e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 07:34:07 +00:00
Bonian Chen
eff476375c
[Settings] Fix missing part for refactor
...
There're 2 missing parts in previous code refactor:
1. The API change for exiting ECM mode dialog
2. The support of onActivityResult() for PreferenceController
Bug: 226494641
Test: local
Change-Id: I0c2c313a53fbc1b7435f295f190b70653e2f6758
2022-05-03 07:33:48 +00:00
Betty Chang
e076e599b5
Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886
Change-Id: I87abeb4a2d67f78a1cc9313a0c82b5f3cd4e82f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 07:33:00 +00:00