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
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
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
Tom Hsu
c5571e5530
Merge "Expose SatelliteWarningDialogActivity" into main
2024-05-09 11:17:06 +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
Treehugger Robot
e05e11c20f
[automerger skipped] Merge "Fix flicker of "App data usage"" into 24D1-dev am: eb729f283c
-s ours
...
am skip reason: Merged-In I3c4d9ff6538a79500318869f01f4b88b55bd9475 with SHA-1 74fe516e09
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27256678
Change-Id: I5df2cf0382b04c4c3874d0f5c8b265eda8d3d057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-09 06:38:19 +00:00
Chaohui Wang
3fdaaeb3f3
[automerger skipped] Fix flicker of "App data usage" am: 9e5b389de3
-s ours
...
am skip reason: Merged-In I3c4d9ff6538a79500318869f01f4b88b55bd9475 with SHA-1 74fe516e09
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27256678
Change-Id: I36468e33a3bd9490f16959d4ddb7072dc18d1873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-09 06:38:15 +00:00
tomhsu
a50dd92e49
Expose SatelliteWarningDialogActivity
...
Bug: 337154438
Test: Manual test
Test: Build pass
Change-Id: I530c554433d99b4732416b8f1b83677ddc0ff6d8
2024-05-09 06:16:34 +00:00
Kangping Dong
d454ac2963
[Thread] update Thread settings screen
...
Per b/327098435 the new Thread settings design proposed
(go/android-thread) is approved.
As a summary, this commit adds a new "connected devices > connection
preference -> Thread" list item and decidated config page for Thread.
Also, we simplified the airplane mode to delegate it to the mainline
code to handle it
Bug: 327098435
Test: atest SettingsUnitTests
Change-Id: Iffbb2471f5a28ec57d30a378f22642fe6ac0b9cc
2024-05-09 14:04:52 +08:00
Treehugger Robot
eb729f283c
Merge "Fix flicker of "App data usage"" into 24D1-dev
2024-05-09 05:50:55 +00:00
Haijie Hong
ecaa88ccb0
Merge "Make device picker activity below status bar" into main
2024-05-09 05:14:18 +00:00
tomhsu
c8f52f816c
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
2024-05-09 04:32:09 +00:00
sunnyshao
33aba0a694
Fix the flicker in the Lock screen page
...
- Due to without summary text in xml, the UI render will skip it and it
flicker while program adding the summary later.
- Add the summary_placeholder in the shortcuts item.
Fixes: 325989849
Test: manual test
Change-Id: Icb7714c19ae73d15bccc9b6976a10cf343a16f53
Merged-In: Icb7714c19ae73d15bccc9b6976a10cf343a16f53
2024-05-09 02:43:50 +00:00
Treehugger Robot
a8ceb7fe07
Merge "Fix the display problem of the cutout" into main
2024-05-09 02:13:52 +00:00
Chris Antol
7ac80f0a0a
Fix NPE in AudioSwitchPreferenceController
...
Change-Id: Ic97d1a6269a6d98ffd15a9b512f6ae24ff1c5b5e
Test: Unit Test to verify nullness
Bug: 338892614
2024-05-09 01:25:24 +00:00
Ang Li
9e4b73a2fa
Merge "Adapt to the new API of ShadowCaptioningManager
." into main am: 1d591b26a9
am: ae15c01dcc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3080265
Change-Id: Ib0297be4453b1450eca244ce94705eebc31ef090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-09 01:00:18 +00:00
Ang Li
ae15c01dcc
Merge "Adapt to the new API of ShadowCaptioningManager
." into main am: 1d591b26a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3080265
Change-Id: I728035ae251eeac36ec9dfbac3c0e59dded1b9c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-09 00:38:08 +00:00
Ang Li
1d591b26a9
Merge "Adapt to the new API of ShadowCaptioningManager
." into main
2024-05-08 23:35:52 +00:00
Bill Yi
408bdb1e3d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6cacee0ce4
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27253747
Change-Id: I3fe19db53e5764bdde1986ca4ed33346ff09e901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-08 22:51:28 +00:00
Ang Li
f0e6f12f10
Adapt to the new API of ShadowCaptioningManager
.
...
Test: Presubmit.
Change-Id: If90894a2438ff5e0aec8e727036f7a656f4c712a
2024-05-08 22:16:33 +00:00
Bill Yi
a55daeff53
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-05-08 21:45:38 +00:00
Treehugger Robot
ee721eb86b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: a48f19c101
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27253752
Change-Id: Ia6895a05e20c5f238fb5dd3d6089acb1ef26f3e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-08 19:44:03 +00:00
Bill Yi
7faaae8722
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: faa97ab210
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27253752
Change-Id: I62383ace361b9ad1e5fc293d039241275faee565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-08 19:43:52 +00:00
Treehugger Robot
a48f19c101
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-05-08 19:24:31 +00:00
Joshua Mccloskey
1b55eb8bfc
Merge "Update face & fingerprint pref logic" into main
2024-05-08 18:08:06 +00:00
Varun Somani
2371fb390f
ARC++ PH: Rephrase the tooltip text
...
Rephrase of the UI tool tip text. Making it more clear for the user.
UI: https://screenshot.googleplex.com/5gkWMVmZn8zKDj4
Upstreaming-Plan: Will be merged to main once approved.
Bug: 265471993
Test: Manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d8c1b2bdef1b38e1cec6335d3a63042acd479442 )
Merged-In: I925aef7af63907e87a5295914cbb819c343fa168
Change-Id: I925aef7af63907e87a5295914cbb819c343fa168
2024-05-08 17:51:12 +00:00
songferngwang
d3c336a58f
To correct the DDS when the user turn on mobile data
...
If there is only one sim and the DDS is -1, when the user turns
on the mobile data, the settings should correct the dds and set the
mobile data on.
Bug: 339382631
Test: Verify UI
Change-Id: Ib0304dc1370a0d76310da2ce6ce0de12bfb275d8
2024-05-08 11:50:31 +00:00
Haijie Hong
90e91d7aaf
Make device picker activity below status bar
...
Test: manual test
Bug: 339191643
Change-Id: I448fea9d5e3694014d219f32f14ef52106b54194
2024-05-08 18:44:33 +08:00
Tom Hsu
965da3df32
[automerger skipped] Fix build break am: 864122b8b7
-s ours
...
am skip reason: Merged-In I45cd92a8688e7a619613361ea4a8d58a0984d99f with SHA-1 c0b39601bf
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27252719
Change-Id: I97feab53d388ec087c4dbac8b0d82013b8aedf2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-08 09:03:45 +00:00
Tom Hsu
864122b8b7
Fix build break
...
Bug:339348046
Test: Build pass locally
Change-Id: I98db39d696617fc81fdad4e73419b34f5265b0ad
Merged-In: I45cd92a8688e7a619613361ea4a8d58a0984d99f
2024-05-08 08:56:44 +00:00
Chaohui Wang
46a70d0369
Merge "Fix data usage when policy has no cycle" into 24D1-dev am: bb90a2c5c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27209264
Change-Id: Ib349fb3eed75dc0d399d9a07355e170e30d1d985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-08 08:56:39 +00:00
Chaohui Wang
bb90a2c5c8
Merge "Fix data usage when policy has no cycle" into 24D1-dev
2024-05-08 08:33:18 +00:00