Commit Graph

81524 Commits

Author SHA1 Message Date
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
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
fd90481468 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: Icacf39dc92f43d4d4ee0aaf411b36bc9f7c186ad
2021-04-12 21:25:00 +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
470ae5d8bd 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: I3e883a2d643d18881ddfdb6c363beb2dcc175473
2021-04-12 17:42:14 +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
318589554c 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: Icfd2b89069a5a47da453c44cd025695fb4c965e1
2021-04-12 14:04:38 +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
7d62caa231 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: If5c45773f43d773e794a797820d919bb0a8bda0a
2021-04-12 10:54:47 +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
ef25c9e623 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: I14a477d77e0074c0efc9d570715a49154bdc9f18
2021-04-12 09:54:33 +00:00
TreeHugger Robot
d687df7a1b 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: Ibbd4b309ce1d318dc0760429f07f14a716130f3e
2021-04-12 09:53:18 +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
Tsung-Mao Fang
aa37e1dc4c Fix color lint error
Test: repo upload is OK.
Bug: 185091944
Change-Id: I52fa596dee5a17b8d29a771a18eced181a00ef6e
2021-04-12 08:57:21 +00:00
Tsung-Mao Fang
304c68a836 Fix gender issue on subtext of screen pinning
Create a new string id so that localization team can fix it
individually.

Test: Rebuilt rom and see correct subtext
Fix: 184748174
Change-Id: I3ab644950ee8211c89199446b92e759a5efa4527
2021-04-12 16:28:03 +08:00
Jeremy Goldman
3c4bd8101a Update string for editing an insecure VPN. am: 8371ee713d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14158845

Change-Id: I2421e52825da52574e0664b22dbd890b98220ecc
2021-04-12 08:07:19 +00:00
Jeremy Goldman
88ee31e269 Maintain VPN type form the VpnProfile
the connectedLegacyVpn may already exist within the VpnProfiles. Because
the stub profile generated from the LegacyVpnInfo does not contain type
information, overriding whether the VPN is insecure using this
information will provide an incomplete picture.

Test: atest -c SettingsUnitTests
Bug: 184922172
Change-Id: Icf2e08826c444863eaebdaa47bfd217795d2bad6
2021-04-12 15:37:19 +08:00
Hugh Chen
38fc9a91b5 Update string
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"

https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637

Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests

Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
2021-04-12 14:57:33 +08:00
Jeremy Goldman
8371ee713d Update string for editing an insecure VPN.
The new string comes from the connectivity s strings document: https://screenshot.googleplex.com/9nQFc9PFwgCYCFV
Test: atest -c SettingsUnitTests
Bug: 176821216
Bug: 184921649

Change-Id: I76257a4a2c2b9d5a49248296676d98980be9d77c
Merged-In: I76257a4a2c2b9d5a49248296676d98980be9d77c
(cherry picked from commit ec4b612932)
2021-04-12 06:21:27 +00:00
TreeHugger Robot
b2fff02b47 Merge "[Provider Model] Remove "Advanced" from Wi-Fi hotspot settings" into sc-dev am: 57a7c9b307
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140160

Change-Id: Ia06899eded9d3d29dffa8713d3c604ed94582f37
2021-04-12 05:08:11 +00:00
TreeHugger Robot
57a7c9b307 Merge "[Provider Model] Remove "Advanced" from Wi-Fi hotspot settings" into sc-dev 2021-04-12 04:38:07 +00:00
Weng Su
f53c4ca8ae [Provider Model] Remove "Advanced" from Wi-Fi hotspot settings
- Screenshot:
  https://screenshot.googleplex.com/B4vjvGdcQUL8YCR

Bug: 184907962
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: I934061c9129e77fc37381d1eba4a8107d40131eb
2021-04-12 11:22:48 +08:00
SongFerng Wang
fd992408c9 Merge "The Network Select shows wrong operator name" into sc-dev am: c7d2169120
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140145

Change-Id: Iae7948ee2a54a6b435f9eb016cc861a8282eb633
2021-04-12 02:49:31 +00:00
TreeHugger Robot
0fc34be653 Merge "Modify Wi-Fi network details settings to restricted style" into sc-dev am: feb811053f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140148

Change-Id: I4d091eb891b83a3c0c4c4ebc072b30c9c7bb3bcb
2021-04-12 02:49:24 +00:00
SongFerng Wang
c7d2169120 Merge "The Network Select shows wrong operator name" into sc-dev 2021-04-12 02:45:52 +00:00
TreeHugger Robot
feb811053f Merge "Modify Wi-Fi network details settings to restricted style" into sc-dev 2021-04-12 02:15:52 +00:00