Bill Yi
6c0c6b61c0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieaf59078e8adaae4d3a03fe0ae3f47ec4e2e913a
2024-08-06 17:08:00 -07:00
Treehugger Robot
5079417396
Merge "Remove unecessary logs" into main am: 5e487ed591
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3191355
Change-Id: Ifa53f9c0acf7e57ee6a2c1e2fad9e094612aea0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-29 02:16:39 +00:00
Treehugger Robot
5e487ed591
Merge "Remove unecessary logs" into main
2024-07-29 01:43:55 +00:00
Treehugger Robot
88f79fe29d
Merge "Migrate to onViewCreated in DataSaverSummary" into main am: 04ed8498ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3188139
Change-Id: Ib0e4725e3b490e70d9518a2f02c418de2216e638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-28 21:06:34 +00:00
Treehugger Robot
04ed8498ee
Merge "Migrate to onViewCreated in DataSaverSummary" into main
2024-07-28 20:52:34 +00:00
Treehugger Robot
ee6f5cf1ed
Merge "Make adb team OWNERS of all Adb settings" into main am: 998787ffa8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3195878
Change-Id: Idcd085b62b69bace7ddfda325b1645b6b89440ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-26 18:25:24 +00:00
Treehugger Robot
998787ffa8
Merge "Make adb team OWNERS of all Adb settings" into main
2024-07-26 18:01:59 +00:00
Fabien Sanglard
c7adef9634
Make adb team OWNERS of all Adb settings
...
Test: NA
Bug: 355088188
Flags: NA
Change-Id: I59c037765940a26509f1d312b4c8c2e0105a3580
2024-07-26 10:57:43 -07:00
Yuanru Qian
6190b5eb70
Merge "Developer option crashed when Bluetooth feature disabled" into main am: cff856a8bb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3172099
Change-Id: Idaa295aa767f900acc88da42bc838b7081c69504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-25 04:29:10 +00:00
Yuanru Qian
cff856a8bb
Merge "Developer option crashed when Bluetooth feature disabled" into main
2024-07-25 03:31:43 +00:00
Yuanru Qian
97f922d60c
Merge "Remove ex-team members from OWNERS" into main am: 8303a38d10
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3191891
Change-Id: I39c450800b0a3fc08d7cab8e74ff7318f753cbf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-24 10:27:41 +00:00
Yuanru Qian
8303a38d10
Merge "Remove ex-team members from OWNERS" into main
2024-07-24 10:06:07 +00:00
Yuanru Qian
3fac9ad21b
Remove ex-team members from OWNERS
...
Change-Id: I025d4963e5b63a28fb0fe36df8a4e1fdd76a9b3d
2024-07-24 09:41:31 +00:00
Pawan Wagh
d519d1fbaa
Remove unecessary logs
...
Test: m Settings
Bug: N/A
Flag: NONE remove logging
Change-Id: Ib1e5923e2f10fdf5fa29bbaa24b74874c18c3045
2024-07-23 22:19:22 +00:00
chayemme
ec6e93f3f4
Developer option crashed when Bluetooth feature disabled
...
When Bluetooth feature is disabled, crash observed with developer option
is selected
Bug: 352864331
Change-Id: If4239f710847f2e01a3b419e1ce6f783f0522219
2024-07-23 13:05:29 +00:00
Ram Peri
119d1e9f43
Merge "Robolectric upgrade" into main am: 71b2be5571
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3185301
Change-Id: I9469f534e375c589f0a7dbac20f185f61ae69295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-23 01:08:54 +00:00
Ram Peri
71b2be5571
Merge "Robolectric upgrade" into main
2024-07-23 00:28:56 +00:00
Ram Peri
f5b58ea3be
Robolectric upgrade
...
Test: atest SystemUIGoogleRoboRNGTests
Flag: TEST_ONLY
Change-Id: I833ac67223875480994f947907754290bb25c946
2024-07-22 13:48:09 -04:00
Jyotiraditya Panda
4ff23211dd
Migrate to onViewCreated in DataSaverSummary
...
The onActivityCreated method has been deprecated. This change updates
DataSaverSummary to use onViewCreated instead, which is the recommended
method for initializing views after the fragment's view has been created.
Test: manual
Change-Id: I08daa11b557b05441fa4f7ed0019802d991846e3
Signed-off-by: Jyotiraditya Panda <jyotiraditya@aospa.co >
2024-07-22 20:18:08 +05:30
SongFerng Wang
bce8fc79e8
Merge "Fix SmartForwardingActivity crash at screen rotation" into main am: 14393a5f06
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2855525
Change-Id: Ieb6ffb8c2f479ffcc30d60440df649618074e420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-19 05:55:14 +00:00
SongFerng Wang
14393a5f06
Merge "Fix SmartForwardingActivity crash at screen rotation" into main
2024-07-19 05:41:40 +00:00
SongFerng Wang
e910d895f1
Merge "Settings: Adapt edge-to-edge enforcement" into main am: 9befb6cd8f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3142636
Change-Id: Ibfc5f8fb007d93d618c4a0c67e396677329b5728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-18 09:48:49 +00:00
SongFerng Wang
9befb6cd8f
Merge "Settings: Adapt edge-to-edge enforcement" into main
2024-07-18 09:31:55 +00:00
Tom Hsu
72541b8b19
Merge "Fix network can't handle simultaneously SS request for both subs" into main am: f20f297cfa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2643178
Change-Id: Id6f676ba5fe1ae096c6b3ed0ed75a00e2c1d92e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-17 07:13:32 +00:00
Tom Hsu
f20f297cfa
Merge "Fix network can't handle simultaneously SS request for both subs" into main
2024-07-17 06:56:04 +00:00
Edgar Wang
ff519515b6
Merge "Add Multiuser team to the OWNERS file for users package in Settings" into main am: 969c26392d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3176079
Change-Id: Id9f83a06f922904ddf56ed803fa58cd362eba59f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-17 01:13:36 +00:00
Edgar Wang
969c26392d
Merge "Add Multiuser team to the OWNERS file for users package in Settings" into main
2024-07-17 00:53:02 +00:00
Tetiana Meronyk
c641849a42
Add Multiuser team to the OWNERS file for users package in Settings
...
Bug: 352721898
Change-Id: Ica47025c4ba5033a15422931fd9f8ed85ae97e9e
Test: N/A
2024-07-16 12:05:25 +00:00
Treehugger Robot
f7486fc4a5
Merge "Repost PageAgnostic mode notification when dismissed" into main am: 9a492ca3cb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3160058
Change-Id: Ia7ae95a0988aa1e63669af5485ca25ef31993c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 17:40:34 +00:00
Treehugger Robot
9a492ca3cb
Merge "Repost PageAgnostic mode notification when dismissed" into main
2024-07-09 17:27:16 +00:00
Treehugger Robot
226c0d5487
Merge "Settings: fix unexpected routing selection" into main am: a02b1c3aa2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3160065
Change-Id: I6ccacc71a9848cc2f030fb2612f3762172e893ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-05 07:17:38 +00:00
Treehugger Robot
a02b1c3aa2
Merge "Settings: fix unexpected routing selection" into main
2024-07-05 06:46:04 +00:00
hoffc
99e33291d3
Settings: fix unexpected routing selection
...
setRouterGroupId in WifiDisplayPreferenceController will result in unexpected routing selection in MediaRouter, which will lead to WFD scanning not be triggered when entering WFD settings page if there is one remembered WFD device exists before reboot.
Remove the set group id call.
Bug: 351110755
Change-Id: I0d434543338d9896116541963f31e4669d877ea8
2024-07-04 09:02:23 +00:00
Pawan Wagh
86a9e06419
Repost PageAgnostic mode notification when dismissed
...
Device is in experimental mode when using 16kB developer option.
When the notification is dimissed, repost it again.
Bug: 351029724
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Flag: EXEMPT bugfix
Change-Id: Ie579b6c4dd060b165c6cc8ae635d48e257d49bec
2024-07-03 22:00:45 +00:00
Alina Zaidi
7b4fcc6006
Merge "Update OWNERS for DesktopModePreferenceController" into main am: ed9bccb0b3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3159736
Change-Id: I79c2dd015ce63fa0fe658daf486971f48917f0ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 17:37:22 +00:00
Alina Zaidi
ed9bccb0b3
Merge "Update OWNERS for DesktopModePreferenceController" into main
2024-07-03 16:42:23 +00:00
Alina Zaidi
a059eabdb3
Update OWNERS for DesktopModePreferenceController
...
Change-Id: I446525a06480a27f80e530c65181fd31f43a9ef8
Test: N/A
Flag: EXEMPT Ownership cannot be flagged
2024-07-03 16:22:23 +00:00
Pawan Wagh
fdd68f473b
Merge "Fix flaky test for persistent notifications" into main am: b6fc7a6f58
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3156445
Change-Id: I0c2f3c0445e06e63a26cc69efa326c8ccabf0e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 15:36:52 +00:00
Pawan Wagh
b6fc7a6f58
Merge "Fix flaky test for persistent notifications" into main
2024-07-03 15:14:25 +00:00
SongFerng Wang
7423e21ba3
[automerger skipped] Merge "Fix AppBatteryPreferenceTest flaky" into main am: 5462789fae
-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/+/3077806
Change-Id: I801504ca58905818b24c761bd4b331cac195857f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 09:47:55 +00:00
Chaohui Wang
362df0c72b
[automerger skipped] Fix AppBatteryPreferenceTest flaky am: 6a6a263177
-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/+/3077806
Change-Id: Icc52784d754185fad53557d964344f267940d8a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 09:47:50 +00:00
SongFerng Wang
5462789fae
Merge "Fix AppBatteryPreferenceTest flaky" into main
2024-07-03 09:34:52 +00:00
Pawan Wagh
999b8a9f33
Fix flaky test for persistent notifications
...
Persistent notifications test sometimes fails due
to setup activity doesn't exit due to failed intent.
Adding setup exit command when on device tests are starting and
adding timeout for transition.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Flag: EXEMPT bugfix
Bug: 349820489
Change-Id: Iaf1c1f481612367bbce919b27e89f88a24abb582
2024-07-02 23:57:57 +00:00
Chaohui Wang
6a6a263177
Fix AppBatteryPreferenceTest flaky
...
Bug: 350448913
Test: unit test
Merged-In: I5a1753835d2d47712ea249081c9a77c455eb3291
Change-Id: I5a1753835d2d47712ea249081c9a77c455eb3291
2024-07-02 23:28:49 +00:00
Treehugger Robot
97f101474a
Merge "Fix UI issues in localization" into main am: ce20ff98e3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3151118
Change-Id: If588199369afe82c6c84a1772bba2462997a70b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-28 22:20:43 +00:00
Treehugger Robot
ce20ff98e3
Merge "Fix UI issues in localization" into main
2024-06-28 22:04:35 +00:00
Qiang Chen
9507c61155
Settings: Adapt edge-to-edge enforcement
...
Android 15 enables edge-to-edge by default. WI-FI info should do the
adaptation, or not some UIs may be obscured by system bars.
Apply window insets for WifiConfigInfo and WifiStatusTest activity
content layout.
Bug: 340713923
Test: Manaul
Change-Id: Iecaadfa1be55544809b240df9c2097e3b4d053f9
2024-06-28 12:44:24 +05:30
Pawan Wagh
234872e187
Fix UI issues in localization
...
- Some of the locales don't display entire text and BigTextStyle doesn't
display ellipsis for them. Removing bigText.
- Fixing strings to display 4KB
- Reduce string for bootloader unlock title
Bug: 345291007
Bug: 343893991
Bug: 343815951
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Flag: EXEMPT bugfix
Change-Id: I3e5bf9bf70be1240cfe7d3a381bb8fef62ce2efa
2024-06-27 19:49:38 +00:00
Jason Chiu
6234e5a2fb
Merge "Allow the background activity start from legacy suggestion cards" into main am: d78409d41f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3148096
Change-Id: If973cd5c6aa3d743fc7e764b8c59101311ad06ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-27 04:35:52 +00:00
Jason Chiu
d78409d41f
Merge "Allow the background activity start from legacy suggestion cards" into main
2024-06-27 04:14:16 +00:00