Commit Graph

81606 Commits

Author SHA1 Message Date
TreeHugger Robot
e93c8524ae [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: I3dbd96a9a6f84fed5ea033197ce97fbd807274bf
2021-04-21 08:40:21 +00:00
TreeHugger Robot
30096f6235 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: I7f808313788d73852f3d7af81ee4c4357587fe4f
2021-04-21 08:40:12 +00:00
TreeHugger Robot
f83576092c 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: Id0118f30be2fcae220369a15f31a76753727696d
2021-04-21 08:40:01 +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
18bbddbc72 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I179f0d31dcca4db83624ecd31c0d88fc24a93559
2021-04-21 07:17:44 +00:00
YUKAI HUNG
e72b6017a3 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: I8861428832fc78a9339bf366f119cc494828776f
2021-04-21 07:06:09 +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
03b4052395 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: If48503a6cd26b2df1fda8b65301d0e619d74ce72
2021-04-21 06:04:00 +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
18cefd4e8c 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: Ia73668d79d196bde927c3724e944710ac2792ea2
2021-04-21 03:05:15 +00:00
Jason Hsu
17328af7f2 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: I6e1c8a6fe7d5eaa54fffe5c61e935a36d6e77d18
2021-04-21 03:05:05 +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
2a95a27125 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: Icd245581e859780354add9daea801a3190e95f2c
2021-04-20 23:09:47 +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
307dea2d9c 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: I2d30a620a9c7f2fd877806bed5d71355edef331d
2021-04-20 21:38:45 +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
b6bc26e075 [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: I7454efd4d14dc6e38cc0a9965ed45b0325d9e56b
2021-04-20 20:26:01 +00:00
TreeHugger Robot
0788a02d99 [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: I169ccbaf79145e066058ce47442ec3b17401d1c8
2021-04-20 20:25:23 +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
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
bf0d0fe30e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I02e17fc7d05452a591f4df992135821a4d8524cc
2021-04-20 18:35:03 +00:00
ykhung
339f760250 Add footer for battery usage page am: 1415cbc49a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235152

Change-Id: I7314d2219346037931896a0b75aa2c105841519e
2021-04-20 16:50:37 +00:00
ykhung
3861d5d116 Add battery usage time summary to usage list item am: 7cc616e90f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233636

Change-Id: I7516e842303427752f9053df338716522401342b
2021-04-20 16:50:36 +00:00
jasonwshsu
15df635dd6 Fix accessibility settings page did not update the preference state
Root Cause: Keys in ContentObserver registered after the keys change

Solution: Keys in ContentObserver need to be observed during the whole lifecycle to update the preferences including summary text

Fix: 183157677
Fix: 172469017
Fix: 183459237
Fix: 183459376
Test: atest AccessibilitySettingsTest
Change-Id: I3b22773965f1878c499a0f9cbd8bd0f3c9c6fae9
2021-04-20 23:13:23 +08:00
TreeHugger Robot
e02aac720a Merge "Clean up app usage page" into sc-dev am: a30178221a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14250085

Change-Id: I7c8a0ca847f2713a0895d50c7b2745abc38682c3
2021-04-20 14:46:14 +00:00
ykhung
1415cbc49a Add footer for battery usage page
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ic61c32f22fe962e4afa3db23b867d1acd2702f65
2021-04-20 14:41:12 +00:00
Weng Su
a320fb12a1 [Provider Model] Carrie Wi-Fi offload toggle request (panel)
- Do not set Carrier Network together when setting Mobile Data, if
carrner network provision enabled.

Bug: 182324921
Test: manual test
atest -c ProviderModelSliceTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiScanWorkerTest

Change-Id: Ic8b77fd7b43372f077ba1c8be8fd9a7c3bcff197
2021-04-20 22:36:04 +08:00
ykhung
7cc616e90f Add battery usage time summary to usage list item
Insert app foregound and background usage time information into the
preference item summary based on the different scenarios.

Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I13ba357666adfb7b57f52ffae18d09aed8dd0773
2021-04-20 14:35:27 +00:00
TreeHugger Robot
a30178221a Merge "Clean up app usage page" into sc-dev 2021-04-20 14:30:22 +00:00
Wesley Wang
b03b8e7614 Merge "Update app usage page active time column" into sc-dev am: 386d4ba8a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233627

Change-Id: I4520cf572c41044d6707a318b17f5d1c492c42c4
2021-04-20 12:31:49 +00:00
Wesley Wang
386d4ba8a9 Merge "Update app usage page active time column" into sc-dev 2021-04-20 11:58:55 +00:00
Wesley.CW Wang
72463703ac Clean up app usage page
- Remove unused reference

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Iecb9b14bba5e823c1ceee70d5a27c6fe74dab815
2021-04-20 18:08:25 +08:00
Jason Hsu
720fabe8ca Merge "Update accessibility icons for S and using adaptive background" into sc-dev am: 8caa677bc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233633

Change-Id: I68356f4dd83b1440f2bbbe390571cfb8ee7be93b
2021-04-20 08:33:36 +00:00
Jason Hsu
8caa677bc2 Merge "Update accessibility icons for S and using adaptive background" into sc-dev 2021-04-20 08:09:42 +00:00
Jeremy Goldman
061bd0ab7c Merge "Check if the SubscriptionsChangeListener has been started before stop" am: 162029c5b6 am: e67b576ab9 am: 032b0a4bf3 am: 8c895001b8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1679185

Change-Id: I552fb80bb66439c22eaa7cac4be2536125ef9b3d
2021-04-20 06:55:19 +00:00
Jeremy Goldman
8c895001b8 Merge "Check if the SubscriptionsChangeListener has been started before stop" am: 162029c5b6 am: e67b576ab9 am: 032b0a4bf3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1679185

Change-Id: I893bf71a8450cd1ca0ecbf7ad78211232d6fa086
2021-04-20 06:34:11 +00:00
Jeremy Goldman
032b0a4bf3 Merge "Check if the SubscriptionsChangeListener has been started before stop" am: 162029c5b6 am: e67b576ab9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1679185

Change-Id: I7e906e3982dab72dfed796bc061f37468c2e3f2d
2021-04-20 06:08:30 +00:00
Wesley.CW Wang
f1966e9d0b Update app usage page active time column
Screenshot: https://screenshot.googleplex.com/5DYcV9fFTiatepi.png

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: If0427a4ed634a453ac49b35bd8082b8790ca7402
2021-04-20 13:49:57 +08:00
Jeremy Goldman
e67b576ab9 Merge "Check if the SubscriptionsChangeListener has been started before stop" am: 162029c5b6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1679185

Change-Id: Ia0580d6c17e936fe631c0cd1e0d946fa6881a92c
2021-04-20 05:44:54 +00:00
TreeHugger Robot
7cec0ba0a9 Merge "Hide non-system overlay window on AllowBindAppWidgetActivity" into sc-dev am: c066952437
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233629

Change-Id: I6b2517e5892523e0bf2618f31abc8d856a5cdfe3
2021-04-20 05:33:45 +00:00
Jeremy Goldman
162029c5b6 Merge "Check if the SubscriptionsChangeListener has been started before stop" 2021-04-20 05:24:37 +00:00
TreeHugger Robot
c066952437 Merge "Hide non-system overlay window on AllowBindAppWidgetActivity" into sc-dev 2021-04-20 05:22:13 +00:00
Tiffany Nguyen
8f388e21e8 Merge "Update BatterySettingsFeatureProvider to an activity-friendly interface." into sc-dev am: 560234a88a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14193839

Change-Id: I656a977b761f8ae9b47a5ba6ace974cc87054478
2021-04-20 05:12:15 +00:00