Bill Yi
|
72651dd7a2
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours am: 75cce69c9a -s ours am: d953313d3f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17208661
Change-Id: I23bcad8c2fb359bf76eef121f58b3a8bef2e737a
|
2022-03-18 03:00:22 +00:00 |
|
Bill Yi
|
817e1e934b
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c0abe010c1 -s ours am: c248a78d60 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207460
Change-Id: I2f96ec302df3528d097048df1ed1e8fcaa046e9c
|
2022-03-18 03:00:21 +00:00 |
|
Bill Yi
|
697597bbdb
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e4e39cee -s ours am: c0e6019a32 -s ours am: da9e66fe71 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17208661
Change-Id: Idcc28755f8a4c7ed207f16b0b1e0a90af2765c0b
|
2022-03-18 03:00:20 +00:00 |
|
Bill Yi
|
7371120da9
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e46d423191 -s ours am: 39de788383 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207460
Change-Id: Id18f209f0d346202c42331ae2f6fbcb97dea340b
|
2022-03-18 03:00:19 +00:00 |
|
Bill Yi
|
0893355b82
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c0abe010c1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207460
Change-Id: If65a9f9615a8e60877f279d5a105f0eefab9f6b9
|
2022-03-18 02:59:59 +00:00 |
|
Bill Yi
|
92e83d7e76
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e46d423191 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207460
Change-Id: Id5579806c3b9ef8817f145892bbca7a8906e8c95
|
2022-03-18 02:59:58 +00:00 |
|
Bill Yi
|
ec0f48658c
|
Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp am: 9b874759b1 am: 65bd2f419f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207704
Change-Id: Ib7af429a05de931bd79cf8c66b702db4c4e19947
|
2022-03-18 02:59:45 +00:00 |
|
Bill Yi
|
c2c8dd5df2
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b am: ae75e97012 -s ours am: 6adefff78e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207704
Change-Id: Ia1405f0de1cb12e5741ab0b6229e90b9ecfd88d6
|
2022-03-18 02:59:44 +00:00 |
|
Bill Yi
|
d953313d3f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours am: 75cce69c9a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17208661
Change-Id: I2d6008490cfe535514ef6d03d914a90024a63b53
|
2022-03-18 02:51:39 +00:00 |
|
Bill Yi
|
da9e66fe71
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e4e39cee -s ours am: c0e6019a32 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17208661
Change-Id: I4ded1f78ef71c9f174a50952ba99296b3ce0c851
|
2022-03-18 02:51:37 +00:00 |
|
Bill Yi
|
65bd2f419f
|
Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp am: 9b874759b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207704
Change-Id: I9b5ba470dc8e40ddd7b7bbe5e0642565962edf5a
|
2022-03-18 02:51:29 +00:00 |
|
Bill Yi
|
6adefff78e
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b am: ae75e97012 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207704
Change-Id: Ia844d632034948b5cc99ee21caaab7d9fe4ebccc
|
2022-03-18 02:51:27 +00:00 |
|
Bill Yi
|
75cce69c9a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17208661
Change-Id: I02a68c6262293bdcf21ec90dc7a96ac187041479
|
2022-03-18 02:50:07 +00:00 |
|
Bill Yi
|
c0e6019a32
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e4e39cee -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17208661
Change-Id: I61450277f98ace1bd9e3a9bb06244d18c0f627a8
|
2022-03-18 02:49:54 +00:00 |
|
Bill Yi
|
298650d578
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 18cb77b66a -s ours am: 78abbdb6e4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17201011
Change-Id: I39ad518cab69d6f0fb1d2f24cec5b319f4264dfc
|
2022-03-18 02:44:34 +00:00 |
|
Bill Yi
|
e786c64db4
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9a68c077f -s ours am: 572d0be27b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17201011
Change-Id: Ia57c9ca2bacd69b8280bdf75e6b5cfe32720fdeb
|
2022-03-18 02:44:32 +00:00 |
|
Bill Yi
|
feefbaaec9
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0980b77d42 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17208154
Change-Id: Idc9008e8b93aca4ac7f5788adfb3efe7a7add812
|
2022-03-18 02:44:09 +00:00 |
|
Bill Yi
|
78abbdb6e4
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 18cb77b66a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17201011
Change-Id: Ia3756535e8433e4f0826f4b5f8b61abf778cc495
|
2022-03-18 02:44:06 +00:00 |
|
Bill Yi
|
572d0be27b
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9a68c077f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17201011
Change-Id: I26049202d9fc95dfb5aec181debd9bf690972a2d
|
2022-03-18 02:44:00 +00:00 |
|
Bill Yi
|
c353618b2e
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1575c5762c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17208154
Change-Id: Iddee08f13235485231e96c4331c080f44e3a1d89
|
2022-03-18 02:43:53 +00:00 |
|
Bill Yi
|
e3385a5bc8
|
Merge changes from topic "presubmit-am-186dac0b6d4f44a59e4bc743cd0fd9b4" into tm-dev am: 2d8cc15ec7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17206624
Change-Id: Ia84f0a481eec762aa0342dbb49ae0df604b58267
|
2022-03-18 02:43:29 +00:00 |
|
Bill Yi
|
ee1c029095
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 50710ebebc am: 33db44bfe7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17206624
Change-Id: I758a1030f9798dbaecbc17a00633ec264a7cabc9
|
2022-03-18 02:43:27 +00:00 |
|
Bill Yi
|
c248a78d60
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c0abe010c1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207460
Change-Id: Ibeb1504a463f242b1e36a1f337cb77711dec4a23
|
2022-03-18 02:41:45 +00:00 |
|
Bill Yi
|
39de788383
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e46d423191 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207460
Change-Id: I45301965843deafdf9ae3e7cbc3b51bd7504d117
|
2022-03-18 02:41:44 +00:00 |
|
Bill Yi
|
18cb77b66a
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
|
2022-03-18 02:25:45 +00:00 |
|
Bill Yi
|
c0c5c066f4
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
|
2022-03-18 02:25:29 +00:00 |
|
Bill Yi
|
e9439fc897
|
Merge "Import translations. DO NOT MERGE ANYWHERE"
|
2022-03-18 02:24:33 +00:00 |
|
Bill Yi
|
9b874759b1
|
Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b
Import translations. DO NOT MERGE ANYWHERE
|
2022-03-18 02:24:27 +00:00 |
|
Bill Yi
|
0980b77d42
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
|
2022-03-18 02:22:50 +00:00 |
|
Bill Yi
|
2d8cc15ec7
|
Merge changes from topic "presubmit-am-186dac0b6d4f44a59e4bc743cd0fd9b4" into tm-dev
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 50710ebebc
Import translations. DO NOT MERGE ANYWHERE
|
2022-03-18 02:22:40 +00:00 |
|
Bill Yi
|
c0abe010c1
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
|
2022-03-18 02:22:19 +00:00 |
|
Kate Montgomery
|
144c51ed76
|
Merge "Fix settings page flicker in two ways: 1. On create use UiBlocker as recommended by settings team 2. On resume only update the preferences list if the system setting has changed." into tm-dev am: 798a0fab9c am: d9e8d4e5cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17219772
Change-Id: If65c92039c15d3bbe8153baffe7f324a1394758d
|
2022-03-17 20:05:55 +00:00 |
|
Kate Montgomery
|
2d570febb1
|
Merge "Fix settings page flicker in two ways: 1. On create use UiBlocker as recommended by settings team 2. On resume only update the preferences list if the system setting has changed." into tm-dev am: 798a0fab9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17219772
Change-Id: Ib17152dbc29a9cc0588607966da310e53cdba4bb
|
2022-03-17 19:46:34 +00:00 |
|
Kate Montgomery
|
d9e8d4e5cd
|
Merge "Fix settings page flicker in two ways: 1. On create use UiBlocker as recommended by settings team 2. On resume only update the preferences list if the system setting has changed." into tm-dev am: 798a0fab9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17219772
Change-Id: I5e19c1ec324bb099b0a5d966cb2fd934393c28e7
|
2022-03-17 19:45:15 +00:00 |
|
Kate Montgomery
|
798a0fab9c
|
Merge "Fix settings page flicker in two ways: 1. On create use UiBlocker as recommended by settings team 2. On resume only update the preferences list if the system setting has changed." into tm-dev
|
2022-03-17 19:14:04 +00:00 |
|
kholoud mohamed
|
de78149c16
|
RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I4775d7741c7819fd811c3fc4eda1636b1e04b398
|
2022-03-17 17:37:45 +00:00 |
|
Yuri Lin
|
d5f6bde3f2
|
Merge "Remove preference category in zen mode alarms page" into tm-dev am: cbc67a41a0 am: a7fcd55623
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17224572
Change-Id: I8aa73de194835983d45408f8ecacde916284430f
|
2022-03-17 16:31:21 +00:00 |
|
Yuri Lin
|
a7fcd55623
|
Merge "Remove preference category in zen mode alarms page" into tm-dev am: cbc67a41a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17224572
Change-Id: Ia83c5204d6a42f472f480cb71c06a44e1e4c9cd4
|
2022-03-17 15:58:56 +00:00 |
|
Yuri Lin
|
d9414ee1b5
|
Merge "Remove preference category in zen mode alarms page" into tm-dev am: cbc67a41a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17224572
Change-Id: I6b0aa6c6fea35265104906401ce4a8e638be60be
|
2022-03-17 15:57:19 +00:00 |
|
Yuri Lin
|
cbc67a41a0
|
Merge "Remove preference category in zen mode alarms page" into tm-dev
|
2022-03-17 15:17:31 +00:00 |
|
Giulio Fiscella
|
9112567332
|
Use new severity levels and builders
Test: atest SettingsUnitTests
Bug: 218817241
Bug: 220367542
Change-Id: I9fa4b22e0ca1ca63e75eab427a7beedd95b744da
Merged-In: I9fa4b22e0ca1ca63e75eab427a7beedd95b744da
|
2022-03-17 11:44:39 +00:00 |
|
Giulio Fiscella
|
8861c5d16c
|
[automerge] Use new severity levels and builders 2p: 3612e9e440
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17238283
Bug: 218817241
Bug: 220367542
Change-Id: I75a2c08dc05fcf6788d034c3981164cfe23a20d8
|
2022-03-17 11:34:56 +00:00 |
|
Giulio Fiscella
|
3612e9e440
|
Use new severity levels and builders
Test: atest SettingsUnitTests
Bug: 218817241
Bug: 220367542
Change-Id: I9fa4b22e0ca1ca63e75eab427a7beedd95b744da
|
2022-03-17 11:34:42 +00:00 |
|
Oli Lan
|
ede86dbb21
|
Merge "Reduce gap above user list in multiuser settings." into tm-dev am: 8b096f0400 am: 3c322441b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17221043
Change-Id: I7ae4846475bd18b505e8b38c81f55475b78a8d5d
|
2022-03-17 11:00:26 +00:00 |
|
Oli Lan
|
3c322441b0
|
Merge "Reduce gap above user list in multiuser settings." into tm-dev am: 8b096f0400
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17221043
Change-Id: I5b565e13df90d73cec0b4d70159502da8c75fff4
|
2022-03-17 10:26:55 +00:00 |
|
Oli Lan
|
0a930a6ae7
|
Merge "Reduce gap above user list in multiuser settings." into tm-dev am: 8b096f0400
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17221043
Change-Id: I6862bc73e008def7eeabca63681b7cfd2df72c41
|
2022-03-17 10:26:52 +00:00 |
|
Oli Lan
|
8b096f0400
|
Merge "Reduce gap above user list in multiuser settings." into tm-dev
|
2022-03-17 09:58:09 +00:00 |
|
Tsung-Mao Fang
|
c2e5d84257
|
Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef am: 7052d53fd8 am: 469e484b37 am: 5451480da8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572
Change-Id: I94fc1c73d7c80e66f09e798dc167ecc0ed71d09d
|
2022-03-17 09:55:48 +00:00 |
|
Jason Hsu
|
886e25a183
|
Merge "Add the string for new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode." into tm-dev am: f8f1ff2594 am: 0534243168
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17217203
Change-Id: I557316d7a074d7157d8726dc7b2500196d13de98
|
2022-03-17 09:55:29 +00:00 |
|
Tsung-Mao Fang
|
a3e7f3dbac
|
Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef am: 7052d53fd8 am: 469e484b37
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572
Change-Id: I07a98c4f687a5d3623a82edddbcf854b517cdeb7
|
2022-03-17 09:23:10 +00:00 |
|