Sally Yuen
12166e5bb1
Merge "Add a banner for RBC/Extra Dim" into sc-dev
2021-04-13 16:18:57 +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
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
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
8c655662af
Merge "Fix nit from ag/13715126" into sc-dev
2021-04-13 03:32:59 +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
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
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
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
2216765159
Merge "Fix gender issue on subtext of screen pinning" into sc-dev
2021-04-12 09:48:40 +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
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
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
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
ykhung
bdaee1431f
Send fake data if there is no battey consumption entry list
...
Sends fake data into SettingsIntelligence if there is no data in the
battery consumption list, otherwise we don't have battery level data to
draw into the chart graph. We should draw the battery levels if it is
full-charged without any BatteryEntry data.
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I759e769256f4aa0ec152afff5c265ee3d04c03da
2021-04-11 22:54:27 +08:00
Chloris Kuo
2c955bbae2
NAS Setting Migration
...
Change NAS setting to a toggle setting and move the settings to
Notifications/General
Bug: 173106358
Test: tested manually on device, make RunSettingsRoboTests
Change-Id: I1ba1214511dceea6faf5fb39692d920e761b33d8
2021-04-10 18:22:44 -07:00
YUKAI HUNG
c024ec7cc9
Merge "Display the chart levels data into BatteryHistoryPreference" into sc-dev
2021-04-10 22:32:27 +00:00
Wesley.CW Wang
f1ca264f69
Refine battery settings layout
...
- Add loading text to progress bar to prevent UI flaky
- Setup enable/disable state for battery saver switch
- Remove battery saver page divider
Bug: 177964551
Bug: 177964753
Bug: 184626649
Test: make SettingsRoboTests, visually
Change-Id: I8e05c0c0f02710729e1f59eff23fb3f425770de9
2021-04-10 17:39:14 +00:00
ykhung
40319d9d6f
Avoid drawing the invalid levels in the chart view
...
Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Id540f35044beabe4d56ab5ce3af63271ac356f49
2021-04-10 10:51:47 +00:00
ykhung
740ac9a047
Display the chart levels data into BatteryHistoryPreference
...
Bug: 184807417
Bug: 180607918
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I78718a59671ca6775abc725432fbfbec6c0993fe
2021-04-10 10:48:09 +00:00
Suprabh Shukla
39086c24fd
Merge "Changes to "Alarms and Reminders" permission" into sc-dev
2021-04-09 22:27:50 +00:00
Abel Tesfaye
473fffa318
Merge "Add warning message when camera privacy lock is enabled for screen attention settings" into sc-dev
2021-04-09 16:31:36 +00:00
Sally Yuen
550072d0fa
Merge "Get Extra Dim availability through ColorDisplayManager" into sc-dev
2021-04-09 16:21:32 +00:00
Weng Su
688fa772b9
Modify Wi-Fi network details settings to restricted style
...
- Show restricted text in guest mode
- Screenshot:
https://screenshot.googleplex.com/Q5tbzn67EJigpVJ
Bug: 177573895
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test
Change-Id: I64c8d82518d47c7f96802f505efa380c63b9e10c
2021-04-09 23:10:24 +08:00
Rubin Xu
2f03bda6a6
Merge "Update titles & messages for password enrolment flows" into sc-dev
2021-04-09 15:03:19 +00:00
Jason Chiu
fecc24cc53
Merge "Guard against NullPointerException when getActivity in PanelFragment" into sc-dev
2021-04-09 14:25:31 +00:00
Rubin Xu
1ac05237ab
Update titles & messages for password enrolment flows
...
Show different titles and description messages when
enrolling password under various conditions:
* personal lock verus work lock
* adding a new lock versus updating existing lock
* enrolling a PIN verus password versus pattern
Add icons to options in screen lock picker.
Add an option to redirect to work lock flow if the admin
has set device-wide password requirement.
Bug: 183922696
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: I40417b113814659d3226a44eb7f9d553386e3c58
2021-04-09 14:35:36 +01:00
SongFerngWang
5c2b140483
The Network Select shows wrong operator name
...
It get the empty subscriptionInfoList from
SubscriptionManager#getAccessibleSubscriptionInfoList, so the UI
shows default subId's operator.
Since this item appears, when sim is active, using
getActiveSubscriptionInfoList is enough.
- https://screenshot.googleplex.com/9aHtDVpnYQBsiQr
Bug: 182020952
Test: atest MobileNetworkUtilsTest
atest OpenNetworkSelectPagePreferenceControllerTest
Change-Id: I0d86ec41236a0d1be657ccd57fd0cf90f96b8b89
2021-04-09 12:07:00 +00:00
ykhung
cdd73e7fec
Add kill-switch to distinguish chart or non-chart design
...
Bug: 184807417
Bug: 180607918
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iacbb012209d552b58b774f90f5b0aeb60ce6d33d
2021-04-09 07:21:06 +00:00
Wesley Wang
57f27f7a30
Merge "Support help message when battery is unavailable(1/2)" into sc-dev
2021-04-09 04:43:06 +00:00
TreeHugger Robot
a586dc3a96
Merge "wifi settings: Fix incorrect maximum compativibility toggle behavior" into sc-dev
2021-04-09 04:33:36 +00:00
Wesley.CW Wang
756028aadd
Support help message when battery is unavailable(1/2)
...
- Present help preference when battery is unavailable
Bug: 179237551
Test: make SettingsRoboTests
Change-Id: If6e82210d831123cb1169d53a18d24cb2c576b10
2021-04-09 11:24:51 +08:00
ykhung
318cc18f25
Add getBatteryHistory method to query data from SettingsIntelligence
...
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Idd640f8f8b07311fafc76f7b61c96c453ae7b604
2021-04-09 01:31:32 +00:00
lesl
80af71b92c
wifi settings: Fix incorrect maximum compativibility toggle behavior
...
Correct behavior:
maximize_compatibility (enabled) 2.4 GHz Single AP
maximize_compatibility (disabled) 5 GHz Preferred Single AP
Bug: 184802466
Bug: 184802508
Test: Manual Test to check toggle behavior
Test: RunSettingsRoboTests
Test: atest -c WifiTetherMaximizeCompatibilityPreferenceControllerTest
Change-Id: I0e97455ea9cf62294b50514ce912ef66d274db8d
2021-04-09 07:29:59 +08:00
Abel Tesfaye
5d6438391f
Add warning message when camera privacy lock is enabled for screen attention settings
...
Test: locally with flame, make RunSettingsRoboTests -j$(nproc)
ROBOTEST_FILTER=AdaptiveSleepCameraStatePreferenceControllerTest,
AdaptiveSleepPreferenceControllerTest
Bug: 177462182
Change-Id: I9880d6b82e9a5040534aceda4ff15275e0bcf72a
2021-04-08 19:40:58 +00:00
Oli Lan
b914ec91f1
Merge "Use DeviceConfig property for default value of clipboard access notification setting." into sc-dev
2021-04-08 11:31:12 +00:00
Wesley Wang
1e3a18a355
Merge "Update battery states text to support battery feature(1/2)" into sc-dev
2021-04-08 11:15:05 +00:00
TreeHugger Robot
9bf1412af7
Merge "Add icon to "Open [safety app] button" into sc-dev
2021-04-08 08:53:45 +00:00
Jeremy Goldman
ea42dd3c49
Merge "Update string associated with Connected, Always On or Insecure VPNs" into sc-dev
2021-04-08 08:50:53 +00:00
Jason Chiu
c4cead363c
Guard against NullPointerException when getActivity in PanelFragment
...
Fixes: 169729372
Test: build
Change-Id: I2f5bbb38015b71ecf82bc8ed7ab8e5815a2bd2f9
2021-04-08 16:39:27 +08:00