Chaohui Wang
b515ed5fee
Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a
am: 47803f6b10
am: fc275fef2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155
Change-Id: I2d9d02579aec65fdc5916522563fad4daada58c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 09:54:45 +00:00
Chaohui Wang
fc275fef2e
Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a
am: 47803f6b10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155
Change-Id: I624e8cf060dae2dfb7a1b0b06c4610adeeddde79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 09:12:13 +00:00
Jean Chen
9a2e9c966b
Merge "Set the shortcut size to large when user enabled Magnification" into main
2023-07-11 07:43:01 +00:00
Treehugger Robot
70c66ab121
Merge "Add a mechanism to log battery usage periodic job events" into udc-qpr-dev am: 4ac05f8cac
am: 5c046f1d4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23971085
Change-Id: I36e646b84ae373672328a6f145803ef5743a33b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 07:07:38 +00:00
Treehugger Robot
4ac05f8cac
Merge "Add a mechanism to log battery usage periodic job events" into udc-qpr-dev
2023-07-11 06:09:54 +00:00
Jean
137cc9af68
Set the shortcut size to large when user enabled Magnification
...
Set the settings shortcut size to large when the Magnification shortcut it enabled. Provide users with the large size as the default, which is easy to see.
Bug: 283844702
Test: manually - attach videos in the bug
Test: atest ToggleScreenMagnificationPreferenceFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I8fac5780b8388b1b4f124cffbdd305235f035e72
2023-07-11 02:21:09 +00:00
Treehugger Robot
3365eb3e7a
Merge "Improve volume slider" into main
2023-07-10 10:27:21 +00:00
Jason Chang
c805b2e163
Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev am: 5a0d4d1cc3
am: 17d1e70930
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712165
Change-Id: Ic73f5be63e2d9de3ede40fcfdb63357cab867634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-10 04:19:00 +00:00
Jason Chang
5a0d4d1cc3
Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev
2023-07-10 03:06:07 +00:00
Treehugger Robot
3943e14eff
Merge "Fix do not disturb bypass user restriction" into main
2023-07-10 02:44:53 +00:00
Chaohui Wang
590b4e7af8
[Regulatory Labels] Load labels from overlays
...
When config_regulatory_info_overlay_package_name is configured, load
regulatory labels directly from overlay package.
Also fix RegulatoryInfoDisplayActivity missing dialog theme.
Bug: 283170651
Test: unit test
Test: manual - check regulatory labels
Change-Id: Ia1f6848abe0da9facf34f47abab09e88d57e74d6
2023-07-07 14:52:26 +00:00
Treehugger Robot
6a12444366
Merge "Restrict ApnEditor settings" into main
2023-07-07 13:50:42 +00:00
Mill Chen
c69899ccef
Improve volume slider
...
In the Settings, the Preference#onBindViewHolder will be invoked
3 times when a preference is getting highlighted. This caused that a
disabled volume slider becomes enabled after getting highlighted.
This change is to optimize the init method of VolumeSeekbarPreference
to speed up the initial process and fix the unexpected behavior.
Bug: 275352565
Test: manual test and robotest pass
Change-Id: I77f28386f6d6e4a45297f1ca7bcbaf16ed6136a4
2023-07-07 20:52:13 +08:00
Mill Chen
45d9e390b2
Fix do not disturb bypass user restriction
...
Do not disturb search result can still switch on/off when users are
restricted by DISALLOW_ADJUST_VOLUME. The DND search result is presented
by slice and there was no user restriction check when creating DND
slice, which caused DND search result can access. To prevent DND from
being access if user restriction is enabled, adding user restriction
check during creating the DND slice.
Bug: 242846154
Test: robotest pass and manual test
Change-Id: I897a99e9dda2f9f84365d96841a4c4f4cf975331
2023-07-07 20:25:18 +08:00
Weng Su
4e18e7414c
Restrict ApnEditor settings
...
- Finish ApnEditor settings if user is not an admin
- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction
Bug: 279902472
Test: manual test
atest -c ApnEditorTest
Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
2023-07-07 20:01:04 +08:00
Chris Göllner
7477fccd0a
Add foldable related controllers to exempt_slice_controller_not_in_xml
...
These controllers cannot be added in XML, as we don't know at compile
time how many there will be.
Fixes: 289967395
Test: N/A
Change-Id: I5b0f6e38937aa6c7d96ac88b6d4cd46c39323ce2
2023-07-07 10:13:15 +00:00
ykhung
ef66549e64
Add a mechanism to log battery usage periodic job events
...
Example history log:
Jul 07, 2023, 15:28:51 SCHEDULE_JOB triggerTime=Jul 07, 2023, 16:00:00
Jul 07, 2023, 15:32:16 FETCH_USAGE_DATA
Jul 07, 2023, 15:32:17 INSERT_USAGE_DATA size=37
Jul 07, 2023, 15:43:45 FETCH_USAGE_DATA
Jul 07, 2023, 15:43:48 INSERT_USAGE_DATA size=47
Jul 07, 2023, 15:43:49 SCHEDULE_JOB triggerTime=Jul 07, 2023, 16:00:00
Bug: 284893240
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I45a1ce0ce9b70f095702727e53d7b7ce8824abdb
2023-07-07 17:47:19 +08:00
Chun-Ku Lin
79ffa2a45f
Merge "use L10n-friendly runtime number formatting based on locale" into main
2023-07-06 17:09:25 +00:00
Tetiana Meronyk
de9efe778b
Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev am: 8141b10269
am: 70bdc38d4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23899169
Change-Id: Ifccee75d893bba0de3814a18b68eb0f32d6d0da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 14:41:45 +00:00
Tetiana Meronyk
8141b10269
Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev
2023-07-06 13:17:36 +00:00
Treehugger Robot
b3b27451a3
Merge "Make wifi calling slice consistent" into main
2023-07-06 05:45:18 +00:00
Treehugger Robot
e761690e08
Merge "Clean up assist gesture from Settings" into main
2023-07-06 05:42:20 +00:00
Quang Luong
42f6baa67a
Merge "Use speed string from WifiEntry" into udc-qpr-dev am: 062c4b634d
am: e90bb0aedc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783053
Change-Id: Ia136e2a699a32d55a7566bc8143ed7396e848326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 03:08:39 +00:00
Mill Chen
fbe8e9f571
Make wifi calling slice consistent
...
The wifi calling search result is grayed out if it is not using
carrier WFC. In order to ensure the search result is aligned with the
corresponding settings, the checker of wifi calling slice will be the
same with wifi calling preference.
Bug: 285594611
Test: manual test
Change-Id: I22d794332a0cc2ecbcb8b5e8836364e926400cbf
2023-07-06 02:41:02 +00:00
Quang Luong
062c4b634d
Merge "Use speed string from WifiEntry" into udc-qpr-dev
2023-07-06 01:49:56 +00:00
Michael Mikhail
7c53d299a2
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I978498d9acbb734534bf2ad1dad7e5cfb2434237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 15:51:23 +00:00
Michael Mikhail
83c13d6563
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev
...
* changes:
Trigger talkback for notification volume change
Add content description to volume title in settings.
2023-07-05 15:11:09 +00:00
Treehugger Robot
bc47f1aac5
Merge "Fix test case failure." into udc-qpr-dev am: b2f436f310
am: 721efc0ed5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23902483
Change-Id: I504ea6842af716ef73468b7e7789c983f5e3a540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 10:17:37 +00:00
Treehugger Robot
b2f436f310
Merge "Fix test case failure." into udc-qpr-dev
2023-07-05 08:44:06 +00:00
Yi-Ling Chuang
434a04b32c
Fix test case failure.
...
Fix the test failure of BatterySettingsFeatureProviderImplTest. The
actual method call can't be passed with an argument matcher. Use the
real object instead.
Fixes: 289737082
Test: robotests
Change-Id: Ia48e7b67ba94a8bb67ac1d26c502894a664c2b70
2023-07-05 15:43:34 +08:00
Jason Chiu
8ecbe486f8
Merge "Do not finish activity when the input account doesn't exist"
2023-07-05 07:15:22 +00:00
Chaohui Wang
225af2b43f
Merge "Remove context from getSupportFeatureProvider"
2023-07-05 03:37:55 +00:00
Tetiana Meronyk
b88bad678d
Fix "Allow guest to use telephony" toggle not updating its value
...
Bug: 283004333
Test: atest GuestTelephonyPreferenceControllerTest
Change-Id: I2f13a989bbe6a925c0e88350dbc215f6f188fe17
2023-07-04 15:32:14 +00:00
Chaohui Wang
47ff48b831
Fix DataUsagePreferenceController ANR am: d42cc8e5e2
am: eb8948e309
am: e76ff6ffa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225
Change-Id: I2b24b59f1d0bcd2b02359128d474f36a74eb367e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-04 10:28:19 +00:00
Chaohui Wang
e76ff6ffa5
Fix DataUsagePreferenceController ANR am: d42cc8e5e2
am: eb8948e309
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225
Change-Id: I3e6b70cb33a51348b9504226787de2e149af5870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-04 09:41:58 +00:00
Jason Chiu
e01a9b6039
Do not finish activity when the input account doesn't exist
...
This is to avoid the caller getting the existing account list because
the prompt respond reveals that the input account does not exist.
Bug: 249981091
Test: robotest
Change-Id: I4bb8ecead8233780443b1cd1a8780983b7e4d5de
2023-07-04 17:31:13 +08:00
Chaohui Wang
a51e013746
Fix DataUsagePreferenceController ANR am: d42cc8e5e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225
Change-Id: Ia0463b25a848a1b65f10bfb3950b7875bc3498b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-04 09:03:56 +00:00
Chaohui Wang
da796d80f1
Remove context from getSupportFeatureProvider
...
Bug: 286764889
Test: m Settings
Change-Id: I5635c7a809fd24d59da377993c7d1435d0c839e3
2023-07-04 13:22:48 +08:00
Daniel Huang
47262484c9
Merge "Log metrics for PK settings topics" into udc-qpr-dev am: 114d068fbb
am: 0b95f9562a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23593768
Change-Id: I2bf912114ace589032df9d08b4d11e57be1a736e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-04 04:10:38 +00:00
Chaohui Wang
d42cc8e5e2
Fix DataUsagePreferenceController ANR
...
Offload calculation work from main thread to fix.
Fix: 286082055
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: I7865823d6af2c812afa35d047bd79b60ae4b0fb7
2023-07-04 12:06:53 +08:00
Daniel Huang
114d068fbb
Merge "Log metrics for PK settings topics" into udc-qpr-dev
2023-07-04 02:26:13 +00:00
Chaohui Wang
778c2dc3d5
Remove context from applicationFeatureProvider
...
ApplicationFeatureProvider is created by using application context,
no need pass context in when get.
Bug: 286764889
Test: m Settings
Change-Id: I7f8dfe5716b7b55e0ff984f7603875d7896e2313
2023-07-03 13:54:26 +08:00
Treehugger Robot
b57e265116
Merge "Check P2P channel before requesting network info" into udc-qpr-dev am: dc98948cc1
am: fedd6b35a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23869864
Change-Id: I96bde9d35a3299555fafbbcffefe5722b99d5787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 16:18:52 +00:00
Allen Su
5d207a7b4b
Merge "[Panlingual]Log metrics for App's locale from the suggested" into udc-qpr-dev
2023-06-30 16:08:25 +00:00
Treehugger Robot
dc98948cc1
Merge "Check P2P channel before requesting network info" into udc-qpr-dev
2023-06-30 14:48:12 +00:00
Michael Mikhail
48faaab788
Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev am: c156b6c427
am: 0d1b67b73e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830401
Change-Id: I5793b74a6737ad920bbdf1dd49667adf231b2e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 14:34:07 +00:00
Michael Mikhail
c156b6c427
Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev
...
* changes:
Trigger talkback for notification volume change
Add content description to volume title in settings.
2023-06-30 12:56:45 +00:00
Quang Anh Luong
36d71f8785
Check P2P channel before requesting network info
...
WifiP2pSettings requests network info from WifiP2pManager whenever it
gets onDeviceInfoAvailable, but sChannel may be null causing an
IllegalArgumentException. Check that sChannel is not null before
requesting network info.
Bug: 289004627
Test: atest WifiP2pSettingsTest
Change-Id: Ied8c3f8a894683d7b8e368e5c52343adb7d05e4b
2023-06-30 12:21:30 +09:00
Hao Dong
04b1932b25
Merge "Fix pattern rotation header text." into udc-d1-dev
2023-06-29 23:52:00 +00:00
Hao Dong
72f2058d3e
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev
2023-06-29 23:51:50 +00:00