Commit Graph

89187 Commits

Author SHA1 Message Date
Midas Chien
66e287c111 Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3 am: c252e58322 am: 8d543cd62c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: Ie61d572692195c8149330e2d40fd9a670240894a
2021-06-15 04:36:45 +00:00
Midas Chien
8ae7364175 Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3 am: 5f13b2ac15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: I7236d712626ef04310fbe88c4c47e2ac800ccd41
2021-06-15 04:20:06 +00:00
Midas Chien
8d543cd62c Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3 am: c252e58322
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: I9df65fbcfd1326a36cc422a240710c83f51360f7
2021-06-15 04:19:57 +00:00
Midas Chien
6cfe9da99d Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3 am: c5a736f633
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: I09f702a8ae8a7862d278a02b2823b0f6e8d62cc4
2021-06-15 04:19:05 +00:00
Midas Chien
c252e58322 Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: Id90f416bb41b697b3d7de89082cb7cf7591ea37f
2021-06-15 04:10:55 +00:00
Weng Su
28e5f4c2fc Revert "[Provider Model] Add WiFi toggle in internet panel"
This reverts commit 04a4060225.

Reason for revert: Need to split the functions for cherry picking to different branches

Bug: 189912933
Change-Id: I8c30a87c83e23b3df88ce2689d500626e1dd28d2
2021-06-15 04:10:13 +00:00
Midas Chien
c5a736f633 Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: I046cd43607ef3abe416967bdb3acbfacb3f15590
2021-06-15 04:10:06 +00:00
Midas Chien
5f13b2ac15 Merge "Change strings for force highest refresh rate in Developer options" into sc-dev am: 9598398df3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934758

Change-Id: I9c276afa567f7aefa79d4732581a7911dacbfa81
2021-06-15 04:10:02 +00:00
Midas Chien
9598398df3 Merge "Change strings for force highest refresh rate in Developer options" into sc-dev 2021-06-15 04:00:43 +00:00
Joshua Mccloskey
785203d51a Update multi biometric flow for SUW
Currently, if a user has completed a fingerprint/face enrollment
in SUW and they press the back button, we show the UI for each, and
it fails with no error.

This change makes it so that if a user completes 1 fingerprint or 1
face enrollment, it will no longer try and enroll them again if they
have failed.

Test: Manual
Bug: 191073296
Change-Id: I020c423b5d34797cd7c8be66a2e24051135c9be0
2021-06-14 19:59:23 -07:00
Arc Wang
ff5bb849ba Fix test failures
Add the color contextual_card_background to fix.

Bug: 190868608
Bug: 190870129
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SliceContextualCardRendererTest
      make RunSettingsRoboTests ROBOTEST_FILTER=SliceHalfCardRendererHelperTest
Change-Id: I430dab9c72a8f4efb2402e44fd015c1c1ce0f7e6
2021-06-15 10:25:06 +08:00
TreeHugger Robot
5417f61636 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759 am: c2546ecc86 am: e410232963
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: I2b04f806790c43e89d63819ca65ae01b44908284
2021-06-15 01:39:20 +00:00
TreeHugger Robot
e5839e5940 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759 am: bf5039ed58 am: 9509b385a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: I911a71d7e7bd59f7f31e47578adb9c1eb7ee1f9b
2021-06-15 01:39:07 +00:00
TreeHugger Robot
e410232963 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759 am: c2546ecc86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: I671d8e68eef9fa616f99c825611b1001be20a3c6
2021-06-15 01:27:31 +00:00
TreeHugger Robot
9509b385a3 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759 am: bf5039ed58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: If1500c37a9c1e6b7a0a1afc4367f57da3ee8d154
2021-06-15 01:27:00 +00:00
TreeHugger Robot
bd4ea47f6d Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759 am: e919947ad0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: I61d13da7ba7f6edb6a19b790efc9543065b15c28
2021-06-15 01:26:45 +00:00
TreeHugger Robot
bf5039ed58 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: I2ef40f8dbccbb0dc7a933267f1d4718f18393f96
2021-06-15 01:12:20 +00:00
TreeHugger Robot
e919947ad0 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: Ibbef8459369b5f31315e0680f69e8e2a3e4d2868
2021-06-15 01:11:37 +00:00
TreeHugger Robot
c2546ecc86 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev am: 052ae78759
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939788

Change-Id: Ica8a071cf361e64f899e786ff1658c1a9b12fba4
2021-06-15 01:10:48 +00:00
TreeHugger Robot
052ae78759 Merge "Changes to 'Alarms & reminders' permission setting" into sc-dev 2021-06-15 00:57:46 +00:00
Peter Wang
8f72495046 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356 am: 55d804ab71 am: ec429acb15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I9e2e4016a1e3286bbd0282b267b47ef45d746f0a
2021-06-14 19:19:12 +00:00
Peter Wang
50cb0b8d45 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356 am: ceaec5d877 am: 38c34dd446
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I3969258b7b2684d05c1f62037e686770d2d4e737
2021-06-14 19:18:24 +00:00
Peter Wang
ec429acb15 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356 am: 55d804ab71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I44419344855118b47bd354d77837f4001db67593
2021-06-14 18:31:38 +00:00
Peter Wang
38c34dd446 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356 am: ceaec5d877
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I802da3cbef2fe5bfa9ede0161a0ec623b2201486
2021-06-14 18:28:06 +00:00
Peter Wang
fa10eff411 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356 am: 43fe473265
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I4a45e5e98d8c59c4f3abcc114bdfbe8e3495920b
2021-06-14 18:23:55 +00:00
Peter Wang
55d804ab71 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I9603abb876fa91771d07377292567aac3a3aa7a0
2021-06-14 18:15:52 +00:00
Peter Wang
ceaec5d877 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: Iede2f2c33a6cf6202bbe1ee0f7523f8e4f372788
2021-06-14 18:15:33 +00:00
Peter Wang
43fe473265 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I55ec0dbdc4484a507558624e9a4ffc0afde4baea
2021-06-14 18:15:02 +00:00
Peter Wang
5a6655d356 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev 2021-06-14 17:58:40 +00:00
TreeHugger Robot
785e35b345 Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev am: 46bcf5ae17 am: 1f3b3c1b26 am: c577ce155e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14948330

Change-Id: I2522350d2fbdbf19cd3babde9e716429ea1706c7
2021-06-14 17:55:02 +00:00
TreeHugger Robot
cd7e2ab9c9 Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev am: 46bcf5ae17 am: 71abdcf20d am: 26a2dd9ebf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14948330

Change-Id: Id28f90719037730643ce5afd4edac3d3be4edf1e
2021-06-14 17:54:53 +00:00
TreeHugger Robot
c577ce155e Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev am: 46bcf5ae17 am: 1f3b3c1b26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14948330

Change-Id: I6c07d53ff4acb2196ab8aaa589ded1386153af61
2021-06-14 17:30:17 +00:00
TreeHugger Robot
2c4942d41b Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev am: 46bcf5ae17 am: 958d43aa1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14948330

Change-Id: Ia24f7a6b48a1697c1ab48eb27d7973dd3fa5aa6f
2021-06-14 17:30:06 +00:00
TreeHugger Robot
26a2dd9ebf Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev am: 46bcf5ae17 am: 71abdcf20d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14948330

Change-Id: I769a00426b437bff90d03ed23ca7e7fcaf223a67
2021-06-14 17:29:53 +00:00
Joe Bolinger
d6d7e53e9b Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d am: 2ddba89db0 am: 57b3de9edf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: I0d4d25469e830ec38acf389e458b77e7e1f4dd54
2021-06-14 17:24:10 +00:00
TreeHugger Robot
71abdcf20d Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev am: 46bcf5ae17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14948330

Change-Id: If09eefeab60fcb33d93b3c5491d97e366751a93c
2021-06-14 17:15:10 +00:00
TreeHugger Robot
1f3b3c1b26 Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev am: 46bcf5ae17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14948330

Change-Id: I5ae441b6f63c37e23e75d777aec33811be7f67c0
2021-06-14 17:15:06 +00:00
TreeHugger Robot
958d43aa1d Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev am: 46bcf5ae17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14948330

Change-Id: Ibea486f6596099fe558b226e421e15b34e197ec5
2021-06-14 17:14:05 +00:00
Joe Bolinger
57b3de9edf Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d am: 2ddba89db0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: I658e9c36b9e74cee9830059352228920eca104e9
2021-06-14 17:09:58 +00:00
TreeHugger Robot
46bcf5ae17 Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev 2021-06-14 17:01:00 +00:00
Joe Bolinger
b32bae8c3c Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d am: 0f32ee6122 am: 4df9a8cd58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: I54a9bff34f9154856e0ea969d6539a9851c83c77
2021-06-14 16:54:22 +00:00
Joe Bolinger
4df9a8cd58 Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d am: 0f32ee6122
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: I48cd41ff03a3726ec0185d686907acb4912231eb
2021-06-14 16:51:46 +00:00
Joe Bolinger
d90c8bc2df Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d am: 78a129a37a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: Ia670341cb8625fac37e008b19e1f18a4ff21911c
2021-06-14 16:51:45 +00:00
Joe Bolinger
2ddba89db0 Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: I0530719ce6fd63e18b1c0848d3a9bf63bcf6a79f
2021-06-14 16:51:19 +00:00
Joe Bolinger
78a129a37a Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: Icca31b9cfd6234b79c45e9fef7447d613516a87c
2021-06-14 16:39:01 +00:00
Alex Johnston
3f656e9d0c RequestManageCredentials foldable view
* Add more padding to layout
* Move 'Don't allow' button to the
  left screen
* https://screenshot.googleplex.com/6Ak35pRBZiyncb5

Bug: 189416800
Test: manual testing with emulator
Change-Id: Ie17aaaa8427f8151d469a662855586c37432f116
2021-06-14 17:38:50 +01:00
Joe Bolinger
0f32ee6122 Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: I74478f61878eaf445e5bf5285d43ec40666d5e28
2021-06-14 16:38:34 +00:00
Joe Bolinger
a72230977d Merge "Delay invoking biometric prompt." into sc-dev 2021-06-14 16:38:08 +00:00
Zim
3d7118d636 Turn off transcoding notification by default
To aid debugging, we included transcoding progress
notifications. We don't intend to launch with the notifications on by
default so turn it off now in preparation for Android S launch.

The notifications can still be enabled in the developer options with:
Settings > System > Developer options > Media transcoding >
Show transcoding notifications

Test: Manual
Bug: 190562454
Change-Id: Icab62cb91fdf22e5308d0c4bbc710b88a51170d3
2021-06-14 14:18:04 +01:00
TreeHugger Robot
a1ae8e6244 Merge "Remove the divider on "Pair new device"." into sc-dev am: c7f8315e66 am: b746b4bd85 am: 08bd584aee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934757

Change-Id: I1c580ffda6ad8a555bfc6ec4c6c8c3b1c4c60312
2021-06-14 08:52:30 +00:00