Automerger Merge Worker
|
7e2bf6724a
|
Merge "Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: f9be4c5a5c" into tm-d1-dev-plus-aosp
|
2022-04-28 12:10:27 +00:00 |
|
Bonian Chen
|
aba0d1654d
|
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: f9be4c5a5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: Ib66781f14b6ce6652bac2471399b621255f3524c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 12:10:24 +00:00 |
|
Bonian Chen
|
ae297c8f19
|
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 69aa69a45d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: Ia1fdd76b65c635d05f3bd74ab4d1ce687794cbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 12:10:23 +00:00 |
|
Bonian Chen
|
cb72c82a18
|
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 69aa69a45d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: Ibf8b08764cba09c5d72130fd4ecad37960ea2062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 12:10:11 +00:00 |
|
Bonian Chen
|
69aa69a45d
|
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: If187192b7619e4b0dea0b565fbc124651b235466
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 11:42:57 +00:00 |
|
Bonian Chen
|
f9be4c5a5c
|
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: I5f9c37b458f185ac261f182ae290950c2d2fe856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 11:41:24 +00:00 |
|
Bonian Chen
|
783314ae4f
|
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev
|
2022-04-28 11:05:42 +00:00 |
|
PETER LIANG
|
e21e69fb62
|
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: 17ddbadb74 am: 4496dd6520
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: I1473ee54ad3acf428380647bd036a450d13527d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 09:16:14 +00:00 |
|
PETER LIANG
|
0b2b945830
|
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: acdb3b8a60 am: ec94752f9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: I6d4bb8196e547c8dc1b42313a6fbc72d2c90f421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 09:15:55 +00:00 |
|
PETER LIANG
|
75e30769c1
|
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: 17ddbadb74 am: 0109d6100e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: Ib3397522957ead248821ca1d362b0a59de73053c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 09:15:15 +00:00 |
|
PETER LIANG
|
4496dd6520
|
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: 17ddbadb74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: Ie5968648a599aaf4bfd45d2d3e8d34e66a9c30af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 08:42:30 +00:00 |
|
PETER LIANG
|
ec94752f9d
|
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: acdb3b8a60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: Ibd5b4a67660b826c0928b37bc9e6c3cd54ca9e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 08:42:08 +00:00 |
|
PETER LIANG
|
0109d6100e
|
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: 17ddbadb74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: If9b7ad6fcce1288eb5c39d1d6150df0e52a3696e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 08:40:23 +00:00 |
|
Calvin Pan
|
049aa73cb1
|
Add unit test for AppLocalePickerActivity
Bug: 223503670
Test: atest
Change-Id: I0e92be43d661dd3bff19c3274d1572ef1f4e9c46
|
2022-04-28 08:15:34 +00:00 |
|
PETER LIANG
|
17ddbadb74
|
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: I900480866ed1fb85fb7629223f37538c46ff11b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 07:53:30 +00:00 |
|
PETER LIANG
|
acdb3b8a60
|
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: Ic8db083e3d479c6f85615c36113fa747ce10c62d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 07:51:22 +00:00 |
|
Amy Hsu
|
f1dfa76dba
|
[ScreenResolutionController] UI string update
Bug: b/230626771
Test: Check the string manually
Change-Id: Ibe8cde0ef743ef398edbc438ead130215f7294d0
|
2022-04-28 07:40:44 +00:00 |
|
PETER LIANG
|
27aa5f9d94
|
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev
|
2022-04-28 06:45:11 +00:00 |
|
Kweku Adams
|
1250d57309
|
Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 664e3805a7 am: 8ebc71d701
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: Ib4333f6e9897ce7236f8f0a7b82c4ca24afeb8b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 05:26:23 +00:00 |
|
Stanley Wang
|
3127b05280
|
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: f781d8a02a am: 979ee5f856
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: I15d8402098df434e6288a5c524a283bbc9bef721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 05:25:55 +00:00 |
|
Kweku Adams
|
88c367dbf2
|
Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 4c5cbeb882 am: 59e93d5225
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: I985ca208ff9bc0bd8a79d18c657ba89bd491447c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 05:25:30 +00:00 |
|
Kweku Adams
|
ac66727cde
|
Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 4c5cbeb882 am: 5262325601
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: I7db9edd6bd997cbc09a2c48379b9c35772a6ffe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 05:21:12 +00:00 |
|
Stanley Wang
|
908868a215
|
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: 5e5ea25a2b am: 6ef0f6fed7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: I0c41b28889092f11052bf225e08db7694ca5a5b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 05:20:50 +00:00 |
|
Xinyi Zhou
|
844be62f38
|
Delete Fast Pair Settings am: 3438e20da1 am: 14c317a689 am: 425316caae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: I11a6ec0bf450d63d5552d6d81022febb425b602c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 05:19:50 +00:00 |
|
Kweku Adams
|
8ebc71d701
|
Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 664e3805a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: I513d7a13d671c8dc49e94ef38e4b4feb14a6c9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 05:19:40 +00:00 |
|
Stanley Wang
|
979ee5f856
|
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: f781d8a02a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: I5518011aaec7763b7d71461d722993d026a91713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 05:19:24 +00:00 |
|
Stanley Wang
|
bd50a87911
|
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: 5e5ea25a2b am: 602b1f3d9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: I2b9c479450475ce46386ed21edfa415eff272430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 05:19:20 +00:00 |
|
Xinyi Zhou
|
64e9591e7f
|
Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab am: d318a79c25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: Ied49b0072aff4f138e8c5c88350349c1c9824afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 05:18:20 +00:00 |
|
Xinyi Zhou
|
815bbd8c1b
|
Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab am: 4be70892e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: Ie978c707ae47ff97af937bcc114c5a362044aa8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 05:17:58 +00:00 |
|
Kweku Adams
|
664e3805a7
|
Merge "Make final factors configurable." into tm-dev am: 3663986909
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: I9705e9019fb5a2ef096e1c7a8a8bb6a29bbba0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 03:36:35 +00:00 |
|
Stanley Wang
|
f781d8a02a
|
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: I72be188119ae313ba3908dd9c10c1e5e99ce7ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 03:36:04 +00:00 |
|
Kweku Adams
|
59e93d5225
|
Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 4c5cbeb882
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: Ie840b13d8f234eb83978124781a4ff3796579da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 03:31:56 +00:00 |
|
Kweku Adams
|
5262325601
|
Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 4c5cbeb882
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: I20dad61683ad461bf3c16e15e3a49a54822cc7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 03:30:50 +00:00 |
|
Stanley Wang
|
6ef0f6fed7
|
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: 5e5ea25a2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: Id58665699afa3a9382bd71a3720650cca9c55537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 03:30:22 +00:00 |
|
Xinyi Zhou
|
425316caae
|
Delete Fast Pair Settings am: 3438e20da1 am: 14c317a689
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: Id001dbcfca557ec12118f3d9fd3d513fb1f5eb1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 03:30:18 +00:00 |
|
Stanley Wang
|
602b1f3d9d
|
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: 5e5ea25a2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: Ia927700b1a9e593e6b04e10338fedfb9ce188bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 03:29:14 +00:00 |
|
Xinyi Zhou
|
d318a79c25
|
Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: I20ade5a70e7c36297c969cb4cc6725c74cd14882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 03:27:59 +00:00 |
|
Xinyi Zhou
|
4be70892e9
|
Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: I44ecf5ea109b9a002a178f42d609a7fbf7bfcf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 03:27:55 +00:00 |
|
Kweku Adams
|
4c5cbeb882
|
Merge "Make final factors configurable." into tm-dev am: 3663986909
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: I1b843304bb15bb3b719dbf906a4b96c29b58264c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 03:02:23 +00:00 |
|
Stanley Wang
|
5e5ea25a2b
|
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: Iff5be7799232d27c83d1a826d94c559c4d117ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 03:01:48 +00:00 |
|
Kweku Adams
|
3663986909
|
Merge "Make final factors configurable." into tm-dev
|
2022-04-28 02:59:29 +00:00 |
|
Stanley Wang
|
0e861f0993
|
Merge "Fixe the problem of invalid switch preference." into tm-dev
|
2022-04-28 02:59:20 +00:00 |
|
Xinyi Zhou
|
e2db47e9ab
|
Delete Fast Pair Settings am: 3438e20da1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: I76dc3c719352bfd0441a03adef1407b147cee9df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 02:54:55 +00:00 |
|
Xinyi Zhou
|
14c317a689
|
Delete Fast Pair Settings am: 3438e20da1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: Iefb16d41b1901b275f4a5019e78326de8d2e917d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-28 02:53:51 +00:00 |
|
Xinyi Zhou
|
3438e20da1
|
Delete Fast Pair Settings
Fast Pair will not be launched in T.
Test: -m
Fix: 228614515
Fix: 229356812
Change-Id: I173453e84f0d1b525ea4796ed875f53f30c20d96
|
2022-04-27 12:29:59 -07:00 |
|
Bonian Chen
|
aaf90b2592
|
Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90 am: 313284a9ae am: 6ed05ee86f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304
Change-Id: I992cb714a5ba7ecd7773cf1d385d7a5abf89e67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 18:05:11 +00:00 |
|
Automerger Merge Worker
|
1b777b7d8b
|
Merge "Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873 am: b16261a8e1" into tm-d1-dev-plus-aosp am: 2e0303ef25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009
Change-Id: Ibd7cf0196893c998b042bff3873ea604e5c4e5a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 18:05:05 +00:00 |
|
Bonian Chen
|
e09189620d
|
Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90 am: 935706425d am: 3a21d96f32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304
Change-Id: I1ffbe2b734e365ffb4197f9485c36f233f3df708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 18:04:56 +00:00 |
|
Bonian Chen
|
6fdeff527b
|
Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e am: dbbab09d11 am: a9026bb486
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673
Change-Id: I66ae3de52ec0e2cd415d299691f259c45f704ae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 18:04:49 +00:00 |
|
Yuri Lin
|
9bc2aff5d7
|
Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873 am: 0e7619f290 am: 16a5535dd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009
Change-Id: I6c091ce85dca6810db25cb5a3a51aeeefbf70c1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-04-27 18:04:35 +00:00 |
|