TreeHugger Robot
73c4650b74
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad
-s ours am: f32c08af1d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: Id59d43c8c53c63a709e36f992bee85197e9a8ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:38:56 +00:00
Bill Yi
eb50f1a254
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f
-s ours am: ee38ae11ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: Ic7b564875eecc19522472038cefe5b1a8ea08dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:38:45 +00:00
TreeHugger Robot
1ee8289cb3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8
-s ours am: 93a954046f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: I3ac007f97fda9508ad841aecc10f5cf77c8d253a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:35:42 +00:00
Bill Yi
1473685f22
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328
-s ours am: 6944f72f53
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: Ie5377c4e960d84a8496ffc2f4d96f4f2814dada0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:35:26 +00:00
TreeHugger Robot
d903116617
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099395
Change-Id: Ic1f09bfbaf3df7feed03fd2585032e063626c393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:22:45 +00:00
Bill Yi
471a93781b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099395
Change-Id: Idd3d6ecae92bf38cde1fc6a83872a7ec366b73cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:22:27 +00:00
TreeHugger Robot
f32c08af1d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: I0123563e51c4dc282e0aba58fb51d08980f9d40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:18:22 +00:00
Bill Yi
ee38ae11ca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099387
Change-Id: I90d9567d06f163e2e47a6ad7522f86355ecc272c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:18:11 +00:00
TreeHugger Robot
56012b6bb0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310
-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: I93430c476feecdd32599576cefe10738155909b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:17:09 +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
93a954046f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: I637f9d638000e16c1ca16fb15375826069152cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:14:59 +00:00
Bill Yi
6944f72f53
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099388
Change-Id: I7a46b2d7667905a79a7eebbe979167545e40865c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 01:14:35 +00:00
TreeHugger Robot
c5148a79ad
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-05-03 20:49:10 +00:00
TreeHugger Robot
c714da6092
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-03 20:48:33 +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
5cc53736d8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-05-03 20:47:12 +00:00
TreeHugger Robot
c63cd3cce5
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-03 20:45:40 +00:00
TreeHugger Robot
43ba3f6310
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-03 20:45:18 +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
0be85b0811
Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev
2022-05-03 14:13:56 +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
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
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
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
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
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
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
a82a1ff84e
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: I76e5a942e34ed88eb8bccc0651f3faf2d7536922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:31:51 +00:00
Bill Yi
41b6a6c820
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: Id66275160d51b92ccd9285f85143bc699b375a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:00:48 +00:00
Bill Yi
10abd90819
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: Ia097d604caed1a90740d24c5dbe05807242127ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 00:00:46 +00:00
Bill Yi
5568a2692b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6
-s ours am: 223d9c81f2
-s ours am: a509cd4695
-s ours am: 0b07e79cc1
-s ours am: 365338b6d0
-s ours am: ec31d2697d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054676
Change-Id: I1792e2b768d4f82fe0445f19f8507b7b90e10cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 23:29:34 +00:00
Bill Yi
ec8ffc26f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c
-s ours am: f46213941c
-s ours am: 7a2a5bd916
-s ours am: 1df006f84c
-s ours am: 9f888216b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062872
Change-Id: I42861a9403188b0614ebdfd636539fa26674d401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 23:29:29 +00:00
Bill Yi
551016f43b
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: I5cea3e375757e71dc4f940d0e02aaa6425cc8136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 23:29:26 +00:00
Bill Yi
b8d61f99e0
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: I8e84a4ec5b0aa8c75372ac26088a3b4da51dfef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 23:28:29 +00:00
Bill Yi
a8f28ed7c5
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: Ib411051ca0e3f2d2b849688bce481a663a44fadb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:53:37 +00:00
Bill Yi
ec31d2697d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6
-s ours am: 223d9c81f2
-s ours am: a509cd4695
-s ours am: 0b07e79cc1
-s ours am: 365338b6d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054676
Change-Id: Ibab132c360957a95e11a84dd1f7b88cc178a1381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:53:28 +00:00
Bill Yi
9f888216b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c
-s ours am: f46213941c
-s ours am: 7a2a5bd916
-s ours am: 1df006f84c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062872
Change-Id: I0b27088d1c07bfaf369d2da9689e2c10eb3c4eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:53:21 +00:00