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
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
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
Edgar Wang
585552149e
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: I273f03d6a2221dd937f382b1cd8a2aec7fcaa0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 07:32:43 +00:00
Betty Chang
5dea2176a2
Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev
2022-05-03 07:21:11 +00:00
Edgar Wang
37ad451324
Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev
2022-05-03 07:14:24 +00:00
Weng Su
e37a553e94
Show restricted message in Wi-Fi hotspot settings
...
- Remove Wi-Fi hotspot preferences in settings search if Wi-Fi hotspot is disallowed
- See the result screenshot in b/203168953#comment12
Bug: 203168953
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest
Change-Id: Id4416fd0659b596e4e6f31890a139198219f4552
2022-05-03 13:58:54 +08:00
changbetty
f31b5769d7
[LE] Launch the dialog for the user to broadcast or find broadcast
...
- Launch the broadcast dialog from entry point in Media Volume Slice
- Fix the broadcast dialog to follow the dialog style
- Start broadcast and launch the MediaOutputBroadcastDialog from
broadcast dialog
Bug: 229577518
Test: manual test
Change-Id: I1329b3f35b03afc441142494df883ae17f373656
2022-05-03 03:16:08 +00:00
Bill Yi
23be7b9db3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours am: a8f28ed7c5
-s ours am: 551016f43b
-s ours am: 41b6a6c820
-s ours am: a82a1ff84e
-s ours am: 44a2ff89cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: If7e2ae9d51d2f6db6b24b00c7ceeb592dbb423ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 02:23:25 +00:00
Bill Yi
b47701d110
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours am: a8f28ed7c5
-s ours am: 551016f43b
-s ours am: 41b6a6c820
-s ours am: a82a1ff84e
-s ours am: 2e250b15ae
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: I7418afc8372393f6d9011f4ad36b7ca4b6cd5c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 02:23:11 +00:00
Bill Yi
3ad5a7ee3f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours am: a8f28ed7c5
-s ours am: b8d61f99e0
-s ours am: 10abd90819
-s ours am: 4cef0633cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: Ia7809414739e615243ee8d084153167475d8bb11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 02:22:49 +00:00
Bill Yi
179a379817
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours am: a8f28ed7c5
-s ours am: b8d61f99e0
-s ours am: 10abd90819
-s ours am: 75bc75a29f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: I2be1d78a47e7a111126e6ff1465b2ef480867a7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 02:22:30 +00:00
Bill Yi
2e250b15ae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours am: a8f28ed7c5
-s ours am: 551016f43b
-s ours am: 41b6a6c820
-s ours am: a82a1ff84e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: Ic3383b1b6dd4f16681cce223ee65c2fe803d7c68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:33:43 +00:00
Bill Yi
4cef0633cc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours am: a8f28ed7c5
-s ours am: b8d61f99e0
-s ours am: 10abd90819
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: I83ae602441499355b7e2f4983d04edd5ef1b5090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:33:26 +00:00
Bill Yi
44a2ff89cf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours am: a8f28ed7c5
-s ours am: 551016f43b
-s ours am: 41b6a6c820
-s ours am: a82a1ff84e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: Iec8b3cf4d0eb95ec49cca213dd8b79d615f7c613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:32:30 +00:00