Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,948 Commits 1 Branch 0 Tags
5e50d94f41b561c1a5bf35e00a8ea9eac4666b42
Commit Graph

80948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
5e50d94f41 [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: I508afe2792d12c39a8076bd56878f30410f5320d
 2021-04-21 08:42:36 +00:00
TreeHugger Robot
87c7329d25 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: I2bc8b0f17590af2cd1e945246ba4c5394374ca89
 2021-04-21 08:42:33 +00:00
TreeHugger Robot
513c0a1d1c 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: I18bc1abe24d6fb67772770bc473e796a9fed0c19
 2021-04-21 08:41:33 +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
095c264877 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: I85cfc37e56647cb6fc3a9d9f750ebdde5a1f35cf
 2021-04-21 07:07:55 +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
5385c6bc66 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: Ic53f93e9a3493ce1ddc2bb5696fdd8a5fdeac140
 2021-04-21 06:05:26 +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
c5c2da018f 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: Iea7c7b370ff5320c518ccbaa9cc86791fc62a355
 2021-04-21 03:06:46 +00:00
Jason Hsu
d717f88825 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: If0ac91f2d568371ad6bda8806d9a2e5bbffa97bf
 2021-04-21 03:06:35 +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
09cbe8fb64 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: I95f6cc195318351d241c41ffd8d81011199e2aa3
 2021-04-20 23:11:36 +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
a0501be2b0 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: I217da001caa9f904a25d25e031ec06c5f5156e1c
 2021-04-20 21:40:18 +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
f3ba0c4015 [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: Ifa2da56ed08daf720220b289751400f09ec8dc48
 2021-04-20 20:29:58 +00:00
TreeHugger Robot
e14a48237f [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: I1792c526458fc5ab8d0b9ef70926b4256dbcc1f3
 2021-04-20 20:25:59 +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
a04ecb0e91 Add footer for battery usage page am: 1415cbc49a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235152

Change-Id: I217d8ca631713c146024146025845205cf24fd23
 2021-04-20 16:53:04 +00:00
ykhung
945c3271dd 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: Id407b1b81a184f6c51e099ce906f38336e01f671
 2021-04-20 16:53:03 +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
2bff5d8627 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: I7ff9d754f310ddd72f9603da764aa74502d2d2d5
 2021-04-20 14:48:39 +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
8bc189e31d 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: I3db18a28e7a6b949d4e633b5575c42962e60e1ca
 2021-04-20 12:33:29 +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
d9ead9bdc2 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: I3d9005ce1a00f403dc23b3d29490a9e302c0aa05
 2021-04-20 08:35:08 +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
b17220f064 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: Ia5abc01326c48babd8a328ee2b9dc2eaa0ed155b
 2021-04-20 06:57:20 +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
b4ac9f34ba 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: I789c01add695da38406d2bfc8cd6a260b7c98605
 2021-04-20 05:25:38 +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
aeb03a3246 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: Id51b7e30b1e1351749afe018df8740a035bc4a25
 2021-04-20 05:14:09 +00:00