Kevin Chyn
d7b6b3d54e
Revert "Set ConfirmDeviceCredentialActivity non-external in FRP"
...
This reverts commit ba5e25e3b1 .
Reason for revert: b/183706857
Bug: b/171950236
Change-Id: Icdd1c76ed650539520a2ebf8ece078f17cdf9deb
2021-04-14 07:24:16 +00:00
Jack He
ab38192a1f
Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232 am: ee25171aa1 am: 130f27d48f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159
Change-Id: Ic39e10b36eff5b009886d7a321575f63ef15ba5c
2021-04-14 06:55:36 +00:00
Yanting Yang
fa16844eb1
Use sentence case for display section subheaders
...
Fixes: 184957718
Test: visual
Change-Id: Iba3cdda216d7bf4db4b124886b326a052117f6f4
2021-04-14 06:34:58 +00:00
Ryan Lin
406f5f0a1d
Merge "Show the illustration with the given button mode" into sc-dev am: 0e35a6fe07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167785
Change-Id: I9a695904309e9c8f997a33f1cd39503053dba84e
2021-04-14 06:31:52 +00:00
Jack He
130f27d48f
Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232 am: ee25171aa1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159
Change-Id: I690e850a6b67125a35e999a4faf86a3454140d3f
2021-04-14 06:07:23 +00:00
Ryan Lin
0e35a6fe07
Merge "Show the illustration with the given button mode" into sc-dev
2021-04-14 05:50:49 +00:00
Syaoran Kuo
f4aca12619
Adds new test for notification.
...
1. Add notification test.
2. Add shareUserId into manifest file.
Test: atest
com.android.settings.notification.AppNotificationComponentTest
Bug: 184814161
Change-Id: I38b7a854e8c8e0777fb7be3a518b7ed9d0f0a7a6
2021-04-14 05:35:38 +00:00
Jack He
ee25171aa1
Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159
Change-Id: Ib4b7dbbc490cbb74954531fbf17b440074cb4447
2021-04-14 05:23:30 +00:00
Tiffany Nguyen
f2e33df51c
Update BatterySettingsFeatureProvider to an activity-friendly interface.
...
Test: no impl
Bug: 181827718
Change-Id: I006c7c253df516981240d49fd2590fa68dabb9f2
2021-04-14 04:50:10 +00:00
Jack He
6de2953232
Merge "BT: Use DeviceConfig for Bluetooth GD toggle"
2021-04-14 04:44:02 +00:00
TreeHugger Robot
fe59de27ea
Merge "Add 50% opacity if detect there is no device image yet" into sc-dev am: c9cbe8a572
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140159
Change-Id: I7d6730b861c100d3888bc86c453bc48591547c9b
2021-04-14 04:02:13 +00:00
Jeremy Goldman
eecc97a339
Add additional strings to differentiate between single and multiple
...
insecure vpns
Although in english, the strings can be "N not secure", in other
languages translators have requested that we add "VPN" or "VPNs" after
the number for extra clarity. Thus, we split the string into two
depending on whether there is just one or more than one insecure VPN.
Bug: 184167494
Test: atest -c SettingsUnitTests
Change-Id: I93f0cbec5f22ffcac70ddc2ecf640729eef29c04
2021-04-14 11:52:38 +08:00
TreeHugger Robot
c9cbe8a572
Merge "Add 50% opacity if detect there is no device image yet" into sc-dev
2021-04-14 03:44:16 +00:00
YUKAI HUNG
c759242125
Merge "Export loadNameAndIcon() method out for BatteryDiffEntry reusing." into sc-dev am: 9c68e56389
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173736
Change-Id: I9a57e18d457d5ae5b7159932c4bbd6ff820a1334
2021-04-14 03:42:12 +00:00
YUKAI HUNG
9c68e56389
Merge "Export loadNameAndIcon() method out for BatteryDiffEntry reusing." into sc-dev
2021-04-14 03:07:33 +00:00
YUKAI HUNG
f9a3ef46e4
Merge "Load application icon and label from package manager if available" into sc-dev am: 8d8877b6db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167798
Change-Id: I23179e6b98fd6beae829d6fde68f10f9bfcecda8
2021-04-14 02:32:22 +00:00
YUKAI HUNG
8d8877b6db
Merge "Load application icon and label from package manager if available" into sc-dev
2021-04-14 01:58:37 +00:00
Tsung-Mao Fang
b6b63bec6c
Update OWNER file for TTS subfolder
...
Change-Id: If0efd5051bc8ddcaa406746d4eb4e4a03d9023b7
Test: N/A
Fix: 185232773
2021-04-14 01:29:15 +00:00
sallyyuen
fefb447526
Call ColorDisplayManager for Extra Dim/RBC state
...
- Move junit test into unit test folder
- Settings resources ids are different from the junit test ids
so we need to find the correct resource id
- ColorDisplayManager will not update in time before the controller
is checked, and it can't be mocked since it's a final class
Bug: 170970675
Test: manual, atest ReduceBrightColorsPreferenceControllerTest
Change-Id: I57bfdd8294c5b6e147b4e11ae97b6b56f6121343
2021-04-13 17:42:25 -07:00
Dmitri Plotnikov
5b33bfac18
Merge "Adjust for changing BatteryUsageStats constructor" into sc-dev am: 26db6e5f8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14162520
Change-Id: I634c611bf1287784fdec48a2257e3236565bc40b
2021-04-13 23:49:35 +00:00
Dmitri Plotnikov
26db6e5f8e
Merge "Adjust for changing BatteryUsageStats constructor" into sc-dev
2021-04-13 23:44:29 +00:00
TreeHugger Robot
8f5f0b3c02
Merge "Update getOwnersForDomain usage to SortedSet" into sc-dev am: ea4ab07b63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173190
Change-Id: Ib3bd4f3a331265fd5661cb175518a0aee08b22d5
2021-04-13 22:40:09 +00:00
Dmitri Plotnikov
470839a3b7
Remove references to POWER_COMPONENT_USAGE and TIME_COMPONENT_USAGE
...
Bug: 184397335
Test: enable fake data, rebuild and restart Settings/Battery
Change-Id: I1a5825a0e324c7884fc900e7cea9f38a9153253c
2021-04-13 15:39:26 -07:00
TreeHugger Robot
ea4ab07b63
Merge "Update getOwnersForDomain usage to SortedSet" into sc-dev
2021-04-13 21:54:12 +00:00
Jack He
8cc23bd2fe
BT: Use DeviceConfig for Bluetooth GD toggle
...
Bug: 184235563
Test: make and toggle GD settings, unit test
Change-Id: I643339f80a82950b1b1ffcf60830f93a955e6666
2021-04-13 20:31:38 +00:00
Sally Yuen
e80b9c5501
Merge "Add a banner for RBC/Extra Dim" into sc-dev am: 12166e5bb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14165431
Change-Id: I96400d7efabb296d09a4283726ad1109ec2be22c
2021-04-13 17:16:28 +00:00
ykhung
8483ea48b9
Export loadNameAndIcon() method out for BatteryDiffEntry reusing.
...
Bug: 185187669
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iedb37546f6f08751174d977d962aec44539f2fb8
2021-04-14 01:01:48 +08:00
Sally Yuen
12166e5bb1
Merge "Add a banner for RBC/Extra Dim" into sc-dev
2021-04-13 16:18:57 +00:00
Winson
3cb64ab6ad
Update getOwnersForDomain usage to SortedSet
...
From API feedback, the return type of this method was updated.
Migrating was fairly simple.
Bug: 184891031
Test: manual, launch settings screen on device
Change-Id: Ic159093b5d3f592de0b3533cf26bf0c878e06a30
2021-04-13 08:40:14 -07:00
ykhung
db88c994b4
Load application icon and label from package manager if available
...
Bug: 185187669
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Id612f0f1db51d538abb41fc711b9350d9a147cb8
2021-04-13 23:12:12 +08:00
Weng Su
bdc3abf5ef
Merge "[Provider Model] Move down the Internet unavailable Wi-Fi" into sc-dev am: 96f73e20aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160589
Change-Id: I037a6553eafec3092b940264d8d147b31c00a7aa
2021-04-13 08:50:57 +00:00
ryanlwlin
2c5570e9fc
Show the illustration with the given button mode
...
Currently we support two modes of software shortcut.
We should change the illustration depending on the mode.
Bug: 185193333
Test: manually test
Change-Id: I54f800ead984c22cebec1de4ac15c022b0bcbb3d
2021-04-13 16:21:41 +08:00
Weng Su
96f73e20aa
Merge "[Provider Model] Move down the Internet unavailable Wi-Fi" into sc-dev
2021-04-13 07:53:47 +00:00
YUKAI HUNG
296d9ac7c5
Merge changes I7771a43b,If613c5cf into sc-dev am: 1871275fbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160593
Change-Id: I4b22579f4b3e04a5e1ce38d0e55d759e0d8b35f9
2021-04-13 06:53:36 +00:00
YUKAI HUNG
1871275fbf
Merge changes I7771a43b,If613c5cf into sc-dev
...
* changes:
Inserts last 24 hour agrregate data into indexed usage map
Add a method to calculate battery usage diff results from history
2021-04-13 06:08:18 +00:00
Wesley Wang
1f26c7e2a2
Merge "Reorder battery tips priority" into sc-dev am: 6f0a0da428
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14158864
Change-Id: I0c63f6bb841f2dc3024f5515c742146ae7ef9afd
2021-04-13 04:27:50 +00:00
Hugh Chen
97660dd1f4
Add 50% opacity if detect there is no device image yet
...
Screenshot:
https://screenshot.googleplex.com/Ah9DKn85S3AWB4r.png
Bug: 177901821
Test: build pass and manual test
Change-Id: Ia5142cdd1cf105d978043987ad92c5c4e8c79e0c
2021-04-13 12:05:28 +08:00
ykhung
0d54b75b2c
Inserts last 24 hour agrregate data into indexed usage map
...
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I7771a43baf74b36a816883dd6b6a91128f827cf4
2021-04-13 11:59:28 +08:00
Wesley Wang
6f0a0da428
Merge "Reorder battery tips priority" into sc-dev
2021-04-13 03:56:46 +00:00
TreeHugger Robot
d3f4182781
Merge "Fix nit from ag/13715126" into sc-dev am: 8c655662af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13759888
Change-Id: Ibe3cf71afe0076c06eaf9cc94476a704e5d7a747
2021-04-13 03:43:46 +00:00
TreeHugger Robot
16b1e7c8cf
Merge "Integrate new version of MDC-android release" into sc-dev am: d8c11f5236
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13970091
Change-Id: Ib0e8f0a35e01674e8c50c75843dfb8829a0f4127
2021-04-13 03:43:14 +00:00
TreeHugger Robot
8c655662af
Merge "Fix nit from ag/13715126" into sc-dev
2021-04-13 03:32:59 +00:00
TreeHugger Robot
d8c11f5236
Merge "Integrate new version of MDC-android release" into sc-dev
2021-04-13 03:14:49 +00:00
TreeHugger Robot
00cd2a39d7
Merge "Update manage battery usage page string (1/2)" into sc-dev am: 94f4aeed44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160585
Change-Id: I0186d644828bded3a3ac1e4ea8a30310f5af2d11
2021-04-13 02:40:41 +00:00
TreeHugger Robot
eb97364183
Merge "Fix the backcolor problem in Display/Font size page" into sc-dev am: 3c8e922357
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14031887
Change-Id: Id03d1c5bd4ff96ebad821d3f79263432c4501aef
2021-04-13 02:40:21 +00:00
TreeHugger Robot
f5e4032648
Merge "Update string" into sc-dev am: 086fb08d76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14158848
Change-Id: I5a0930a4d602c4a58effd2021807be651cdae6ca
2021-04-13 02:39:38 +00:00
TreeHugger Robot
94f4aeed44
Merge "Update manage battery usage page string (1/2)" into sc-dev
2021-04-13 02:31:50 +00:00
TreeHugger Robot
3c8e922357
Merge "Fix the backcolor problem in Display/Font size page" into sc-dev
2021-04-13 02:23:00 +00:00
Weng Su
6884d63824
[Provider Model] Move down the Internet unavailable Wi-Fi
...
- Move down the Internet unavailable Wi-Fi to the top of the available
Wi-Fi networks
- Don't paint color for the Internet unavailable Wi-Fi
- Screenshot:
https://screenshot.googleplex.com/94NotfJLKXSbBW9
Bug: 178457619
Bug: 178926547
Bug: 178978070
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I1c98e2a8793ce9dc2fb886c0fa66f4297a34ab01
2021-04-13 10:04:33 +08:00
TreeHugger Robot
086fb08d76
Merge "Update string" into sc-dev
2021-04-13 01:59:35 +00:00