Treehugger Robot
e18a63faab
Merge "Update satellite icon to match with system UI's" into 24D1-dev am: bccfb85bc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27000770
Change-Id: If4416d054f0c066948ee4cdd14108a6a5c00626c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-23 13:39:24 +00:00
Treehugger Robot
bccfb85bc2
Merge "Update satellite icon to match with system UI's" into 24D1-dev
2024-04-23 13:25:44 +00:00
Anna Bauza
990b007f03
[automerger skipped] Merge "Integrating new Avatar Picker App in Settings" into main am: cb9cd3fa46
am: 469cc72050
-s ours
...
am skip reason: Merged-In Ie5831cec9ebb7a8d5cfabc93300ca2d6cadb944b with SHA-1 e6c9a08ab7
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3051323
Change-Id: I84c79e86231b5bd8142b5ad81d52f6b90ebf2da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-23 12:35:13 +00:00
Anna Bauza
469cc72050
Merge "Integrating new Avatar Picker App in Settings" into main am: cb9cd3fa46
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3051323
Change-Id: I54107dc624b4787281e475e9e7abd469a581461c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-23 12:16:04 +00:00
Anna Bauza
cb9cd3fa46
Merge "Integrating new Avatar Picker App in Settings" into main
2024-04-23 12:10:34 +00:00
Hyunho Shin
ebc05f131d
Merge "Add a try-catch statement to handle the runtime exception" into main
2024-04-23 10:51:29 +00:00
Manish Singh
82e6ad5098
Merge "PrivateSpaceAuthenticationActivity to support dual-pane mode" into main
2024-04-23 09:58:57 +00:00
Pechetty Sravani
dbb7d1772b
Merge "Revert "Add FeatureProvider for SyncAcrossDevices Settings integ..."" into main
2024-04-23 09:12:48 +00:00
Chaohui Wang
174acf5c67
Merge "Remove existing list when force update network" into main
2024-04-23 09:02:25 +00:00
Edgar Wang
e15ae758cb
Merge "Dynamic Injection into PreferenceCategory" into main
2024-04-23 09:00:02 +00:00
Treehugger Robot
9ff7efa50d
Merge "Return when dialog is null" into main
2024-04-23 08:43:30 +00:00
Hyunho
fa2f6ebce4
Add a try-catch statement to handle the runtime exception
...
Bug: 335903173
Test: manual test
Change-Id: I657a907b01229473ad2ef21b1d843e5d7de74945
2024-04-23 08:13:01 +00:00
Pechetty Sravani
ea26f2d729
Revert "Add FeatureProvider for SyncAcrossDevices Settings integ..."
...
Revert submission 26930404-syncacrossdevices
Reason for revert: Potential culprit for b/336431732- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted changes: /q/submissionid:26930404-syncacrossdevices
Change-Id: I9da0de82978fa6984a4636e0c9ccc891d9287fd2
2024-04-23 07:43:47 +00:00
Edgar Wang
aec1d97788
Dynamic Injection into PreferenceCategory
...
- Avoid NPE when groupkey is null
Bug: 335592049
Change-Id: I810220d18e55351a280cff08b74b37130607168c
Test: robotest & manual
2024-04-23 07:41:11 +00:00
Chaohui Wang
111e0bfb5a
Return when dialog is null
...
Fix: 329035830
Test: presubmit
Change-Id: I908a051d68f3cb336a0715ca95b0d5fe687e814c
2024-04-23 14:34:47 +08:00
Jason Chiu
8375c61a46
PrivateSpaceAuthenticationActivity to support dual-pane mode
...
Test: visual
Fix: 334792208
Change-Id: Ibae659daa45e93ac3ac53fce4cbcdaed258ba6a3
2024-04-23 14:02:38 +08:00
Chaohui Wang
a339f019e2
Remove existing list when force update network
...
Otherwise it could including previous scan result when re-enter the
page.
Fix: 336244021
Test: manual test - on NetworkSelectSettings
Change-Id: I34b4820b116868b98649202c424d2168746232e8
2024-04-23 13:43:59 +08:00
Charlotte Lu
893e8d1f4b
Merge "[WIFI-WEP] Add WEP dialog in System UI." into main
2024-04-23 05:28:37 +00:00
Yiling Chuang
1aa4bcf17d
Clean up on the charging remaining time label for WLC.
...
Bug: 336204618
Test: robotests
Change-Id: Ic2c9d653f8bd9ec25383319766256162d81424c2
2024-04-23 03:36:06 +00:00
Yiling Chuang
ce51f659df
Merge "Customize the remaining time label during wireless charging." into main
2024-04-23 02:40:06 +00:00
Paulz Chen
319245cdbe
Merge "Add FeatureProvider for SyncAcrossDevices Settings integration." into main
2024-04-22 23:52:23 +00:00
Bill Yi
311a675174
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bf184534f5
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27047814
Change-Id: I3b8b773ba071d509317c4521283fd19dced407a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-22 20:54:47 +00:00
Bill Yi
25e902e79c
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-04-22 20:43:13 +00:00
Treehugger Robot
f11e2b4968
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 09bcd6cab8
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27047571
Change-Id: Ideb1578014dd0ea4859f6eabe072583af77eea3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-22 17:39:58 +00:00
Bill Yi
bff4f35178
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e49cffe60f
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27047571
Change-Id: I08a8edb16963dbb0ae48b115dfdbffa05d058f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-22 17:39:46 +00:00
Treehugger Robot
09bcd6cab8
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-04-22 16:51:12 +00:00
Yuri Lin
9dbd8ddffe
Merge "Add info on whether the rule is active to ZenMode" into main
2024-04-22 16:20:38 +00:00
Yuri Lin
af82199317
Add info on whether the rule is active to ZenMode
...
modifying the corresponding methods on ZenModesBackend to collect that information from NotificationManager.
Bug: 327419222
Test: ZenModesBackendTest, ZenModeTest
Change-Id: I01cb0ffa21a7fecaa5128cec51ced3eff384f370
2024-04-22 10:57:32 -04:00
Elliot Sisteron
365c16b217
Reset SafetyCenterManagerWrapper instance between tests.
...
This is because some other tests may set a mock on this static value, which will persist across test cases (whereas in this test we want to test the real thing).
Bug: 335557039
Change-Id: I14fc81922761159241636c78dbd47fce7bfeb533
Test: atest SafetyCenterManagerWrapperTest
2024-04-22 14:49:57 +00:00
Anna Bauza
71361dafd3
Integrating new Avatar Picker App in Settings
...
Bug: 309426522
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e6c9a08ab7648d884c0d9c3fbbc7f8c74a016624 )
Merged-In: Ie5831cec9ebb7a8d5cfabc93300ca2d6cadb944b
Change-Id: Ie5831cec9ebb7a8d5cfabc93300ca2d6cadb944b
2024-04-22 12:15:54 +00:00
Chaohui Wang
5ae84662b5
Check isConvertedPsimSubscription in new UI
...
Bug: 326896614
Test: manual test
Change-Id: I0d3c87a863f58a9e962fb87df5b8001be9edb767
2024-04-22 18:14:20 +08:00
Yiling Chuang
901a46c93e
Customize the remaining time label during wireless charging.
...
Bug: 336204618
Test: robotests
Change-Id: Ic7025f219ee09fba0922ac183daa891e7b63b673
2024-04-22 10:14:13 +00:00
Bill Yi
e49cffe60f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia29286a18eaeca72bdbff24b8709e5d42a778df4
2024-04-22 01:31:27 -07:00
Chaohui Wang
2ecc77ef08
Merge "Create AppDataUsageSummaryController" into main
2024-04-22 08:30:19 +00:00
Bill Yi
58603f0e88
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia03aa6581536e520e727996300366d6f53dd1482
2024-04-22 01:25:28 -07:00
Bill Yi
bf184534f5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a4e2efaecb33609fdba57b66fe69e6c639c73f0
2024-04-22 01:20:55 -07:00
Weng Su
d1f7df008c
Merge "Restrict WifiAPITest" into main
2024-04-22 07:57:14 +00:00
Treehugger Robot
ab1163beea
Merge "Add READ_SYSTEM_GRAMMATICAL_GENDER to Settings app" into main
2024-04-22 07:27:19 +00:00
paulzhchen
132e7341ea
Add FeatureProvider for SyncAcrossDevices Settings integration.
...
Bug: 330498032
Test: FakeFeatureFactory
Change-Id: Iccf7ca4411a03d29e9eeba6c1544ccbd95b97654
2024-04-22 06:58:31 +00:00
Chaohui Wang
ea89a3cb1d
Not include user input in regex am: 4f5920c3f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27048156
Change-Id: I2a3740b52b65ff650f309aa62a42e57f9ba8dffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-22 06:34:24 +00:00
Chaohui Wang
07335514c4
Create AppDataUsageSummaryController
...
Content description for usage will be added later.
Bug: 318780411
Test: manual - on AppDataUsage
Test: unit test
Change-Id: I3990218395dfd7553554346ea8ef00368ba57589
2024-04-22 04:58:49 +00:00
Chaohui Wang
4f5920c3f5
Not include user input in regex
...
Check prefix and remove prefix first, to avoid include user input in
the regex to fix.
Fix: 335136289
Test: manual - on SIMs
Test: unit test
Change-Id: Iff4dcfc3662c744d00b586d05e64b4f5fe33a0d8
2024-04-22 04:56:57 +00:00
Bill Yi
6c8455c22b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e60ade37f
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27022132
Change-Id: I13e60bf3043002f8c877102ed9890ed598707f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-20 01:03:48 +00:00
Bill Yi
e82c156db9
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-04-20 00:45:10 +00:00
Bill Yi
32c4064b55
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-04-20 00:45:10 +00:00
Chun-Ku Lin
5b08a3d7ce
Make QS shortcut as the default shortcut type only if it's an a11y tool
...
Bug: 333602196
Test: atest ToggleAccessibilityServicePreferenceFragmentTest
Flag: android.view.accessibility.a11y_qs_shortcut aconfig Nextfood
Change-Id: I108e8ab127bcae545b92166a0147f5fee89f9e94
2024-04-19 23:20:16 +00:00
Joseph Vincent
1946b4a669
Merge "Remove logs revealing private space existence" into main
2024-04-19 19:59:39 +00:00
Joseph Vincent
0e96e7328e
Merge "Update string in Delete private space dialog" into main
2024-04-19 19:59:17 +00:00
Varun Shah
74668d1e7e
Merge "Remove RUN_BACKUP_JOBS special app access page." into main
2024-04-19 17:41:28 +00:00
Hyunho Shin
74aecaf6bc
Merge "When the transfer status is CONVERTED, the menu on the pSIM is greyed out." into main
2024-04-19 16:43:50 +00:00