Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,798 Commits 1 Branch 0 Tags
364df11fdde782fb9c8ef32acb4cd24db322a646
Commit Graph

36655 Commits

Author SHA1 Message Date
Alex Johnston
364df11fdd Merge "Fix maximum time to lock" into sc-dev am: 2f9b5b6ad7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14109359

Change-Id: I3e6717637d45e7b5470bbd85c5a6df3dcb68b499
 2021-04-21 09:17:43 +00:00
Alex Johnston
2f9b5b6ad7 Merge "Fix maximum time to lock" into sc-dev 2021-04-21 09:17:28 +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
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
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
Alex Johnston
e9717d265e Fix maximum time to lock 
Changes
* Restore previous timeout behaviour. This
  behaviour was modified in Android S and
  was previously working on Android R.
* If the selected timeout is less than
  the max timeout set by the admin, select
  the largest possible timeout.
* If there are no possible timeouts for the
  user, disable the preference.

Manual testing steps
* Download CtsVerifier and CtsEmptyDeviceOwner apks
* Set device owner
* Run Policy transparency test > set max time to lock
* Set max time to lock and verify correct value is
  shown in Settings. Compare behaviour with Android R.

Bug: 184104507
Test: manual testing
      atest com.android.settings.display.ScreenTimeoutSettingsTest
Change-Id: I8d0e66ccce14cca244bcd380fd225a31df0b8999
 2021-04-21 08:09:25 +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
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
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
ykhung
e16407940f 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: Ic2b6cf16aa8daacf7c2bb7f5a63ee84e380f0684
 2021-04-20 16:50:01 +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
6f611ae04b 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: Iaef5978ae72b83a948c2716512798fd3a5b4e5e2
 2021-04-20 14:47:18 +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
ab3b726add 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: Ibc9fcec23299a5f177a118848a6f6054a3ff5df7
 2021-04-20 12:31:22 +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
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
TreeHugger Robot
2291874e56 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: I508555714a4e2f505f8f9b94bc6a5eb7eb72306d
 2021-04-20 05:33:38 +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
4c8d27d798 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: If41dc564d970f52f7547dcfa4d9a22a3e2c6fe77
 2021-04-20 05:11:44 +00:00
Tiffany Nguyen
560234a88a Merge "Update BatterySettingsFeatureProvider to an activity-friendly interface." into sc-dev 2021-04-20 04:44:44 +00:00
Treehugger Robot
fe4bcbb657 Merge "Update OWNER file for TTS subfolder" am: a1cf8135e6 am: ba40979005 am: 7609a76fe7 am: 818c5396ce 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1674685

Change-Id: Ie63b612e8024d487f7911cc439ada93b50acd076
 2021-04-20 03:43:59 +00:00
Treehugger Robot
818c5396ce Merge "Update OWNER file for TTS subfolder" am: a1cf8135e6 am: ba40979005 am: 7609a76fe7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1674685

Change-Id: I1c35d4082fe02fba39bb812257b2c5ad5859c31e
 2021-04-20 03:33:39 +00:00
TreeHugger Robot
ef12a2ba72 Merge "Only show single line title on list preference" into sc-dev am: 82bf85944f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233626

Change-Id: Ia8e23f8eefdcedb51402b3ca7a16961b44948348
 2021-04-20 03:32:46 +00:00
Treehugger Robot
7609a76fe7 Merge "Update OWNER file for TTS subfolder" am: a1cf8135e6 am: ba40979005 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1674685

Change-Id: If59c31a9df0fc8426fa48310aa0eec3157d6a249
 2021-04-20 03:18:27 +00:00
TreeHugger Robot
82bf85944f Merge "Only show single line title on list preference" into sc-dev 2021-04-20 03:14:44 +00:00
Chloris Kuo
504aebdbe3 Merge "NAS settings change" into sc-dev am: 7e9fe7b5c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14232928

Change-Id: If821e0cd34af2e85eb4fea7e161f761b1acde4d5
 2021-04-20 02:40:17 +00:00
Treehugger Robot
a1cf8135e6 Merge "Update OWNER file for TTS subfolder" 2021-04-20 02:19:53 +00:00
Chloris Kuo
7e9fe7b5c5 Merge "NAS settings change" into sc-dev 2021-04-20 02:03:27 +00:00
Mady Mellor
24adce034d Change bubble settings to use Secure rather than Global 
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Bug: 173408780
Change-Id: I53fcd59c22c219551bd2eb6f0251acb5a03690ea
 2021-04-20 01:37:34 +00:00
Sunny Shao
55d164784b Hide non-system overlay window on AllowBindAppWidgetActivity 
Bug: 184676316
Test: manual test using BindAppWidget-Overlay-poc.apk
Change-Id: I234b5ac26c8f4fd80462b7e9c311d8feca05845f
 2021-04-20 09:31:06 +08:00
Weng Su
aeb6200bfe [Provider Model] Carrie Wi-Fi offload toggle request 
- Remove the Advanced expandable list pattern and expose the items

- Add Carrie Wi-Fi offload toggle preference

- Add Carrier Wi-Fi network preference

- Do not set Carrier Network together when setting Mobile Data, if
carrner network provision enabled.

- Screenshot:
  https://screenshot.googleplex.com/8vMow53cvGfUAoj

Bug: 182324921
Test: manual test
atest -c CarrierWifiTogglePreferenceControllerTest \
         MobileDataPreferenceControllerTest \
	 WifiPickerTrackerHelperTest

Change-Id: I5a7f4cc6850fe76c0efee392c0c0c23cb41f5e1e
 2021-04-20 07:58:20 +08:00
TreeHugger Robot
957002778b Merge "Remove multi-biometric interstitial screen in SUW" into sc-dev am: 00f29b707e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14217106

Change-Id: Iac32b77681df8595026281d408c49fb67a7e391c
 2021-04-19 23:27:25 +00:00
Kevin Chyn
6f02a55125 Merge "Do not scan for fingerprint when rename dialog is showing" into sc-dev am: 704d86baca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14236010

Change-Id: I414a7ca9d08f6467a44f8a2244cc431c596d4ee8
 2021-04-19 23:27:11 +00:00
TreeHugger Robot
00f29b707e Merge "Remove multi-biometric interstitial screen in SUW" into sc-dev 2021-04-19 23:15:38 +00:00