Commit Graph

80842 Commits

Author SHA1 Message Date
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
db3767e7b3 Merge "Fix search index for a financed device" into sc-dev 2021-04-20 21:06:45 +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
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
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
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
8caa677bc2 Merge "Update accessibility icons for S and using adaptive background" into sc-dev 2021-04-20 08:09:42 +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
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
jasonwshsu
cad5436bbe Update accessibility icons for S and using adaptive background
* Follow android guideline to use adaptive icon for launcher services/features
* Update color-check-baseline.xml
* Update assets list: text and display, extra dim, dark theme,
magnification, system controls, vibration and haptics, tap assistance,
live caption, caption preferences, real time text, audio adjustment,
hearing aids, font size, display size, bold text, color correction, color
inversion

Bug: 174540160
Bug: 183501919
Test: manual test
Change-Id: I600d64f97d3a4651ebafb9016a6c8bff9bada0a0
2021-04-20 05:11:28 +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
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
Jeremy Goldman
660e7164c7 Check if the SubscriptionsChangeListener has been started before stop
calling mContext.unregisterReceiver on an unregistered broadcast
receiver will result in an exception. To make the
SubscriptionsChangeListener safe from this kind of error, add a check to
see whether start has been called before implementing stop's
functionality.

Bug: 184662284
Bug: 184521296
Test: atest -c SettingsUnitTests
Change-Id: Ic13911ee7573666f5d42ab4612c025968984ba47
2021-04-20 11:33:17 +08: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
Treehugger Robot
ba40979005 Merge "Update OWNER file for TTS subfolder" am: a1cf8135e6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1674685

Change-Id: I0a31341d2018503a3e8d8bd0c4cd9f0d7637b5d3
2021-04-20 02:53:35 +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
TreeHugger Robot
3b77220873 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-19 23:34:20 +00:00
TreeHugger Robot
cee4d38c27 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-19 23:26:29 +00:00
TreeHugger Robot
00f29b707e Merge "Remove multi-biometric interstitial screen in SUW" into sc-dev 2021-04-19 23:15:38 +00:00
Kevin Chyn
704d86baca Merge "Do not scan for fingerprint when rename dialog is showing" into sc-dev 2021-04-19 23:04:09 +00:00
TreeHugger Robot
bcf4d4fce2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6a691cbc1a -s ours am: 4c69b3e30e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14237979

Change-Id: If26bec1e8faa26e5ccad76f6632d741dd6ddb62c
2021-04-19 22:34:59 +00:00
Bill Yi
eae1ad93f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7ff773ec9 -s ours am: debe299d81 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238550

Change-Id: I9a669ee30db5acbdfa6d90e971d7ae4ba51ca1b7
2021-04-19 22:34:54 +00:00
TreeHugger Robot
64e0a1d447 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 1da5e095f0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238546

Change-Id: I5059674c6aacf849413df3e40cc23684e7af4267
2021-04-19 22:34:44 +00:00
Bill Yi
17635a6d9c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 926d7148f5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238545

Change-Id: I65e1498d9d8f8b3dbc827a15be74950f4b7a536c
2021-04-19 22:33:59 +00:00
TreeHugger Robot
4c69b3e30e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6a691cbc1a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14237979

Change-Id: I96bb90ccfe25cfd6f56020a54020ad8755380b6b
2021-04-19 22:18:52 +00:00
TreeHugger Robot
1da5e095f0 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-19 22:17:45 +00:00
TreeHugger Robot
6a691cbc1a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-19 22:11:59 +00:00
Bill Yi
debe299d81 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7ff773ec9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238550

Change-Id: Ideb6b39714e86e01bfc84aecafc99e89d5741dac
2021-04-19 22:08:53 +00:00
Curtis Belmonte
5f1d13e3b0 Remove multi-biometric interstitial screen in SUW
On devices with multiple biometric sensors, this removes the
interstitial screen in Setup Wizard that let the user choose whether to
enroll face, fingerprint, or both. Instead, such devices will always
show face enrollment followed by fingerprint, with the option to skip
either or both.

Test: Manually tested all enroll/skip combinations in SUW

Fixes: 183720580
Change-Id: I7f045579f732196bde28dd96e9443e4bb4c906ae
2021-04-19 14:24:47 -07:00
Kevin Chyn
ee8fc8d587 Do not scan for fingerprint when rename dialog is showing
Fixes: 185670313
Test: manual
Change-Id: If153806d25c5397f1699d049a10c5bccaf87e413
2021-04-19 14:20:56 -07:00
Bill Yi
0c815374e6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If3d707ca4c2cda14502f47baf5ff2f0e038a9dd2
2021-04-19 21:12:51 +00:00
Bill Yi
c50c6cf64d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7a0db16b0ef7e5a4c110a24a2eb2fad6461c31bc
2021-04-19 21:04:52 +00:00
Bill Yi
4edd6f1d2e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0eb5c765212e06835518338f632653cd97764b16
2021-04-19 20:59:50 +00:00
Bill Yi
e7ff773ec9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I63b71ebf8f57a8effa4345bb1b00dbf35c2b1b3e
2021-04-19 20:56:11 +00:00
Bill Yi
cfa683bcea Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I92f69b8b0d4437bcc4c7092b0f432c6dd2041d30
2021-04-19 20:53:07 +00:00
Bill Yi
926d7148f5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifb9078b852b716a55695c56d410c135760c90e8e
2021-04-19 20:49:31 +00:00