Commit Graph

16277 Commits

Author SHA1 Message Date
Shivangi Dubey
b5a6c7a020 Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev am: 8c68b0e7e2 am: 32d914ea56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23832963

Change-Id: I340d008ea78939a614e8b33f83c212421d4388d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 16:48:24 +00:00
Shivangi Dubey
8c68b0e7e2 Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev 2023-07-14 13:35:55 +00:00
Chaohui Wang
0b48ffdd6e Merge "Remove context from powerUsageFeatureProvider" into main 2023-07-14 08:36:27 +00:00
Treehugger Robot
3b7abccc6e Merge "Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest" into udc-qpr-dev am: b544871b38 am: 486451e9cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002332

Change-Id: I470e36951003125f6a97dca2c71d655b2904abcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 06:16:48 +00:00
Chun-Wei Wang
e0c2d574a7 Merge "Re-enable most tests" into udc-qpr-dev am: a671c3014e am: 4fbf549bdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24059806

Change-Id: I354313db70332a413b80431d3337ace97da80514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 06:15:43 +00:00
Treehugger Robot
b544871b38 Merge "Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest" into udc-qpr-dev 2023-07-14 04:29:02 +00:00
Chun-Wei Wang
a671c3014e Merge "Re-enable most tests" into udc-qpr-dev 2023-07-14 03:52:01 +00:00
Bill Lin
88bc013487 Merge "Update screen lock and biometrics options in order" into udc-qpr-dev am: 8ea74c3d76 am: f0278e6835
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896224

Change-Id: I470152428e4fe0ecf1fc9e8f3d499fca89d114db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 02:06:19 +00:00
Bill Lin
8ea74c3d76 Merge "Update screen lock and biometrics options in order" into udc-qpr-dev 2023-07-13 23:18:19 +00:00
Chun-Wei Wang
203906516e Re-enable most tests
Most tests are still successful. We don't want to impact
too much test coverage by disabling all tests.

Bug: 291146670
Test: atest ChooseLockPasswordTest --rerun-until-failure 50
Change-Id: Ia8266dc5d44ea9271a28e1bee80c3855b3c2d52b
2023-07-13 23:14:38 +00:00
Chaohui Wang
36b8227073 Remove context from powerUsageFeatureProvider
PowerUsageFeatureProviderImpl is created by using application context,
no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: Iec81e98648fcb2f6a20978ef4ce164e1af50a804
2023-07-13 09:58:54 +08:00
Chaohui Wang
14ab64637e Merge "Remove context from batteryStatusFeatureProvider" into main 2023-07-12 05:03:48 +00:00
Chaohui Wang
46075bf8f4 Merge "[BT] Correct the filter when addCachedDevices" into main 2023-07-12 02:40:29 +00:00
lbill
7f8197da82 Update screen lock and biometrics options in order
Previously the screen lock and biometrics order is :
UI & UX: b/182806496, b/183649070
- PIN • Face • Fingerprint
- Pattern • Face • Fingerprint
- Password • Face • Fingerprint

By requirement, we need to reverse Fingerprint & Face position
- PIN • Fingerprint • Face
- Pattern • Fingerprint • Face
- Password • Fingerprint • Face

Also remove unused strings

Fixes: 242143765
Test: Manual login corp, and observe the UI in Choose screen lock
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: I1938f867360512121ecfdae8e2ca6de7002156f4
2023-07-11 12:30:22 +00:00
Chaohui Wang
8dd32ab07d [BT] Correct the filter when addCachedDevices
In Change Ia9750adb6b4c1424d084381e9d7c2ca8e7912391, addCachedDevices()
becomes async, but the filter is set outside of addCachedDevices(),
which makes the filter not apply to addCachedDevices().

Direct pass the filter to addCachedDevices() to fix this issue.

Also migrate the test to Kotlin so we can test coroutine.

Fix: 289876965
Test: manual - check BT pairing page
Test: m RunSettingsRoboTests
Change-Id: I95b16840881747ec9f69e5cd778e456bcc8a7626
2023-07-11 19:30:04 +08:00
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
Chaohui Wang
1806b3032f Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155

Change-Id: I46c9e35554f3a7021bb52c79cc73e09971ca4232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 08:34:42 +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
Zaiyue Xue
c93fe0b509 Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest
Remove unused code and test

Bug: 290318160
Fix: 290318160
Test: presubmit
Change-Id: I20c612270c67f55e0b01fa849514ba670b696db3
2023-07-10 15:06:57 +08: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
dshivangi
8f4122ad5d Add 'Stay unlocked on fold' toogle to settings
Added 'Stay unlocked on fold' toogle to display settings. Enabling this
setting will allow user to keep their device awake after the fold the
device.

Test: atest StayAwakeOnFoldPreferenceControllerTest LogicalDisplayMapperTest
Test: manual
  Built and flashed foldable device and manually tested by
    1. unfolded device -> enable setting -> folded device
    2. unfolded device -> disabled setting -> folded devices
  Built and flashed non-foldable device and manually tested by
    1. Went to Settings -> display -> the toogle setting is not visible
Bug: 274447767
Change-Id: I35fbd0f5d1297ee6e14896e8f3be8301cda6622f
2023-07-06 11:42:35 +00:00
Chaohui Wang
9ed6eccb75 Remove context from batteryStatusFeatureProvider
BatteryStatusFeatureProvider is created by using application context,
no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: Ie5f39c3f074a1937526461eba45f11f7ec212cba
2023-07-06 15:56:08 +08: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