Treehugger Robot
9ff7efa50d
Merge "Return when dialog is null" into main
2024-04-23 08:43:30 +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
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
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
Treehugger Robot
a90bf4697a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 72e6b810bf
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27023858
Change-Id: I38339caa0b7debe3c6b68d233410a909d2d87f56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-19 16:16:41 +00:00
Bill Yi
decc9d4431
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d50029068
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27023858
Change-Id: I0673519912e10d506667546afae69fe04439159c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-19 16:16:36 +00:00
Bill Yi
bbce9b36f4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a7a98a394
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27022134
Change-Id: Ibbc8d9b1791a4e1fdd38c828a50dccb206b31a62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-04-19 16:16:19 +00:00
Treehugger Robot
72e6b810bf
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-04-19 16:00:28 +00:00
SongFerng Wang
e529a1233c
Merge "Using the new sim ui when user insert psim" into main
2024-04-19 15:49:17 +00:00
Kholoud Mohamed
0480d7c0a1
Merge "Fix incorrect password attempts messaging on headless" into main
2024-04-19 14:47:57 +00:00
Hakjun Choi
1227eb311f
Merge "Return empty list when SatelliteManager is not created" into main
2024-04-19 13:21:40 +00:00
Kholoud Mohamed
85c38bc078
Fix incorrect password attempts messaging on headless
...
Bug: 257276847
Test: manual
Flag: ACONFIG android.app.admin.flags.headless_single_user_fixes DISABLED
Change-Id: I2fb70d99203228ce4ee36f84eb4dfed36fa6fd8c
2024-04-19 12:49:31 +00:00
YK Hung
491cb8fbe1
Merge "Add content description string for '<1%'." into main
2024-04-19 12:04:41 +00:00
YK Hung
e57842bd40
Merge "Help talkback to read the hyphen of time frame '{day}{time}-{time}'" into main
2024-04-19 11:57:55 +00:00
Matías Hernández
d69b539c1e
Merge "Remove TODO which is resolved by changes in ZenModeHelper" into main
2024-04-19 10:49:35 +00:00
Treehugger Robot
b5f7d62bbd
Merge "Log optimization mode for app usage in BatteryUsageSlot." into main
2024-04-19 10:07:56 +00:00
Mill Chen
5860635682
Merge "Add trunk stable flag for slice retirement" into main
2024-04-19 09:57:05 +00:00
Haijie Hong
724af770b7
Merge "Hide LeAudio toggle for LeAudio-only device" into main
2024-04-19 08:07:39 +00:00
songferngwang
aecc940987
Using the new sim ui when user insert psim
...
When device has two active esim and the user insert psim, the settings
will popup the dailog to ask user select the two sim card.
Now, there is the new sim UI, so it should show the new one.
Bug: 335780975
Test: verify UI
Change-Id: I298d488d467c447d6f8d91d86383708a4d1f70c9
2024-04-19 07:44:22 +00:00
Mill Chen
2f9ce75a00
Add trunk stable flag for slice retirement
...
Bug: 297367302
Test: robotest
Change-Id: Idc9e9d8ff88a8b6670a775e181295a9ef3553bb1
2024-04-19 07:20:34 +00:00