Treehugger Robot
2d4ef85b2f
Merge "[Thread] fix Thread unit test failures" into main am: bb5bb304aa
am: fc2d8c650f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3081467
Change-Id: I62d9d558c43a610daea3d0628488a3699568d60e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-10 10:58:34 +00:00
Treehugger Robot
fc2d8c650f
Merge "[Thread] fix Thread unit test failures" into main am: bb5bb304aa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3081467
Change-Id: I615a740f9141e2c16a8e4a9c674a52e1e55b0e99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-10 10:45:37 +00:00
Treehugger Robot
bb5bb304aa
Merge "[Thread] fix Thread unit test failures" into main
2024-05-10 10:18:40 +00:00
Mill Chen
f5ad0734a7
Merge "Deprecate Settings panels and its infrastructure" into main
2024-05-10 10:02:51 +00:00
Chaohui Wang
0514c664fa
[automerger skipped] Merge "Use permission com.android.settings.BATTERY_DATA" into main am: 51fe6894f9
am: 5998074b89
-s ours
...
am skip reason: Merged-In I5a1753835d2d47712ea249081c9a77c455eb3291 with SHA-1 23c66d1278
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3078823
Change-Id: Ib45d2607321b73f15a788b0411334c9fff58a460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-10 09:56:21 +00:00
Chaohui Wang
5998074b89
Merge "Use permission com.android.settings.BATTERY_DATA" into main am: 51fe6894f9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3078823
Change-Id: I1fac29bf240989aa4528b4abdaf77c94d9d1b08a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-10 09:37:56 +00:00
Manish Singh
07fec29f7c
Merge "Support multi-pane deeplink in PrivateSpaceAuthenticationActivity" into main
2024-05-10 09:29:30 +00:00
Chaohui Wang
51fe6894f9
Merge "Use permission com.android.settings.BATTERY_DATA" into main
2024-05-10 09:15:47 +00:00
Manish Singh
7b5c1bf766
Move mock init before fragment is created
...
Bug: 336518132
Test: atest PrivateSpaceDeletionProgressFragmentTest
Change-Id: Ic7d81e59515ad9ad1a354fff8884133e7cc8ea64
2024-05-10 09:11:49 +00:00
Kangping Dong
257e164562
[Thread] fix Thread unit test failures
...
It looks like SettingsUnitTests is not in presubmit and the existing Thread settings unit tests are failing in postsubmit.
This commit fixes two small issues:
1. The default Thread enabled state in FakeThreadNetworkController and ThreadNetworkToggleController is not consistent
2. The executor in ThreadNetworkToggleControllerTest is reusing the main thread which could result in flaky as the callbacks are not guaranteed to be invoked before the API returns
Bug: 339767488
Bug: 339145155
Test: atest SettingsUnitTests:com.android.settings.connecteddevice.threadnetwork.ThreadNetworkToggleControllerTest
Change-Id: Id8b453cf6d7bef698d08dbf106e48250369d0832
2024-05-10 17:10:50 +08:00
Chaohui Wang
df5e5ac130
Merge "No show DisableSimFooterPreference when sub not found" into main
2024-05-10 08:54:31 +00:00
Chaohui Wang
6e4ac4bdc0
Fix empty network scan result
...
Settings use TelephonyScanManager.NetworkScanCallback to scan, and its
onComplete() could happens before onResults().
We will change Settings to fix.
Fix: 338986191
Test: manual - on NetworkSelectSettings
Test: unit test
Change-Id: If41d957f916a99eacc1becb6b460e58722a4dca7
2024-05-10 16:19:40 +08:00
Kangping Dong
8231d00bb9
[automerger skipped] Merge "[Thread] update Thread settings screen" into main am: ba221ea50c
am: 0ff02951c2
-s ours
...
am skip reason: Merged-In Iffbb2471f5a28ec57d30a378f22642fe6ac0b9cc with SHA-1 d454ac2963
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3074147
Change-Id: I1485a97ef7f9d83ccdf30410651d07ed15384ded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-10 07:16:22 +00:00
Chaohui Wang
e216fd4248
No show DisableSimFooterPreference when sub not found
...
DisableSimFooterPreferenceController.getAvailabilityStatus() used to
return AVAILABLE when the subscription is not found in selectable
subscription info list.
Return CONDITIONALLY_UNAVAILABLE in this case to fix.
Bug: 336232487
Test: manual - on Mobile Settings
Change-Id: I88642fc9853ce6603a78dfdc0e5fed1da1553adc
2024-05-10 15:08:53 +08:00
Tom Hsu
1e2c0b68e6
[automerger skipped] Merge "Expose SatelliteWarningDialogActivity" into 24D1-dev am: 580ef265ce
-s ours
...
am skip reason: Merged-In I530c554433d99b4732416b8f1b83677ddc0ff6d8 with SHA-1 a50dd92e49
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27263696
Change-Id: Icc8dc8b0f6d9764c0da7366fdf7a8ed24b401de8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-10 07:02:31 +00:00
tomhsu
5d41cc2d8b
[automerger skipped] Expose SatelliteWarningDialogActivity am: 180b2d9561
-s ours
...
am skip reason: Merged-In I530c554433d99b4732416b8f1b83677ddc0ff6d8 with SHA-1 a50dd92e49
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27263696
Change-Id: I105118a7e027b8c3231364745dcbe7b9ce60bc55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-10 07:02:26 +00:00
Kangping Dong
0ff02951c2
Merge "[Thread] update Thread settings screen" into main am: ba221ea50c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3074147
Change-Id: Ib9437a53f2e94a27b22b0b38e30f7dee1a96c741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-10 07:02:06 +00:00
Tom Hsu
580ef265ce
Merge "Expose SatelliteWarningDialogActivity" into 24D1-dev
2024-05-10 06:46:57 +00:00
Kangping Dong
ba221ea50c
Merge "[Thread] update Thread settings screen" into main
2024-05-10 06:38:45 +00:00
YK Hung
211afbea96
Merge changes from topic "timestamp_update" into main
...
* changes:
Update database clear & job refresh mechanism for time zone change intent
Update database clear & job refresh mechanism for time change intent
Update time format for the first timestamp on usage chartview.
2024-05-10 04:46:11 +00:00
mxyyiyi
d3ce90347b
Update database clear & job refresh mechanism for time zone change intent
...
- Clear database and reset periodic job
- Take a snapshot of current battery usage stats
Bug: 336423923
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Change-Id: I4aade9db950b508e2190605371f246904f131da3
2024-05-10 11:22:58 +08:00
mxyyiyi
798340fafd
Update database clear & job refresh mechanism for time change intent
...
- Ignore time change intent for time format update
- Clear data after current time in DB and refresh periodic job
- Take a snapshot of current battery usage stats if no periodic job in DB
Bug: 336423923
Bug: 314921894
Fix: 314921894
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusagei
Change-Id: Iec0f5e8e97f18c4603de711a5884336ba0af23a9
2024-05-10 11:22:47 +08:00
Chaohui Wang
8daf33572a
Merge "Catch exception in telephonyRepository.isDataEnabledFlow" into main
2024-05-10 03:02:34 +00:00
Treehugger Robot
baabc09114
[automerger skipped] Merge "Fix the flicker in the Lock screen page" into 24D1-dev am: 6f6629e6cd
-s ours
...
am skip reason: Merged-In Icb7714c19ae73d15bccc9b6976a10cf343a16f53 with SHA-1 753a5565cb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27256680
Change-Id: I5d4490488c228c822f3cd4d05c7fda220e25b98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-10 03:01:21 +00:00
sunnyshao
83bc8e1d2d
[automerger skipped] Fix the flicker in the Lock screen page am: 33aba0a694
-s ours
...
am skip reason: Merged-In Icb7714c19ae73d15bccc9b6976a10cf343a16f53 with SHA-1 753a5565cb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27256680
Change-Id: Id41103b79fca0c56aff8f2e42e6366b12c51ab6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-10 03:01:16 +00:00
mxyyiyi
658bc03d4f
Update time format for the first timestamp on usage chartview.
...
- If usage data start from the time-change event rather than full-charged event
[Before] https://screenshot.googleplex.com/BokAvKHXmt2Mmwn
[After] https://screenshot.googleplex.com/8thpgVrVt8kqo37
Bug: 336423923
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Change-Id: I66f8b384938f55852e28bd9f50d1a99c7fc9e41b
2024-05-10 10:51:21 +08:00
Treehugger Robot
6f6629e6cd
Merge "Fix the flicker in the Lock screen page" into 24D1-dev
2024-05-10 02:44:25 +00:00
Kangping Dong
da0be0f6f4
Merge "[Thread] update Thread settings screen" into main
2024-05-10 02:39:46 +00:00
Edgar Wang
f437bec1bc
Merge "Homepage UX revamp" into main
2024-05-10 00:57:01 +00:00
Edgar Wang
b5710f1fee
Merge "Allow WebViewAppPicker can be launched when dev-option disabled" into main
2024-05-10 00:52:18 +00:00
Edgar Wang
92d04c9387
Merge "Fix the touch area of the edit box is not large enough in Fingerprint unlock page" into main
2024-05-10 00:46:05 +00:00
Chun-Ku Lin
b9eb01643c
Apply lineBreakWordStyle and hyphenationFrequency in EditShortcutScreen
...
Uses the same style as mentioned in b/217659992 and b/232992171
Note: This doesn't fix the long word issue in Thai. This is the best we
can get so far.
Bug: 335749219
Test: manual (Can still see the EditShortcutScreen with no crash)
Flag: EXEMPT resource only
Change-Id: I3c1634de4a33c7ab6a80163217ef1cc65585c584
2024-05-10 00:26:56 +00:00
David Liu
836e14e665
Set noparent to avoid it recursively looks up. Android biometric team should approve all change in this subdirectories.
...
Change-Id: Ib5bdc23660cc18af0f57ffdec1dbf582db734a43
2024-05-09 22:15:14 +00:00
Srinivas Patibandla
2028535d06
[Hide DCK Device] Update unit tests per change in exclusive manager verification
...
Test: atest: com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdaterTest
Test: atest: com.android.settings.bluetooth.SavedBluetoothDeviceUpdaterTest
Bug: 322285078
Bug: 324475542
Flag: ACONFIG com.android.settingslib.flags.enable_hide_exclusively_managed_bluetooth_device NEXTFOOD
Change-Id: I5a4f9eccc461033aeca79ea657af61958af0c660
2024-05-09 20:54:12 +00:00
Varun Somani
d652d54d93
Merge "ARC++ PH: Rephrase the tooltip text" into main
2024-05-09 20:04:40 +00:00
Edgar Wang
225bb7be88
Allow WebViewAppPicker can be launched when dev-option disabled
...
Bug: 333135859
Change-Id: If91e0299ef7a0ccf92b489a1c85b04972119e075
Test: manual
2024-05-09 19:48:13 +00:00
Edgar Wang
d97b781251
Fix the touch area of the edit box is not large enough in Fingerprint unlock page
...
Bug: 315405247
Change-Id: Ic15f051e12ccc04575e5c0801104633d4d733dab
Test: manual
2024-05-09 18:51:36 +00:00
Chris Antol
06e3b08891
Merge "Fix NPE in AudioSwitchPreferenceController" into main
2024-05-09 17:46:53 +00:00
Chaohui Wang
8c507e871b
Catch exception in telephonyRepository.isDataEnabledFlow
...
And migrate BillingCycleRepository to use it.
Fix: 339197552
Test: manual - on data usage
Test: unit test
Change-Id: Ieac295f37fdbf75d184d66ea11f170652af3ec5f
2024-05-09 15:49:26 +00:00
Chaohui Wang
5a85f6a72f
Reduce mobileDataEnabledFlow_forSubIdNotChanged flaky
...
Bug: 338300477
Test: unit test
Change-Id: Id45e5228b60581b00d92e38f553a22631fb5c9b2
2024-05-09 14:29:30 +00:00
Manish Singh
51dd526faf
Support multi-pane deeplink in PrivateSpaceAuthenticationActivity
...
Bug: 334792208
Fix: 336996032
Test: manual
Change-Id: I0cffe64faa1f0981ee09e3775249efcd7073d7ce
2024-05-09 13:07:37 +00:00
Tom Hsu
c5571e5530
Merge "Expose SatelliteWarningDialogActivity" into main
2024-05-09 11:17:06 +00:00
tomhsu
180b2d9561
Expose SatelliteWarningDialogActivity
...
Bug: 337154438
Test: Manual test
Test: Build pass
Change-Id: I530c554433d99b4732416b8f1b83677ddc0ff6d8
Merged-In: I530c554433d99b4732416b8f1b83677ddc0ff6d8
2024-05-09 09:56:30 +00:00
Edgar Wang
47400df7ae
Homepage UX revamp
...
- unified Search and Suggestion behavior between regular phone and two
pane
- don't adjust padding
- update new icon drawable
- support group homepage preference with round corner on phone
- Remove avator from homepage
- Adjust homepage preference order
Bug: 333989622
Bug: 334130370
Test: visual
Change-Id: I9880b52553f164745766c8b9d5c996585285e52a
2024-05-09 08:21:08 +00:00
Treehugger Robot
8e4223c769
Merge "Revert "Checks WEP password lengths of Wi-Fi network"" into main
2024-05-09 08:00:14 +00:00
tomhsu
ce57ffdbc2
[automerger skipped] Show dialog on BT entries in Settings am: 1f440aacec
-s ours
...
am skip reason: Merged-In Ic9b6d44731684d1cfba87570d72dcacb905a66d2 with SHA-1 c8f52f816c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27263697
Change-Id: I0f66eee7998e634d09c416a1d1f1851d2efcca3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-09 07:16:43 +00:00
tomhsu
1f440aacec
Show dialog on BT entries in Settings
...
- When satellite mode is switched on BT entries shall show the warning dialog and avoid user uses these functions.
Bug: 337154438
Test: Manual test.
Test: atest pass
Change-Id: Ic9b6d44731684d1cfba87570d72dcacb905a66d2
(cherry picked from commit c8f52f816c
)
Merged-In: Ic9b6d44731684d1cfba87570d72dcacb905a66d2
2024-05-09 06:55:02 +00:00
Tom Hsu
74f5d8c191
Merge "Show dialog on BT entries in Settings" into main
2024-05-09 06:54:11 +00:00
Weng Su
2e25a60436
Revert "Checks WEP password lengths of Wi-Fi network"
...
This reverts commit 1cd3b6f21f
.
Reason for revert:
http://b/338298452 Can't connect to WEP network because incorrect passphrase length check
Change-Id: I4e152a0c89e9ee11b4faa957061b6e9844b1a0c4
2024-05-09 06:49:41 +00:00
SongFerng Wang
539aee4211
Merge "To correct the DDS when the user turn on mobile data" into main
2024-05-09 06:47:43 +00:00