Oli Thompson
f35b1be8ac
Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e
am: e86146d685
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338
Change-Id: I82b44ce36153a64d37629f40dc8c7805c17847a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 17:02:43 +00:00
Oli Thompson
e86146d685
Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338
Change-Id: I7aa48065cbc087ff4135a93983e3b32b97dc6204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 16:16:59 +00:00
Oli Thompson
01b382546e
Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev
2023-06-09 15:31:17 +00:00
Oli Thompson
dcce8fa662
Fix emergency button not visible on pattern work challenge screen
...
Hide the subtext for work challenge pattern,so everything fits and
adjust some spacing
Test: btest a.d.g.WorkTelephonyTest#workChallengePatternScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Bug: 283137301
Bug: 286391641
Change-Id: Ia6214b624f8d7328f7445f01a08166b8ab33fdec
2023-06-09 13:06:39 +00:00
Zaiyue Xue
dff1bd58de
Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343
Change-Id: I07e697bb37a2c3655b7e5b6e5177c8d9d9059f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 11:01:47 +00:00
Zaiyue Xue
65cb6ef230
Don't load battery entry name and icon in offline job to improve memory usage.
...
Risk: low, the name and icon will be always loaded again in the UI.
Bug: 280720236
Test: manual
Change-Id: I86f50e953ffd4910acbf9f318e1cc1caa3a7a232
2023-06-09 08:41:51 +00:00
Zoey Chen
593028ca32
Merge "[Panlingual] Set focus to the drag list to avoid the overlapping" into udc-qpr-dev
2023-06-09 05:57:19 +00:00
Treehugger Robot
4b44c6632e
Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev am: a99c52e160
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601566
Change-Id: I5b91a44f9c947d6686a28cb2acb2c41f58e8fe01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 05:02:25 +00:00
Treehugger Robot
a99c52e160
Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev
2023-06-09 04:29:16 +00:00
SongFerng Wang
afc0ea3952
Merge "When config is changed, update the profile's visibility" into udc-d1-dev am: a210c84eb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23599970
Change-Id: I4969b792e002832c372f30e0f5e7694463b569cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 03:08:44 +00:00
SongFerng Wang
a210c84eb8
Merge "When config is changed, update the profile's visibility" into udc-d1-dev
2023-06-09 02:26:16 +00:00
Mady Mellor
e5aa469940
Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a47899369
am: 7605e122ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23607273
Change-Id: I616264cebad588f95f8c1756e81bca62927ddbb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 19:07:14 +00:00
Mady Mellor
7605e122ac
Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a47899369
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23607273
Change-Id: I66d7e691b5472f108303950f4a1a45347febb903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 18:22:45 +00:00
Mady Mellor
8a47899369
Merge "Fix colors in bubble settings so they're more visible" into udc-dev
2023-06-08 17:35:55 +00:00
Mady Mellor
f184678802
Fix colors in bubble settings so they're more visible
...
Test: manual - get a bubble, go to that apps bubble settings screen,
observe the colors look correct, switch theme and
check again.
Bug: 283951560
Change-Id: I361b1c20e293c02b4d604e0b5845a074c31e5103
2023-06-08 09:21:13 -07:00
Zoey Chen
9263383b75
[Panlingual] Set focus to the drag list to avoid the overlapping
...
Bug: 284401644
Test: manual
Change-Id: I6446cacec20398672d2ac675c4e8823e6912dfb9
2023-06-08 14:44:52 +00:00
Weng Su
7171e0a29b
Show "Not available" summary when hotspot speed is unavailable
...
- Show "Not available" summary when hotspot bands (5 GHz and 6 GHz) are unavailable
- Update debug logs to track down issues
Bug: 285769583
Test: manual test
atest -c WifiHotspotSpeedSettingsTest
atest -c WifiHotspotSpeedViewModelTest
Change-Id: If1050c120b4b612d3a9adbe886c2f12db82b793e
2023-06-08 21:38:01 +08:00
SongFerngWang
7dc3cf0b32
When config is changed, update the profile's visibility
...
Bug: 286328464
Test: build pass
Change-Id: I2beef587a71f9fdc1b1e8a97b9b5656dbb52a9f3
2023-06-08 10:40:54 +00:00
Treehugger Robot
8f3679ab91
Merge "[Regional] Change the wording from "Use app default" to "Usw default"" into udc-qpr-dev
2023-06-08 06:16:32 +00:00
Treehugger Robot
9c4b3ad72b
Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40
am: c0338e5dc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981
Change-Id: Ie7e71eb056a9976296dd2d6da95cc03f1e01ebe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 01:37:16 +00:00
Treehugger Robot
c0338e5dc3
Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981
Change-Id: I452681812b4be6dccae36f3ec711e992a31b9924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 00:50:15 +00:00
Treehugger Robot
a34a510a40
Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev
2023-06-08 00:15:18 +00:00
Aleksandar Kiridžić
1a54d94eb1
Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689
am: c449423483
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421
Change-Id: I24fd223f7fa7e0450be675b1d5f214ef3a40fb52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 20:08:00 +00:00
Oli Thompson
ab73c1a3e3
Fix low contrast on work challenge screen emergency call button
...
Bug: 285718470
Test: btest a.d.g.WorkTelephonyTest#workChallengePinScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Change-Id: I546e30e7f0b9b5eccd54e912274eeb6ba1a7a6e6
2023-06-07 19:25:59 +00:00
Aleksandar Kiridžić
c449423483
Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421
Change-Id: I9ead6c07f3f8c8b901301a7eed9de148490b4bda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 18:43:15 +00:00
Aleksandar Kiridžić
b5b15a6689
Merge "speech: On-device recognition settings profile selector" into udc-dev
2023-06-07 17:53:38 +00:00
TreeHugger Robot
060250ded2
Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7
am: 9b68c3c9c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556
Change-Id: Ie63476cbbc3efc7d3d00a7b9bcc0c1772d33e327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 13:44:52 +00:00
TreeHugger Robot
9b68c3c9c1
Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556
Change-Id: I5f9975f49ec0793eabf171c5dba0791683ab0d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 13:03:22 +00:00
Zoey Chen
3b698670ad
[Regional] Change the wording from "Use app default" to "Usw default"
...
Bug: 282890644
Change-Id: I0735b38afd666895bf9801170bea6178f9ba6292
Test: manual
2023-06-07 12:40:05 +00:00
TreeHugger Robot
3e374cc7a7
Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev
2023-06-07 12:13:51 +00:00
George Chang
6b83876c1e
Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
am: 29dd0bf796
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036
Change-Id: I4ed20c3448a6b8be5065efd6cad0b1ef765135d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 10:15:29 +00:00
tom hsu
bf7865b27e
[Settings] Fix crash when user enter bluetooth page quickly.
...
- When SliceManager try to pinSlice, process may not have the permssion
yet, so in Androix lib it use try/catch to avoid Security exception.
However, if SliceManger quickly unpinSlice after pinSlice, process
may still not get the permission yet, then due to no security
exception, it cause the settings crash.
Bug: 283065718
Test: atest passed
Test: Manual test passed
Change-Id: I2293fca73e65dfaa34237abe57e0c6a3fe0f62bb
2023-06-07 09:37:21 +00:00
George Chang
29dd0bf796
Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036
Change-Id: Ifc98c5ea76ad9fb5205ec3421470ebd7bf17473c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 09:33:13 +00:00
George Chang
832e0b015e
Merge "Correct typo in the launch via NFC bottom string" into udc-dev
2023-06-07 09:02:51 +00:00
SongFerng Wang
fb0186c690
Merge "Add the log and moving it into onResume" into udc-d1-dev am: add7deceb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23579644
Change-Id: I991eb37e42817dba11b4b0404fa5915e6a35ab36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 03:36:07 +00:00
SongFerng Wang
add7deceb2
Merge "Add the log and moving it into onResume" into udc-d1-dev
2023-06-07 02:45:20 +00:00
SongFerng Wang
8b1bfeef73
Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev am: 4929da451c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578859
Change-Id: Ibff4ceef103e798e1e27ee413009ccac92a79cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-07 02:09:50 +00:00
SongFerngWang
ea85e3b2fa
Add the log and moving it into onResume
...
Since user can open two settings app(one is via settings app button and other one is via quick settings) and user can switch them to foreground by the recent page. If user can goto the deviceDetails at Settings_A and then changes the config value at settings_B, then the user goes back Settings_A to check the UI. If config is in the init, the UI can't refresh the UI.
Bug: 285086232
Test: build pass.
Change-Id: I2284940eddcd02c543522b60f951c0d8d25775fd
2023-06-07 01:45:31 +00:00
SongFerng Wang
4929da451c
Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev
2023-06-07 01:33:59 +00:00
Wenhui Yang
4eceb6c5c5
Merge "Fix face model delete message" into udc-qpr-dev
2023-06-06 21:09:56 +00:00
Ale Nijamkin
163c01ab4c
Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd
am: 1e3ecf6352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917
Change-Id: Ie370f2e7fe8e473d46fec5a88ee831042d47903b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 20:27:23 +00:00
Ale Nijamkin
1e3ecf6352
Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917
Change-Id: I93ad7cae5cf900539bbded918807ea19b4c358b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 19:44:29 +00:00
Wenhui Yang
5e71aee4cd
Fix face model delete message
...
Add new strings for face model deletion when fingerprint unlock is available.
Test: Manual - test on devices and observe the error message is correct.
Fixes: 283122570
Change-Id: I0511e58d030b8b63391d8406bfc0447fe33fa9fc
2023-06-06 19:44:17 +00:00
Ale Nijamkin
b5dda005fd
Merge "Fixes nav stack issue." into udc-dev
2023-06-06 18:48:59 +00:00
Treehugger Robot
1a02d5733e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fb4945a4ae
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559399
Change-Id: I0fafd92ec660c4538dbf271853586f583bed6d85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:38:50 +00:00
Bill Yi
90d348eabc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1108d7d99
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559399
Change-Id: Ibc73ddf4d3a46111f76e580d39716cf5cfa194f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:38:42 +00:00
Treehugger Robot
650273ab86
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8db6cc323c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559397
Change-Id: I4daf75a74251228c07412348cabc533b2e4b8b2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:38:37 +00:00
Bill Yi
9c4773b9ae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f346881098
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559397
Change-Id: If0cbc0e34e0b364db859ea276370aadffa440e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:38:17 +00:00
Treehugger Robot
7858247c64
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c1fdb0bec2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23558603
Change-Id: I4622ca39108918a59f21f22797d6674176686411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:38:03 +00:00
Bill Yi
23022e0835
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 16b5dd96c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23558603
Change-Id: I5b6c3746f36c1b969acc795ab4347b6665b791fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 15:37:52 +00:00