Varun Shah
1d00be1ad5
Merge "Update the default wellbeing package config." into udc-dev am: 4cf335d53c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532865
Change-Id: Ic6a7dad6b860f114b972ae431f53fc25130e9093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 03:51:21 +00:00
Varun Shah
4cf335d53c
Merge "Update the default wellbeing package config." into udc-dev
2023-04-13 03:38:10 +00:00
Zaiyue Xue
29da0e6d9f
Fix b/277880435: System battery settings app crash
...
Bug: 277880435
Fix: 277880435
Test: manual
Change-Id: I369c04584c95c13e8636b5c9713e26e528ab627a
2023-04-13 11:23:46 +08:00
TreeHugger Robot
f2e7f45fe6
Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev am: 70ef00405c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573807
Change-Id: I8acb55c68dfa080548169dcbcc24b634aa2db297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:47:51 +00:00
Suprabh Shukla
5aeef97cae
Handle corner cases in "Alarms and Reminders" page
...
There are few corner cases and new updates that need to be incorporated:
1. Apps that declare USE_EXACT_ALARM, do not need SCHEDULE_EXACT_ALARM.
So these should be filtered out, regardless of whather they declared
the latter.
2. Apps that are in the power allowlist do not need either of the
permission, and so these should be filtered out as well.
In either case, if the user somehow ends up in the app detail page for
this setting, the switch should get disabled based on existing logic.
Test: make -j RunSettingsRoboTests
Test: Manually by UI inspection:
Settings -> Apps -> Special App access -> Alarms and Reminders
or by running:
adb shell am start -a android.settings.REQUEST_SCHEDULE_EXACT_ALARM
Bug: 232460265
Change-Id: I5aeab49f95260218878bc36f5a4d73a49e5082e4
2023-04-12 19:17:57 -07:00
TreeHugger Robot
70ef00405c
Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev
2023-04-13 02:16:15 +00:00
Daniel Huang
b009dc72a3
Merge "Use ScrollView to include the full layout." into udc-dev am: 6e55a52559
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573537
Change-Id: Icb6eda297355ad036fb5496534392049bba76483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 01:03:03 +00:00
Daniel Huang
6e55a52559
Merge "Use ScrollView to include the full layout." into udc-dev
2023-04-13 00:41:45 +00:00
Treehugger Robot
30f5c10510
[automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1 am: 5d93cea1c7 -s ours am: 2f0557495d -s ours am: d1267c1675 -s ours
...
am skip reason: skipped by user delphij
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258
Change-Id: Ib0730278efa661553c3a7a11f6cbb085e3886e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 21:13:23 +00:00
Treehugger Robot
d1267c1675
[automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1 am: 5d93cea1c7 -s ours am: 2f0557495d -s ours
...
am skip reason: skipped by user delphij
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258
Change-Id: I748bb0da37a29aca390990332e5872deb256b16f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 20:57:11 +00:00
Treehugger Robot
2f0557495d
[automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1 am: 5d93cea1c7 -s ours
...
am skip reason: skipped by user delphij
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258
Change-Id: Iff5558b9267a6282536f16601d67959e58c347d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 20:23:01 +00:00
Treehugger Robot
3ae935bc1f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8e95c6e66a -s ours am: dacb81d743 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: I358e473fcfab1cf2ae14686efa59e7da6eaa50a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 20:17:51 +00:00
Bill Yi
009f4b1ee3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817fa66f8b -s ours am: d145911bf1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: I49abc6aac58d8989d5984e8d91541f2968870535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 20:17:14 +00:00
Lucas Silva
3b1c739ce2
Add intent for entering communal settings
...
This allows other apps to link to communal settings.
Fixes: 276742740
Test: adb shell am start -a android.settings.COMMUNAL_SETTINGS
Test: switched to secondary user, attempted to launch using command
above. Verified it didn't work
Change-Id: I5e845ecba58d8443d41aeea95bc6068a0041cac8
2023-04-12 20:01:14 +00:00
Treehugger Robot
dacb81d743
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8e95c6e66a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: I820a1cf4aa87dfc27dd707a5580cdb2bc77dda7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 19:48:15 +00:00
Bill Yi
d145911bf1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817fa66f8b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: Idd2d1235c08bc145d4570476875db69efc8d9843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 19:47:52 +00:00
Bill Yi
4c6996b55c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc0dc12fce -s ours am: e5a98b540e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567288
Change-Id: Ibdb7a90dd2e56fae76a269bf78479cc306e6177a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 19:05:43 +00:00
Bill Yi
e5a98b540e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc0dc12fce -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567288
Change-Id: I2624e36dfdad37be6f90c209d4ea96e5e1db7a01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 19:02:18 +00:00
Treehugger Robot
5d93cea1c7
Merge "Merge TQ2A.230405.003" am: fd8670a4c1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258
Change-Id: I2ebe468438118d275db0ee38a0c0c624207bd771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 19:00:58 +00:00
Treehugger Robot
8e95c6e66a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-04-12 18:38:34 +00:00
Hao Dong
e5946f6858
Merge "Fix biometrics unicorn consent string bug." into udc-dev am: ad5954bc94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22578994
Change-Id: I8e08c8cb75e1ae7c794be59081b12c48a79f0735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 18:30:51 +00:00
Hao Dong
ad5954bc94
Merge "Fix biometrics unicorn consent string bug." into udc-dev
2023-04-12 18:02:16 +00:00
Treehugger Robot
fd8670a4c1
Merge "Merge TQ2A.230405.003"
2023-04-12 17:22:25 +00:00
ykhung
836dc0d76c
Remove plug/unplug condition for the incompatible charging
...
Remove the plug/unplug condition checking for the incompatible
notification based on the feedback from:
https://b.corp.google.com/issues/276403405#comment3
Bug: 276403405
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Change-Id: Iec177ed33a3cc8cf5a5747b6f65440d31120823c
2023-04-13 00:29:11 +08:00
YK Hung
3c47574638
Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev am: e4c3f68b56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573805
Change-Id: I75cc6c46eaa0fdb5436a600ccd70d851417e2c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 16:11:29 +00:00
YK Hung
e4c3f68b56
Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev
2023-04-12 15:43:48 +00:00
Sunny Shao
b0885a155a
Add a feature flag for SPA metrics
...
- Add a new SETTINGS_ENABLE_SPA_METRICS flag.
Fixes: 277540990
Bug: 253979024
Test: atest SpaActivityTest SpaLogDataTest MetricsDataModelTest
Change-Id: I6da801691fd34fd133ec25d3a45ed6124bec51a1
Merged-In: Iba7a44715cf6ba78c3b84d559faf71a0be33d8d3
2023-04-12 21:38:40 +08:00
SongFerngWang
4c206e1a11
Fix the IndexOutOfBoundsException
...
Bug: 276460284
Test: build pass
Change-Id: If70bd4624b9b94aafa0930f0deba106cff5a2212
2023-04-12 19:50:51 +08:00
Treehugger Robot
7bf829b4a6
Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c am: 525b567db3 am: a7152b9573
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819
Change-Id: I4ff3013a2cfe2f8839f542383333a8de3b40e3ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 11:23:54 +00:00
Treehugger Robot
a7152b9573
Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c am: 525b567db3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819
Change-Id: Ic9c46e521d8ae7b85dc63fa593e5f05951f596a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 10:51:42 +00:00
Elliot Sisteron
6a1ec7553c
Redirect to the right combined biometrics in work profile.
...
Bug: 277760649
Test: manual
Change-Id: Iab3e46a6964ceb4bf2241560ad7820844f8ae88c
2023-04-12 10:46:01 +00:00
Chaohui Wang
e13d644f2c
Fix create bluetooth dialog repeatedly
...
When the screen rotates, currently the startActivityForResult() within
RequestPermissionActivity could be called multiple times, so the
multiple RequestPermissionHelperActivity will be created, which caused
the issue.
Replace RequestPermissionHelperActivity with AlertDialog (as an
unfinished TODO of RequestPermissionHelperActivity) can fix this issue.
Fix: 243601277
Test: Manually with adb shell commands
Test: Unit test
Change-Id: If1e2b2807b69a87bbcfffa543ee0da134d4c4312
2023-04-12 18:34:52 +08:00
Weng Su
9f80cd2f77
Add Wi-Fi hotspot > Security Settings page
...
- Restrict low security type when 6 GHz band is selected
- Disable "WPA2/WPA3-Personal" security type
- Disable "WPA2-Personal" security type
- Disable "None" security type
- Automatically updated security type to WPA3 when 6 GHz band is selected
- Regenerate password when security type is changed from None
Bug: 245258763
Test: manual test
atest -c WifiTetherSettingsTest
atest -c WifiTetherViewModelTest \
WifiHotspotSecuritySettingsTest \
WifiHotspotSecurityViewModelTest \
WifiHotspotRepositoryTest
Change-Id: I31b08795419baed10dc40b876aeec175f6f41e69
2023-04-12 18:19:49 +08:00
Treehugger Robot
525b567db3
Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819
Change-Id: I4dfc995e7185c5cb7a599156d71a198bd434cb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 10:18:17 +00:00
Marcelo Arteiro
ad2457b1ee
Merge "Fix for Check mark color on Regional preferences" into udc-dev am: cab738bf39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573598
Change-Id: I296d9ac0ad5d7d158a505e7ab06ad197bb73b1d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 10:12:21 +00:00
Vania Januar
a24e7dc12a
Merge "Add developer options to force enable Notes role." into udc-dev am: b79772ac3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22459282
Change-Id: Idd920bd878a20f69844c3d10ded90317ec35981b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 10:09:19 +00:00
Treehugger Robot
5a88b6f2ff
Merge "Fix App languages for work profile" into udc-dev am: 568ba14b9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530839
Change-Id: I0f2ff46d57f9d4bd5b1f6722df21a5f31fb5f804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 10:07:08 +00:00
Marcelo Arteiro
cab738bf39
Merge "Fix for Check mark color on Regional preferences" into udc-dev
2023-04-12 10:05:10 +00:00
Marcelo Arteiro
df3bf351cd
Fix for Check mark color on Regional preferences
...
https://screenshot.googleplex.com/BkRTpomGg7oXP6C
Test: Manual
Fix: 272398108
Change-Id: Ic762215e35058731ddbd3ea042cb14e0a135793c
2023-04-12 10:04:47 +00:00
Vania Januar
b79772ac3a
Merge "Add developer options to force enable Notes role." into udc-dev
2023-04-12 09:54:15 +00:00
Treehugger Robot
ff6def3c7c
Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819
Change-Id: If249a6b219c344edbddade320f06c9f512bffd18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 09:48:24 +00:00
Treehugger Robot
568ba14b9b
Merge "Fix App languages for work profile" into udc-dev
2023-04-12 09:35:32 +00:00
Zaiyue Xue
a2ab3ae5b3
Small refactor battery usage code according to the comments in previous cls.
...
Bug: 262802531
Test: presubmit
Change-Id: I0d496fc6a41af5964311dafe8dd89f8b8058de82
2023-04-12 17:24:16 +08:00
Treehugger Robot
1452f7dd3a
Merge "Align Settings and SystemUI packageName references"
2023-04-12 08:53:22 +00:00
danielwbhuang
d318ac5672
Use ScrollView to include the full layout.
...
1. Use ScrollView
2. Give ListView a fixed layout_height
Demo: https://screencast.googleplex.com/cast/NDg1NTE0OTI0MDUxNjYwOHxjNGVjYTA4OC03OQ
Bug: 276416718
Bug: 277153488
Test: manual
Change-Id: Ib1404bb060bf2ca448fe636db07b93c16ce14673
2023-04-12 16:17:35 +08:00
YK Hung
d02dc7bf44
Merge "Optimize screen time cross power connection logic from O(N^2) to O(N)" into udc-dev am: c00fb2efbd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573802
Change-Id: I4ba487e2cf980336e73ac28c6166625367b9b2c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 07:40:37 +00:00
David Liu
dd39b890a9
Merge "Update Settings owners list" am: 1a811a130a am: ae70edc7f5 am: a6cd016e9a am: 65136fa9f8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2531959
Change-Id: I06e08915ac2b06a2e9042957e2271a10030f2d1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 07:40:18 +00:00
Treehugger Robot
e1d5cef1a5
Merge "[BiometricsV2] IconTouchDialog continue enroll" into udc-dev am: eb3e62f639
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552762
Change-Id: I0cf610f65f2c374812665ea34141e22cce909c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 07:39:49 +00:00
Treehugger Robot
dd0abb0c47
Merge "Fix empty icon while tapping Auto-rotate screen widget" into udc-dev am: 104e412077
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569799
Change-Id: If7636eb2fa2bfb172b19006e668e22674eadc5bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 07:39:18 +00:00
YK Hung
577619ea3a
Merge "Draw vertical dividers with different colors if it has a timestamp label" into udc-dev am: c89b8e6d78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525849
Change-Id: I9ae4e2ccbb4e1ed4cf2143ab5767cf55790064a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 07:37:18 +00:00