Commit Graph

83991 Commits

Author SHA1 Message Date
Wesley Wang
4dc71183a3 Merge "Make App info page support new battery entry" into sc-dev am: f2a884b8be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800151

Change-Id: I5ad77479d5cbc6d5c230bbea5db5fac198e957de
2021-06-15 04:58:04 +00:00
Wesley Wang
f2a884b8be Merge "Make App info page support new battery entry" into sc-dev 2021-06-15 04:41:16 +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
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
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
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
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
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
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
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
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
5a6655d356 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev 2021-06-14 17:58:40 +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
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
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
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
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
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
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
08bd584aee Merge "Remove the divider on "Pair new device"." into sc-dev am: c7f8315e66 am: b746b4bd85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934757

Change-Id: Id344fbb2112ffa39bb1ceed0a62bc75a111cda32
2021-06-14 08:40:11 +00:00
TreeHugger Robot
66b3a69422 Merge "Remove the divider on "Pair new device"." into sc-dev am: c7f8315e66 am: 39f7fb0256
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934757

Change-Id: I56c0d770813638d5b68f760d69472159d92eb846
2021-06-14 08:39:51 +00:00
TreeHugger Robot
39f7fb0256 Merge "Remove the divider on "Pair new device"." into sc-dev am: c7f8315e66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934757

Change-Id: I7e3164ccbf9effe18d2ff8dddc8760d00baa45b0
2021-06-14 08:24:53 +00:00
TreeHugger Robot
b746b4bd85 Merge "Remove the divider on "Pair new device"." into sc-dev am: c7f8315e66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934757

Change-Id: Ia26f10e65d91fb7f0450dd98a6d8bd366d2efcae
2021-06-14 08:23:59 +00:00
TreeHugger Robot
c7f8315e66 Merge "Remove the divider on "Pair new device"." into sc-dev 2021-06-14 08:09:16 +00:00
PETER LIANG
511c02c55f Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5 am: ec7f4821b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928754

Change-Id: Ica0e7784ffc3b84f5ee8901d3d2b3ea2114dbb19
2021-06-14 03:30:35 +00:00
PETER LIANG
7f49a0282a Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5 am: a989ce32ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928754

Change-Id: I21106ec26ebf1350d8310c40cf7eab6462d6acf4
2021-06-14 03:25:11 +00:00
PETER LIANG
ec7f4821b2 Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928754

Change-Id: If20ac2d389642d8de204c1b9e709b027bc22b3be
2021-06-14 03:12:36 +00:00
PETER LIANG
a989ce32ec Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928754

Change-Id: Ia7f3f1bd9e35ec1233433dd07b4c023cb0a113ef
2021-06-14 03:11:28 +00:00
PETER LIANG
a96c844df5 Merge changes from topic "a11y_image_preference_bc" into sc-dev
* changes:
  Update the Lottie images for Accessibility features.
  Update the material next style for AnimatedImagePreference.
2021-06-14 02:55:07 +00:00
TreeHugger Robot
7727591655 Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev am: cd6c64a5c7 am: 52a20f10c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941211

Change-Id: I93e6d5c7ef7b8d56a560a4a754c2252abcaeaa6b
2021-06-12 23:57:48 +00:00
TreeHugger Robot
8c869d6279 Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev am: cd6c64a5c7 am: 64d5b55607
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941211

Change-Id: I923064a04373f7404cc0ddab9c13acfefeaa9f57
2021-06-12 23:57:29 +00:00
TreeHugger Robot
64d5b55607 Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev am: cd6c64a5c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941211

Change-Id: If38157d9414243b4411a652577ce4ae668a3e889
2021-06-12 23:45:21 +00:00
TreeHugger Robot
52a20f10c6 Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev am: cd6c64a5c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941211

Change-Id: I44d170baf79a4418fba5c3ec30fe628131c177c7
2021-06-12 23:44:33 +00:00
TreeHugger Robot
cd6c64a5c7 Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev 2021-06-12 23:31:12 +00:00
Jason Chang
d21b014fee Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev am: 5213fbced1 am: 48ea6abf18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14804130

Change-Id: I38d8fe5fe3770d2284e05ddad0b390dbb41879dc
2021-06-12 12:15:40 +00:00
Jason Chang
1179c9bd86 Remove redundant swipe down notification and one handed sub settings am: 1c310ef44b am: c9b0c596be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797789

Change-Id: I5616933e4ac7bb1f48e3d0c7b0d08ddc37ad1f69
2021-06-12 12:15:36 +00:00
Jason Chang
6c73b5d9d7 Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev am: 5213fbced1 am: 0ec543dd95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14804130

Change-Id: I856db725c29dec6244468bf243b988c016c92c8a
2021-06-12 12:07:57 +00:00
Jason Chang
d0e3a0d904 Remove redundant swipe down notification and one handed sub settings am: 1c310ef44b am: 691a29062a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797789

Change-Id: I12fdc3757650452ef430659fe35607113c19bdbf
2021-06-12 12:07:54 +00:00
Jason Chang
48ea6abf18 Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev am: 5213fbced1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14804130

Change-Id: Ia210213ae6504c7192186d59ff37877444bc8b9c
2021-06-12 11:59:58 +00:00