Commit Graph

81533 Commits

Author SHA1 Message Date
TreeHugger Robot
ebf90cafb6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cee4d38c27 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5776581bed322c3c7c51a184c3f75208cb8645e2
2021-04-19 23:29:22 +00:00
TreeHugger Robot
abd19ade78 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: I6a1db8eb0108606aa02fa2f2314ca346d2df89df
2021-04-19 23:29:13 +00:00
Kevin Chyn
7c6534b743 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: I7ff21c9d45e906d566923f99374736cecafa34b0
2021-04-19 23:28:41 +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
3a6c33341f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6a691cbc1a -s ours am: 4c69b3e30e -s ours am: bcf4d4fce2 -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: I4ed22875d1e7d4d5bcf949e64e822b4b11d8eba5
2021-04-19 22:57:15 +00:00
Bill Yi
d124087929 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7ff773ec9 -s ours am: debe299d81 -s ours am: eae1ad93f4 -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: Ief4d55e8e9fbdd69d8a40a032d3056d138a9ffa4
2021-04-19 22:57:10 +00:00
TreeHugger Robot
f3a4b8e7cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 1da5e095f0 -s ours am: 64e0a1d447 -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: I24cd5378d20d6b319e168b911d0545afb6456b5a
2021-04-19 22:57:05 +00:00
Bill Yi
6c1238e3ac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 926d7148f5 -s ours am: 17635a6d9c -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: I82f918c90da25c58c54d41789d0567ae01cf5f52
2021-04-19 22:56:56 +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
Kevin Chyn
1375b86d84 Actually use new string in fingerprint settings am: 83b061d3da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238002

Change-Id: I64979e072953f8538eca94c821f736ac561bfa2f
2021-04-19 22:00:34 +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
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
Kevin Chyn
83b061d3da Actually use new string in fingerprint settings
Fixes: 185805485
Test: Manually inspect
Change-Id: I9a92d4198e3482d7f08d033f8d1242a28a39ef4a
2021-04-19 13:05:35 -07:00
ykhung
7d8393fb1b Refine startBatteryDetailPage method to support history data am: 4752ea17b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14231927

Change-Id: Ib078ae18c6e1e3f347f3328c9f8d5ec29c6602f0
2021-04-19 16:00:54 +00:00
ykhung
4752ea17b9 Refine startBatteryDetailPage method to support history data
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iee3b6b353c4f92bdad37fac55adad58b4f205bf6
2021-04-19 14:06:55 +00:00
TreeHugger Robot
9df3dae929 Merge "Tweak the layout of top app bar" into sc-dev am: d2bffb94a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199746

Change-Id: I95856b157ce265eb0f63f45a51505dbb4bdf8e54
2021-04-19 11:27:53 +00:00
TreeHugger Robot
d2bffb94a7 Merge "Tweak the layout of top app bar" into sc-dev 2021-04-19 11:02:28 +00:00
Wesley Wang
2edb4d3a2a Merge changes Iced0fa59,Ic354ac91,I0b4cb6ca,I9c1d3761 into sc-dev am: e3cf049039
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209651

Change-Id: I9a02694133598cbdaae22ff0fc7c3470fd333e6f
2021-04-19 10:31:45 +00:00
Wesley Wang
e3cf049039 Merge changes Iced0fa59,Ic354ac91,I0b4cb6ca,I9c1d3761 into sc-dev
* changes:
  Add footer to app usage page
  Update app usage page with 3 radio button control
  Add 3 controller for app usage page radio buttons
  Add utils class for app usage operation
2021-04-19 10:15:49 +00:00
Mill Chen
feae056067 Tweak the layout of top app bar
- Update the color of content scrim
- Dynamically change the height of collapsing toolbar according to the
  line count of title
- Fix the jank problem of collapsing toolbar

Fixes: 184615642
Fixes: 185003521
Fixes: 182770567
Fixes: 184209747
Test: visual verified
Change-Id: I78c517eb9bec0b85997085970007481d1a4ef7d3
2021-04-19 17:29:18 +08:00
Kholoud Mohamed
4f6399aedb Merge "Enable ignored test" into sc-dev am: 5fb1b61253
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199608

Change-Id: I98773343a89d955358eb0bb36c59e30b3e6110a5
2021-04-19 08:56:42 +00:00
Kholoud Mohamed
5fb1b61253 Merge "Enable ignored test" into sc-dev 2021-04-19 08:34:47 +00:00
Wesley.CW Wang
8ca6f31716 Add footer to app usage page
- Add a footer to present the description text, will present specific text once this app is optimized or unrestricted only
 Screenshots:
   https://screenshot.googleplex.com/4HZGQU6SDni3PdR.png
   https://screenshot.googleplex.com/9gLSgftmaYuZepf.png
   https://screenshot.googleplex.com/55masP3VoAtAFMo.png

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Iced0fa591faf72874e2e3dff942122c90d35a4e7
2021-04-19 08:14:54 +00:00
Wesley.CW Wang
5083d82df7 Update app usage page with 3 radio button control
- Improve the UX from 2 different preference column to 3 radio button,
 make the restriction state more easy to control and recognize
 Screenshot: https://screenshot.googleplex.com/4nCBnF5FzwePqrL.png

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Ic354ac91e5496c0e44c5b44142627ac8a090e30f
2021-04-19 08:14:41 +00:00
Wesley.CW Wang
3db43de758 Add 3 controller for app usage page radio buttons
Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I0b4cb6ca2db3c5f6dafd89484c91ca3f7fb1a1ae
2021-04-19 08:14:21 +00:00
Wesley.CW Wang
f2321ad5e1 Add utils class for app usage operation
- An util class to control usage state

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I9c1d37610a2e52d484228ef8e5c7af49e12f82aa
2021-04-19 16:13:00 +08:00
TreeHugger Robot
6465a14c53 Merge "Apply the correct style to Battery and Storage page" into sc-dev am: d0ca25a062
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199748

Change-Id: I44cd81513106affcb0b3cd3a1d31eb9536d71247
2021-04-19 08:07:19 +00:00
TreeHugger Robot
d0ca25a062 Merge "Apply the correct style to Battery and Storage page" into sc-dev 2021-04-19 08:02:14 +00:00
TreeHugger Robot
0c60813631 Merge "Update storage usage progress bar summary text" into sc-dev am: 8b58ae9d4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14230402

Change-Id: I60c60a9b0aa6db475c0cfcd96c68683da0e7db8a
2021-04-19 07:56:47 +00:00
TreeHugger Robot
8b58ae9d4f Merge "Update storage usage progress bar summary text" into sc-dev 2021-04-19 07:41:24 +00:00
YUKAI HUNG
162a49152e Merge "Add app usage preferencee item into the history preference" into sc-dev am: 36e9a5ffd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14230387

Change-Id: I47d92353e8dc235482c9cfa8b1fb03547ab41427
2021-04-19 07:20:10 +00:00
YUKAI HUNG
36e9a5ffd2 Merge "Add app usage preferencee item into the history preference" into sc-dev 2021-04-19 06:52:40 +00:00
Jeremy Goldman
de7a91397b Merge "Check if the SubscriptionsChangeListener has been started before stop" into sc-dev am: aeaad6bd2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187776

Change-Id: I20369a379ec2636efefd37d6d207ec36754d77cd
2021-04-19 06:43:31 +00:00
Jeremy Goldman
aeaad6bd2e Merge "Check if the SubscriptionsChangeListener has been started before stop" into sc-dev 2021-04-19 06:21:59 +00:00
Jeremy Goldman
8bc78dd9d0 Merge "If the proider model is enabled, the User cannot create insecure VPNs" into sc-dev am: 770ad5cbd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185086

Change-Id: Id3190625cc98e590f8503cb4b791743999b46ba5
2021-04-19 04:56:17 +00:00
ykhung
bcf0a411a1 Add app usage preferencee item into the history preference
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I7d9a14eca0b8d3b054e040cb13135ef15390e512
2021-04-19 04:45:11 +00:00