Commit Graph

81480 Commits

Author SHA1 Message Date
YUKAI HUNG
933e19bed5 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: Ice852cd5a8ccf25c794e199e941cf4f6155c9c8c
2021-04-14 03:42:23 +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
8d7f68e28d 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: I77fc4558b30a9afccd8a7d0d6e64a4171b1fb59d
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
Dmitri Plotnikov
456b0996fc 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: Id6e5bb90010b3964e854920f3dae3ffe8bed181c
2021-04-13 23:49:21 +00:00
Dmitri Plotnikov
26db6e5f8e Merge "Adjust for changing BatteryUsageStats constructor" into sc-dev 2021-04-13 23:44:29 +00:00
TreeHugger Robot
d64f9c3d14 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: I759b217a29afd6dded9eba0a7ff5f7906a38455a
2021-04-13 22:39:50 +00:00
TreeHugger Robot
ea4ab07b63 Merge "Update getOwnersForDomain usage to SortedSet" into sc-dev 2021-04-13 21:54:12 +00:00
Sally Yuen
3feaa92a95 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: I398050d0924d8a49f65177d5a91c2925678e63fc
2021-04-13 17:13:00 +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
3af3569b92 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: I8ee98708c96ba296fbd74f666dc2830dcfec9a76
2021-04-13 08:50:04 +00: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
7834be7823 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: If2786b42478ac86f43be32d63babc335a384e772
2021-04-13 06:53:22 +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
e62270a171 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: Ic675151a0269f6aa0326e6dd6636e56a7920e49b
2021-04-13 04:27:26 +00: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
e51db78711 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: I8a0c8a79045c6b9cea119705964862552245979c
2021-04-13 03:43:22 +00:00
TreeHugger Robot
c950d8af6b 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: Ibe2ff69557dc6e3039028ecbcac7d19bb8336e85
2021-04-13 03:42:43 +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
0760dda3b7 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: I156d34c246dd4f306dd7f0b4c05b6bf9655fd1a2
2021-04-13 02:42:11 +00:00
TreeHugger Robot
64adfb888e 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: I7bd40027ee310f30b284d605241deaa9a6cf6773
2021-04-13 02:42:04 +00:00
TreeHugger Robot
a976cbecfd Merge "Update string" into sc-dev am: 086fb08d76
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14158848

Change-Id: Ia8bf769d08d5a9f7328bea9e460493bd7f75d240
2021-04-13 02:41:28 +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
sallyyuen
fbdb01dc87 Add a banner for RBC/Extra Dim
Screenshot: https://screenshot.googleplex.com/5kumq7ruwCzd6vC.png

Test: Manual
Bug: 170973645
Change-Id: Iea9d90ded5fc393b78e724ec10bc83ff7295965c
2021-04-13 01:07:26 +00:00
Jay Aliomer
51a84f5ec9 Merge "Notif History Visual Buff" into sc-dev am: 7f0888a6a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14143246

Change-Id: Ibf16bc025602b7446e6631b485c4445f3df5761e
2021-04-12 21:24:55 +00:00
Jay Aliomer
7f0888a6a0 Merge "Notif History Visual Buff" into sc-dev 2021-04-12 20:40:52 +00:00
Jay Aliomer
01af86409d Notif History Visual Buff
Bug: b/184885964
Test: visual
Change-Id: I390c01bd743ebed020cc8a1a05e8c70d4e9b4eb7
2021-04-12 20:40:43 +00:00
Dmitri Plotnikov
f2f2fd52a2 Adjust for changing BatteryUsageStats constructor
Bug: 184207674
Test: make RunSettingsRoboTests
Change-Id: I9f2ec8ff6764100022b0580f4a7d4281062d8755
2021-04-12 11:24:05 -07:00
Chloris Kuo
fb8b6198c2 Merge "NAS Setting Migration" into sc-dev am: ccd2bfc1a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13923001

Change-Id: I20634338c39397650e75f7c069f396454d4d536b
2021-04-12 17:43:18 +00:00
Chloris Kuo
ccd2bfc1a0 Merge "NAS Setting Migration" into sc-dev 2021-04-12 17:16:50 +00:00
Janis Danisevskis
cb79648ab1 Fix nit from ag/13715126
Test: N/A
Bug: 171305607
Bug: 171305388
Change-Id: I3e674387522bbacdbe0df70746b521b059819007
2021-04-12 09:42:28 -07:00
ykhung
aeb5b95705 Add a method to calculate battery usage diff results from history
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: If613c5cfd7e00e1883107385d3d8552774378cd7
2021-04-13 00:25:17 +08:00
TreeHugger Robot
f724367ed9 Merge "Use ConstraintLayut to improve UI of storage items" into sc-dev am: 588e4e8d8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111144

Change-Id: If11715a4183ab2d5d105861037b63d0d11d5901a
2021-04-12 14:04:31 +00:00
TreeHugger Robot
588e4e8d8b Merge "Use ConstraintLayut to improve UI of storage items" into sc-dev 2021-04-12 13:30:30 +00:00
Wesley.CW Wang
e9a0d50e99 Update manage battery usage page string (1/2)
Bug: 183689347
Bug: 178197718
Test: make SettingsRoboTests
Change-Id: Ib24b74c8c38ef28520deed043a4b1841b8a50803
2021-04-12 12:58:20 +00:00
Jeremy Goldman
eae0433642 Merge "Maintain VPN type form the VpnProfile" into sc-dev am: 4ee56ab90d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14158852

Change-Id: I1985e93ed4a1b2f908bb48516a17e91f2053d525
2021-04-12 10:54:20 +00:00
Jeremy Goldman
4ee56ab90d Merge "Maintain VPN type form the VpnProfile" into sc-dev 2021-04-12 10:10:11 +00:00
Wesley.CW Wang
d081de87b8 Reorder battery tips priority
- Change the oreder to Battery Low > Defender > High Battery Usage > Adaptive Battery

Bug: 177407113
Test: make SettingsRoboTests
Change-Id: I7000a0aef30bff90c7aedfd5a43b2229529886e9
2021-04-12 17:58:21 +08:00
TreeHugger Robot
76d6f894bc Merge "Fix gender issue on subtext of screen pinning" into sc-dev am: 2216765159
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14158858

Change-Id: Iffc73845dc84b248b8d8d46284e19e29441912d6
2021-04-12 09:54:23 +00:00
TreeHugger Robot
179da6ed66 Merge "Fix color lint error" into sc-dev am: e63e2a781c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14158856

Change-Id: I8111b0e1e11f7b3c5142f7dc60bd09cd26bc6764
2021-04-12 09:53:00 +00:00
TreeHugger Robot
2216765159 Merge "Fix gender issue on subtext of screen pinning" into sc-dev 2021-04-12 09:48:40 +00:00
TreeHugger Robot
e63e2a781c Merge "Fix color lint error" into sc-dev 2021-04-12 09:33:10 +00:00