TreeHugger Robot
769640c06c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: bdd118dd32
-s ours am: 9817a5b35a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260576
Change-Id: Id6a725399ec50d8acf5832ab7d904bbc5ea0ae1c
2021-04-21 09:17:15 +00:00
Bill Yi
0b6bf303b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7be92bf6a
-s ours am: 710845107d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260572
Change-Id: I435c895b3c0ef5be75e64f33b8d43c32d326fda1
2021-04-21 09:17:06 +00:00
Arc Wang
5c04e61041
Merge "Update progress bar UI" into sc-dev am: 3486b95fd7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235149
Change-Id: I7e3f5582415be347cc7dae0670a2d28bccc8ebf1
2021-04-21 09:16:54 +00:00
TreeHugger Robot
9817a5b35a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: bdd118dd32
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260576
Change-Id: Idd71ee35579a8814b519b3c7ed989e558ad273e6
2021-04-21 09:06:11 +00:00
Bill Yi
710845107d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7be92bf6a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260572
Change-Id: I32fdf960f120f52fdd2b712f5ad4ce9492cbba92
2021-04-21 09:05:23 +00:00
Arc Wang
3486b95fd7
Merge "Update progress bar UI" into sc-dev
2021-04-21 09:01:35 +00:00
Alex Johnston
a2a6b527f9
Merge "RequestManageCredentials dark theme" into sc-dev am: 4a4e2bae61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14011458
Change-Id: I3abd517eb830a52845c8a8b90340d66808b84db1
2021-04-21 08:53:08 +00:00
Alex Johnston
4a4e2bae61
Merge "RequestManageCredentials dark theme" into sc-dev
2021-04-21 08:45:06 +00:00
TreeHugger Robot
6254afcdcb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 73a806fa37
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14261574
Change-Id: Iabb16f1d2b1f500b1e9cb9ec5762dc74701e245d
2021-04-21 08:40:03 +00:00
TreeHugger Robot
14d3bd735d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6d25cfcc3b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14261566
Change-Id: Ieac51b38a4b75a56db93dc53b05187eff759f156
2021-04-21 08:39:59 +00:00
TreeHugger Robot
59620d9824
Merge "[Provider Model] Carrie Wi-Fi offload toggle request (panel)" into sc-dev am: b8f0a8e2dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251407
Change-Id: Icfc08e43fbea0b4b8fe483f7f19f22ea78872752
2021-04-21 08:39:48 +00:00
TreeHugger Robot
573b99328d
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-21 08:39:44 +00:00
TreeHugger Robot
2213fafc13
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-21 08:39:25 +00:00
TreeHugger Robot
d42ace8ba2
Merge "[Provider Model] Carrie Wi-Fi offload toggle request" into sc-dev am: d4a4fead67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14236566
Change-Id: I369883434d2f25d0e253fcee30c63cf2c036512d
2021-04-21 08:39:13 +00:00
TreeHugger Robot
bdd118dd32
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-21 08:35:24 +00:00
TreeHugger Robot
73a806fa37
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-21 08:25:07 +00:00
TreeHugger Robot
6d25cfcc3b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-21 08:25:04 +00:00
TreeHugger Robot
b8f0a8e2dc
Merge "[Provider Model] Carrie Wi-Fi offload toggle request (panel)" into sc-dev
2021-04-21 08:19:23 +00:00
TreeHugger Robot
d4a4fead67
Merge "[Provider Model] Carrie Wi-Fi offload toggle request" into sc-dev
2021-04-21 08:19:13 +00:00
Bill Yi
1d413d8390
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic67b0bfa2e86c32e2084d36459916aae031f97ed
2021-04-21 07:25:12 +00:00
Bill Yi
b4dc53eca4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9dd3eea4d1ff8b8a01faa9e0fd423d1396bdc81b
2021-04-21 07:21:17 +00:00
Bill Yi
18bbddbc72
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I179f0d31dcca4db83624ecd31c0d88fc24a93559
2021-04-21 07:17:44 +00:00
Bill Yi
85e0230606
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibe0aedbb3e96ae2445984c1d8a5bea20e05ef218
2021-04-21 07:16:02 +00:00
Bill Yi
ca4797df06
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia3bcf08024545d44f87ac3208f6c2d5ff7a1d8fc
2021-04-21 07:06:47 +00:00
YUKAI HUNG
f690772a45
Merge "Add data validator to verify and log abnormal queried history data" into sc-dev am: 2f4ae2a0e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14251247
Change-Id: Ide34ed96bbcf818195c22824d3929fb2cad403e9
2021-04-21 07:05:51 +00:00
Bill Yi
c7be92bf6a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id494d2571fc237ef47af58f96be1ef9e9025dc5e
2021-04-21 07:03:23 +00:00
YUKAI HUNG
2f4ae2a0e4
Merge "Add data validator to verify and log abnormal queried history data" into sc-dev
2021-04-21 06:45:57 +00:00
Menghan Li
e09ee20829
Merge "[Material Next] Update main feature switch for Caption preferences." into sc-dev am: d3cc241c42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255410
Change-Id: I38f91dac5b3f6fbb41513aec61f93aa7ac3e2e80
2021-04-21 06:03:27 +00:00
Menghan Li
d3cc241c42
Merge "[Material Next] Update main feature switch for Caption preferences." into sc-dev
2021-04-21 05:46:20 +00:00
menghanli
b4558c9607
[Material Next] Update main feature switch for Caption preferences.
...
Fix: 185950803
Test: manual test
Change-Id: I5431461f3088652ddff7400b24b3eea25ddf5f9a
2021-04-21 11:39:56 +08:00
Jeremy Goldman
420481d844
Merge "Remove the "+" button on the help menu if no secure vpns can be created" into sc-dev am: 2fcb8531ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233625
Change-Id: I9e8e94190c152022be1212649cde269d0343142a
2021-04-21 03:05:01 +00:00
Jason Hsu
9f7549172e
Merge "Fix accessibility settings page did not update the preference state" into sc-dev am: e8063609eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029862
Change-Id: Ide502e3d52249f7af468814420e5e20c6b6f488e
2021-04-21 03:04:31 +00:00
Jeremy Goldman
2fcb8531ab
Merge "Remove the "+" button on the help menu if no secure vpns can be created" into sc-dev
2021-04-21 03:01:39 +00:00
ykhung
70bef1049f
Add data validator to verify and log abnormal queried history data
...
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I331922cf0b0e946066a72eb0bfcf9885dde9a7ce
2021-04-21 02:52:20 +00:00
Jason Hsu
e8063609eb
Merge "Fix accessibility settings page did not update the preference state" into sc-dev
2021-04-21 02:29:23 +00:00
Mady Mellor
303c4c8bc3
Merge "Change bubble settings to use Secure rather than Global" into sc-dev am: 2affde3202
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13474542
Change-Id: I28c394b68327bdf03be3e94bf963e7149d0477ad
2021-04-20 23:09:55 +00:00
Mady Mellor
2affde3202
Merge "Change bubble settings to use Secure rather than Global" into sc-dev
2021-04-20 23:06:40 +00:00
TreeHugger Robot
c46eb4a4e9
Merge "Fix search index for a financed device" into sc-dev am: db3767e7b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14163911
Change-Id: I2238367cb0e06257c2bc57710004317ccf79e16e
2021-04-20 21:38:47 +00:00
TreeHugger Robot
db3767e7b3
Merge "Fix search index for a financed device" into sc-dev
2021-04-20 21:06:45 +00:00
TreeHugger Robot
06c6db773d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33583e7990
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14252815
Change-Id: I4a8b3fc82f06fb879d12897bf6304960da4c7dd1
2021-04-20 20:26:41 +00:00
TreeHugger Robot
a8317b3003
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f988d7688b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14253505
Change-Id: I75b389b072bc46a8bb0c477995c1f6b8e1f17d23
2021-04-20 20:25:11 +00:00
TreeHugger Robot
2086763cc4
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-20 20:16:11 +00:00
TreeHugger Robot
33583e7990
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-20 20:04:02 +00:00
TreeHugger Robot
d99fc49551
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-20 19:54:06 +00:00
TreeHugger Robot
f988d7688b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-20 19:46:16 +00:00
Salud Lemus
9068481299
Fix search index for a financed device
...
Now with two preference controllers, one for enterprise device and one
for financed device, the search index issue (querying "Financed device
info" in Settings does not show a search result) is fixed. The financed
preference controller is used when the device is a financed device.
Otherwise, the enterprise preference controller is used.
Bug: 183551684
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacyPreferenceControllerTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=FinancedPrivacyPreferenceControllerTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacyPreferenceControllerHelperTest
Change-Id: I051144ec9004f86456285078ebb1c72266f80a55
2021-04-20 12:17:39 -07:00
Bill Yi
1d6b60889e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f73237f7a7fcef3389c3afebadcafdb0be4d60c
2021-04-20 18:42:47 +00:00
Bill Yi
d086ba103f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie0992b4d1bdd52c7ba17f56bd231eb49786a44c2
2021-04-20 18:38:43 +00:00
Bill Yi
bf0d0fe30e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I02e17fc7d05452a591f4df992135821a4d8524cc
2021-04-20 18:35:03 +00:00
Bill Yi
807cbea464
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I33b5a68e3f3988de42436daffaecbab0a041be0c
2021-04-20 18:33:22 +00:00