Commit Graph

13569 Commits

Author SHA1 Message Date
Jack He
5255875f33 Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232 am: ee25171aa1 am: 130f27d48f am: ab38192a1f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159

Change-Id: Ia5f8c005e1700fb512f6429125f0d47379d9bc92
2021-04-14 07:31:52 +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
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
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
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
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
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
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
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
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
SongFerng Wang
8991225949 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: I7e70fc63e1e17bddfe38455717af5e24d9a9df7c
2021-04-12 02:49:09 +00:00
TreeHugger Robot
ce080e6c66 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: Ie4643781afc9e05773b08547e3d1f24a10ea4d55
2021-04-12 02:48:49 +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
ykhung
305cb2d95c Send fake data if there is no battey consumption entry list am: bdaee1431f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140156

Change-Id: I185246d4516efe96c72bc0c4c853ccfb5d8be3aa
2021-04-11 16:51:29 +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
Wesley.CW Wang
f75feb6ee5 Refine battery settings layout am: f1ca264f69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14139746

Change-Id: I4468c1dc24f6df57aafc2bf524db64d7af0a4e07
2021-04-10 18:35:26 +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
Suprabh Shukla
a4d354f673 Merge "Changes to "Alarms and Reminders" permission" into sc-dev am: 39086c24fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14095813

Change-Id: I644442b4d41b343bfc1aebcc2c42ac2f9dc7ce82
2021-04-09 23:00: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
9435e52d3f Merge "Add warning message when camera privacy lock is enabled for screen attention settings" into sc-dev am: 473fffa318
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13989325

Change-Id: I534663b249ccb4cda1b32918b1c68feb275458d3
2021-04-09 17:10:41 +00:00
Sally Yuen
5da6456c18 Merge "Get Extra Dim availability through ColorDisplayManager" into sc-dev am: 550072d0fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14096656

Change-Id: Ib8e66116813f18fa3d38b5ba973399089e20dbd8
2021-04-09 17:08:38 +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
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
52a0f72c87 Add kill-switch to distinguish chart or non-chart design am: cdd73e7fec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14127336

Change-Id: Icc86474ce123f8ae8d128d8dbfda23d896d071d1
2021-04-09 10:57:11 +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
fecca0ec3f Merge "Support help message when battery is unavailable(1/2)" into sc-dev am: 57f27f7a30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14124308

Change-Id: I7b4da94c19efcf4b5af8a838adbb05865dc330e1
2021-04-09 05:12:34 +00:00
TreeHugger Robot
839077f5e1 Merge "wifi settings: Fix incorrect maximum compativibility toggle behavior" into sc-dev am: a586dc3a96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14124309

Change-Id: I427fcf75c1a0d820e5f6a59871338a2d5f418ed0
2021-04-09 05:12:23 +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
ykhung
057307c89c Add getBatteryHistory method to query data from SettingsIntelligence am: 318cc18f25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14119822

Change-Id: I1327aa3f0b10a066b59d8cf08dd5febb16d10e85
2021-04-09 03:42:58 +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
ee93f873a6 Merge "Use DeviceConfig property for default value of clipboard access notification setting." into sc-dev am: b914ec91f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13877345

Change-Id: I077bf3de71784fa79672a77dd90d492de6263038
2021-04-08 12:05:18 +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
ff847ec1c3 Merge "Update battery states text to support battery feature(1/2)" into sc-dev am: 1e3a18a355
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111141

Change-Id: I3d57d2ce88ae0c64955a091920863236979c706c
2021-04-08 11:17:13 +00:00