Commit Graph

80872 Commits

Author SHA1 Message Date
TreeHugger Robot
9957057402 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: Ie6393a56f64a921a5858f863f36c28f1d8381860
2021-04-19 23:19:34 +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
ed8dd3c3e5 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: I46f216995c0970d3c69d5bb572b6412f128754ba
2021-04-19 23:09:12 +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
d1644ad398 [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: I088d9254c05e682709fb82bc532396972cfafc63
2021-04-19 22:59:21 +00:00
Bill Yi
2daf41ef7a [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: I2dd06c22631a5802cdf83d09588ea53f25e27012
2021-04-19 22:59:17 +00:00
TreeHugger Robot
4bb24da723 [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: I1b0ca785b92980aa848cf1b746cea3dbf99550cc
2021-04-19 22:59:12 +00:00
Bill Yi
7e91fa23f8 [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: I22008c36c1b397cc57f49c1dd78769f13e42148c
2021-04-19 22:58:11 +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
df93d5b8f4 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: Ie7be66a59750f414110b6a853017c92bc4da4ab4
2021-04-19 22:02:27 +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
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
a4380af14e 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: I3defc05d0ab05d2eb819b6aeb9e49d2887ee3025
2021-04-19 16:01:43 +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
e5c789e9f0 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: Idbb32fb8516dc3211623ac09ce156f42843f01cf
2021-04-19 11:29:27 +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
7872258e40 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: I0956332580b02f633d195fafaddbb5bd03d55e67
2021-04-19 10:34:00 +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
9afa74f0c2 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: Iec61f63baf7a7a26167613c1558ee29b7be23809
2021-04-19 08:58:29 +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
9e5e620d49 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: If7bf886ff1d95963f913676da05a7884dc141b0b
2021-04-19 08:09:26 +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
b14f9c7406 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: Icbf502a9036dee95d1771cb7ab8d786c57d6b24a
2021-04-19 07:58:28 +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
102b467cdc 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: Ief708e931485309787ba6e6267b1de1335de52a6
2021-04-19 06:55:25 +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
e0ff5a1f19 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: I859d4ef83947befd77ad50ea0a1e10e02efdab16
2021-04-19 06:44:55 +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
e1ceba0214 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: I265ddc4bc1d36af6c1e1e58341749dd3bb0e2f72
2021-04-19 04:58:00 +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
Jeremy Goldman
770ad5cbd7 Merge "If the proider model is enabled, the User cannot create insecure VPNs" into sc-dev 2021-04-19 04:38:51 +00:00
Arc Wang
2e04e81da8 Update storage usage progress bar summary text
Shows a simplified version, e.g., 24GB used / 64 GB total

Bug: 174964885
Test: manual visual
Change-Id: Ia7a12d0cf7444ebb172ef2c23209196e01eadac0
2021-04-19 12:08:16 +08:00
Arc Wang
40f831d7b6 Merge "Update storage usage progress bar summary text" into sc-dev am: 1073196af9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209650

Change-Id: I1d78d90cd266b3cd833754988ebb22d07a1dc98d
2021-04-19 02:35:15 +00:00