Commit Graph

14744 Commits

Author SHA1 Message Date
Wesley Wang
eda172ce2c Fix app battery usage list launch incorrect works app
- App usage page only use package name to launch the page, it can not
   identify the different userId between normal app and work profile
   app, add extra userId info into launch args
 - Remove no battery usage state/string if usage time is empty

Bug: 251471047
Test: make SettingsRoboTests
Change-Id: Id06ebb0f0fcd863e423acd7839f89bc0ae2444c1
2022-11-03 11:32:30 +00:00
Joshua Mccloskey
1cda0a8418 Merge "Revert^2 "Implement SFPS “require screen on to auth”"" 2022-11-02 14:33:18 +00:00
Arc Wang
3b1587d6b2 Remove Intent selector from 2-pane deep link Intent
To guard against the arbitrary Intent injection through Selector.

Bug: 246300272
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsActivityTest
Change-Id: I8b3b936de490f09f4be960fdafc6e66a1d858ee2
2022-11-02 07:37:45 +00:00
TreeHugger Robot
8b23aa2c16 Merge "Disallow screenshot on Wi-Fi QR code settings" into tm-qpr-dev am: d2635580fb am: 34471a7160
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309947

Change-Id: I27396019f31117f69f9088174ed52c6ce3526556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 00:35:02 +00:00
TreeHugger Robot
34471a7160 Merge "Disallow screenshot on Wi-Fi QR code settings" into tm-qpr-dev am: d2635580fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309947

Change-Id: Id9e378514d71beef1a4dcb9ab0c96053dabe254f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 00:03:28 +00:00
TreeHugger Robot
d2635580fb Merge "Disallow screenshot on Wi-Fi QR code settings" into tm-qpr-dev 2022-11-01 23:21:35 +00:00
Joshua Mccloskey
73bf45ee4b Revert^2 "Implement SFPS “require screen on to auth”"
e62d37bad6

Change-Id: Ia44604b059c4847c40608419b2e16219976ced3e
2022-11-01 16:45:31 +00:00
Michał Brzeziński
8205d3d591 Merge "Revert "Implement SFPS “require screen on to auth”"" 2022-11-01 13:36:11 +00:00
Michał Brzeziński
e62d37bad6 Revert "Implement SFPS “require screen on to auth”"
Revert submission 20298870-cherrypick-require-screen-on-to-auth-bx2kw8azs3

Reason for revert: broken KeyguardUpdateMonitorTest
Bug: 256762678
Reverted Changes:
Id58879642:Implement SFPS “require screen on to auth”
Ibc55dfa66:Implement SFPS “require screen on to auth”

Change-Id: I772f6a1b3fa366bc10b200f365df79417eceb8ef
2022-11-01 11:28:30 +00:00
Angela Wang
bd25f4a303 Merge "Fix should not let users adjust a11y button settings in SuW issue" 2022-11-01 09:25:46 +00:00
Kuan Wang
628f12c1ad Remove isChartGraphEnabled() which should always return true after
migration.

Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: I0c4a6e00a7a9fd66d4050e5ddcf87176462067cd
2022-11-01 07:58:57 +00:00
Kuan Wang
a79edc3b56 Merge "Replaces getBatteryHistoryUri and getBatteryHistorySinceLastFullCharge with the new functions in DatabaseUtils." 2022-11-01 07:11:04 +00:00
Angela Wang
c4f3295491 Fix should not let users adjust a11y button settings in SuW issue
Root Cause: Users should not be able to adjust any settings of the a11y
button in the setup wizard flow, but there will be a link button to
a11y button settings page on the a11y tutorial dialog where user can
modify the settings.

Solution: Hide the link button in a11y tutorial dialog if we know the
dialog is launched from any setup wizard page.

Bug: 256084341
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityGestureNavigationTutorialTest
Change-Id: I742f9b7ba311fcd7a5105463709dc104345b9f12
2022-11-01 07:07:47 +00:00
Kuan Wang
45be6bae05 Listen ACTION_BATTERY_LEVEL_CHANGED in Settings and fetch usage data
when battery is full charged.

Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: Ie83e5f319074ff404a600c4eb375fbecad651b6d
2022-11-01 06:39:21 +00:00
Joshua Mccloskey
087a7d29f4 Merge "Implement SFPS “require screen on to auth”" 2022-11-01 04:55:05 +00:00
Arc Wang
67dc170d66 [Activity embedding] Fix unexpected finished 2nd layer problem am: 9e207bfcd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309891

Change-Id: I0ed23ce19ce4dca5308ecae20e891f4476738258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 02:54:36 +00:00
Kuan Wang
c5c87b7774 Replaces getBatteryHistoryUri and getBatteryHistorySinceLastFullCharge
with the new functions in DatabaseUtils.

Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: I5f60cef80d1e9ba3f87ab6f84492463152a40276
2022-11-01 02:06:57 +00:00
Kuan Wang
df05a1378b Add hourly period job to fetch battery usage data in Settings.
Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: I342066a30fed202e5013b8c2554f36d991975c3e
2022-11-01 02:05:14 +00:00
Treehugger Robot
9040efdccc Merge "Fix errorprone warnings that should be errors" am: 5744d7c560 am: 7094507528 am: 778ef161bb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255054

Change-Id: I1f3cbce7d5de6e63477bc2da2ad115ec53b06472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 00:02:10 +00:00
Treehugger Robot
778ef161bb Merge "Fix errorprone warnings that should be errors" am: 5744d7c560 am: 7094507528
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255054

Change-Id: I369fd8dc4e2cec46ffd4e61a32e7e55cb11b41a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 23:24:11 +00:00
Treehugger Robot
7094507528 Merge "Fix errorprone warnings that should be errors" am: 5744d7c560
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255054

Change-Id: I65ce6c4fdedd32ff6feb4b5e210b508aafc4e589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 22:57:02 +00:00
Treehugger Robot
5744d7c560 Merge "Fix errorprone warnings that should be errors" 2022-10-31 22:21:12 +00:00
Bonian Chen
525529c137 Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Bonian Chen
e3b5bda8aa Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Bonian Chen
f192a07988 Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Bonian Chen
c5bd2f425b Merge "[Settings][Back port] configuration for hidding SIM settings UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Bonian Chen
4c06b549bf Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Bonian Chen
a81f71ae46 Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev-plus-aosp 2022-10-31 15:49:21 +00:00
Arc Wang
9e207bfcd0 [Activity embedding] Fix unexpected finished 2nd layer problem
If Settings is started on an existing task, the existing SplitPairRule
may cause an unexpected app finish while navigating back from the
2nd layer page.

This change resets SplitPairRule in onNewIntent().

Bug: 247080168
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsHomepageActivityTest
      manual
      1. Settings app -> 'Connexted device'.
      2. Launch Settings app again from Settings icon in quick Settings.
      3. Start a 3rd layer from 'Network & internet'
      4. Click back and see if the 2nd lay shows.
Change-Id: I262327cc49c3a4434a183eb00ac57f47fa598f70
Merged-In: I262327cc49c3a4434a183eb00ac57f47fa598f70
2022-10-31 21:33:02 +08:00
TreeHugger Robot
bb17108f72 Merge "Remove "Hotspot" key from settings search if not needed" into tm-qpr-dev am: 58292e7058 am: 155beb0610
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20307409

Change-Id: I08bf5d2cdbd4a1e038af7c54468d39590f72e7c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 09:27:40 +00:00
Weng Su
950837b20f Disallow screenshot on Wi-Fi QR code settings
- Add FLAG_SECURE to WifiDppConfiguratorActivity to avoid screenshot security issue

Bug: 249980936
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppConfiguratorActivityTest

Change-Id: I5e62c2584122f79127ab505e8491565e163de296
2022-10-31 08:59:40 +00:00
TreeHugger Robot
155beb0610 Merge "Remove "Hotspot" key from settings search if not needed" into tm-qpr-dev am: 58292e7058
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20307409

Change-Id: I87b186f17e8126638d5d09d6e9970b590d12ff6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 08:51:31 +00:00
TreeHugger Robot
58292e7058 Merge "Remove "Hotspot" key from settings search if not needed" into tm-qpr-dev 2022-10-31 08:10:57 +00:00
Bonian Chen
b4a8672dd9 [Settings][Back port] configuration for hidding SIM settings UI
Hide SIM settings UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Merged-In: I3d8b9b02998f09122a63f2262817acff3ca84d2e
Change-Id: I32169dc7d21164ca40297e75ca9122ecb9ade039
2022-10-31 07:09:37 +00:00
Arc Wang
812c7d7953 Merge "[Activity embedding] Fix unexpected finished 2nd layer problem" 2022-10-31 05:50:14 +00:00
Arc Wang
31eec49217 [Activity embedding] Fix unexpected finished 2nd layer problem
If Settings is started on an existing task, the existing SplitPairRule
may cause an unexpected app finish while navigating back from the
2nd layer page.

This change resets SplitPairRule in onCreate().

Bug: 247080168
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsHomepageActivityTest
      manual
      1. Settings app -> 'Connexted device'.
      2. Launch Settings app again from Settings icon in quick Settings.
      3. Start a 3rd layer from 'Network & internet'
      4. Click back and see if the 2nd lay shows.
Change-Id: I262327cc49c3a4434a183eb00ac57f47fa598f70
2022-10-31 05:48:45 +00:00
Zoey Chen
77e38838a4 Merge "[Settings] Do not creat multiple database" 2022-10-30 13:17:25 +00:00
Lucas Silva
11a5067ee5 Update the "When to dream" settings am: 47d84b41ac am: 0e7f4d87ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20302008

Change-Id: Id60e4ff240602ef42905a5af46f0ac77bde17f9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 21:07:21 +00:00
Lucas Silva
0e7f4d87ce Update the "When to dream" settings am: 47d84b41ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20302008

Change-Id: Id0ae8f8af81ab9cea7e61b1050e077afbe51a1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 20:34:09 +00:00
Lucas Silva
47d84b41ac Update the "When to dream" settings
For devices which don't support dreaming on battery, we can offer
simpler options since the device must always be charging for
screensavers to appear. Therefore there are only two options:

1. While charging
2. While docked and charging

Test: flashed and verified on device
Test: make -j64 RunSettingsRoboTests
Fixes: 226187572
Change-Id: I6ed24cda8874f2fb941f6cfded9ed97ed78a3cb6
2022-10-28 13:07:36 -04:00
Zoey Chen
97291ac0ad [Settings] Do not creat multiple database
Bug: 254405469
Test: manual
Change-Id: I96ea77899270439a87569bd1676d38b52dd36650
2022-10-28 11:07:39 +00:00
Bonian Chen
95dc65667e [Settings][Back port] configuration for hidding SIM provider UI
Hide SIM provider UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b
Change-Id: Ie618485ba5c5fd0223f5c8ba279b3ed418c67e11
2022-10-28 09:50:49 +00:00
Bonian Chen
2b048b22f0 [Settings][Back port] configuration for hidding SIM related UI
Add overriable configuration for hidding SIM related UI.

Bug: 240515161
Test: test cases and local testing
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Change-Id: I709a8007362b09dbb1ec1bd5d32c68d23ed0cfa9
2022-10-28 09:49:21 +00:00
Bonian Chen
f6114d3f83 [Settings][Back port] configuration for hidding SIM remove UI
Hide SIM remove UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: Iea40b89733cc75a41f960fecb2ac24177a4cbd3d
Change-Id: I866b2dd566ffa9953f2a83aa3dcb32440390898a
2022-10-28 09:48:46 +00:00
Bonian Chen
0466417c76 [Settings][Back port] configuration for hidding SIM lock UI
Hide SIM lock UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: I870c0b53112db56b7bc80bfd585f6f7b3cf82737
Change-Id: I03861e53c600e2a19c634700360811fbc01b8a60
2022-10-28 09:48:25 +00:00
Bonian Chen
02e4807229 [Settings] configuration for hidding SIM notification UI
Hide SIM notification UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: I07d9ddeb96ca590decf28126ce97fba4c1783304
Change-Id: I7a912a3393694155d29614d325796e08598985bf
2022-10-28 09:47:57 +00:00
Weng Su
105937d90f Remove "Hotspot" key from settings search if not needed
- Remove "Hotspot" search key from TetherSettings

- Disable page search from WifiTetherSettings

Bug: 243876722
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: Ie04027600663321b35d8309c59084f630103e959
2022-10-28 14:34:11 +08:00
Yining Liu
923cdcae41 Fix text in notification settings for apps that do not send notifications am: e899b4c96c am: 7f6b3cc7ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20283152

Change-Id: I3b63362fab7d5c532d231b7db82553fc9a7bde4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 00:23:19 +00:00
Yining Liu
7f6b3cc7ca Fix text in notification settings for apps that do not send notifications am: e899b4c96c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20283152

Change-Id: Ic748f560f9a4767b6c75349506ae569cde1473af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27 23:29:27 +00:00
Grace Cheng
0f0f35b2dd Implement SFPS “require screen on to auth”
Creates new setting on SFPS to require screen on before unlocking a
device. Also sets up toggles for this setting at the end of fingerprint
enrollment and on the fingerprint settings page, and adds tests to
verify expected behavior.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsRequireScreenOnToAuthPreferenceControllerTest
Fixes: 249169615
Fixes: 245343077
Fixes: 248530806
Change-Id: Id588796426d071860b3cc2af9ec5798c0027c202
2022-10-27 21:43:55 +00:00