Treehugger Robot
fa97f902d7
Merge "Add MaterialComponents.DayNight to SearchBarStyle" into main am: 71c59bae9c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3252493
Change-Id: I4f85371e9ebe33b896192e4f47e033dee1592a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-16 07:07:04 +00:00
Treehugger Robot
71c59bae9c
Merge "Add MaterialComponents.DayNight to SearchBarStyle" into main
2024-10-16 06:51:55 +00:00
Robin Vinterbladh
dc419524c5
Add MaterialComponents.DayNight to SearchBarStyle
...
When opening the Settings app or changing colors in ThemePicker
there are tons of warnings with UnsupportedOperationException in
the log. These logs are related to the
LayoutInflater attempting to inflate a MaterialCardView and
TypedArray#getColor where it expects the colors to be either an integer
color or a color state list. This happens every time you re-start
Settings.
To enable layout inflater finding colors for Settings we add a
MaterialComponents theme to SearchBarStyle, this makes sure that
TypedArray#getColor gets an integer color instead of relying on
framework to solve this.
Flag: NA
Bug: 363970601
Test: manual, open Settings and check the logs
Change-Id: I728c1537537bb4d32af6006800de93e64facfa8e
2024-10-16 01:05:12 +00:00
Tom Hsu
60d85b9363
Merge "Avoid test flaky" into main am: ec571901be
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3304564
Change-Id: Id61fef14f799f141304afba7cb2f9cd3fde7e0a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-14 04:28:08 +00:00
Tom Hsu
ec571901be
Merge "Avoid test flaky" into main
2024-10-14 04:13:25 +00:00
Tom Hsu
9832fe9281
Avoid test flaky
...
flag: EXEMPT bugfix
fix: 365673174
Test: atest passed
Change-Id: Id7c3747eafff3410ab899716d0c6e35eb405c76e
Merged-In: Id1290e6979fdafa93ded6f50e49d6b3464a80b50
2024-10-11 05:15:14 +00:00
Paul Duffin
aea2622b91
Merge "Fully qualify @attr reference to android.R field" into main am: e61c03648d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3296753
Change-Id: Ic25c2d5d5e0c2ba9a9da492f2bb5be1f1b2bb458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-08 09:00:55 +00:00
Paul Duffin
e61c03648d
Merge "Fully qualify @attr reference to android.R field" into main
2024-10-08 08:31:47 +00:00
Treehugger Robot
3c2d44c3ff
Merge "Fixes for errorprone update" into main am: 28f83ffab0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3297590
Change-Id: If54aa111229245173d625b445cf9e1f10182196d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-07 20:40:21 +00:00
Treehugger Robot
28f83ffab0
Merge "Fixes for errorprone update" into main
2024-10-07 20:25:20 +00:00
Cole Faust
b237fe7e6a
Fixes for errorprone update
...
When updating errorprone from 2.23.0 -> 2.32.0, more issues are found.
Bug: 253827323
Flag: EXEMPT refactor
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: Iebb442f5e616861d1f2a2e2dc56a8ac72b18cb95
2024-10-07 11:27:07 -07:00
Paul Duffin
ad48f03f53
Fully qualify @attr reference to android.R field
...
Currently, Metalava has some special handling of '@attr ref R.<field>`
references to make sure that they are fully qualified, i.e.
`@attr ref android.R.<field>`. That special handling complicates
Metalava and is blocking some flagged API work so will be removed.
Before that can be done, the existing incorrect documentation needs to
be cleaned up.
This change cleans up those cases in this repo.
Bug: 371997321
Test: Run `m offline-sdk-docs` before and after to make sure that
there are no differences.
Flag: DOCS_ONLY
Change-Id: Ic97f01b90193d058d65e6d3c6d0a04ce5e55d7c7
2024-10-07 17:10:02 +01:00
Treehugger Robot
2c3fbda054
Merge "Add a check to ensure that intent data is available before proceeding." into main am: 9a0ba22e79
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3278732
Change-Id: I9964a5759041f686bfe905e10e013ff663c666b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-27 10:13:07 +00:00
Treehugger Robot
9a0ba22e79
Merge "Add a check to ensure that intent data is available before proceeding." into main
2024-09-27 09:54:21 +00:00
Treehugger Robot
5c3c9cbdeb
Merge "Use hasScrollAction in ApnEditPageProviderTest" into main am: 12f2e1cf4f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3283218
Change-Id: I1d66aa2b883c0b8d6375b99b23fda25535820c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-26 11:13:22 +00:00
Treehugger Robot
12f2e1cf4f
Merge "Use hasScrollAction in ApnEditPageProviderTest" into main
2024-09-26 10:54:50 +00:00
Treehugger Robot
840f5a573d
Merge "Protect the Settings application from potential null pointer exceptions." into main am: 6a4fb45e38
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3282054
Change-Id: I1c6daaf44b7be4aeaa65fce50711d7e75f511e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-26 10:47:30 +00:00
Treehugger Robot
6a4fb45e38
Merge "Protect the Settings application from potential null pointer exceptions." into main
2024-09-26 10:30:43 +00:00
Chaohui Wang
bb1cadb916
Use hasScrollAction in ApnEditPageProviderTest
...
Instead of assuming a fixed tree structure in testing.
Fix: 369416630
Flag: EXEMPT gradle only
Test: atest ApnEditPageProviderTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0b530fd405eb95dfedf51bc55bc24bd7d446ead8 )
Merged-In: I0a50e7665d9049e089b5a0877f17d1f736ee3332
Change-Id: I0a50e7665d9049e089b5a0877f17d1f736ee3332
2024-09-26 10:20:38 +00:00
Abdelrahman Daim
996afd17a1
Protect the Settings application from potential null pointer exceptions.
...
Summary: The app bar is not available, causing a null pointer exception.
Test: Successful Build on master branch
Change-Id: I36849606f6587d6e7f004ae21e1a6e6a5206735a
Signed-off-by: Abdelrahman Daim <adaim@meta.com >
2024-09-25 17:02:37 -07:00
Abdelrahman Daim
3be2314fac
Add a check to ensure that intent data is available before proceeding.
...
Summary: There are instances where intent data is absent, leading to a crash while trying to retrieve the schema. This change adds a null check to prevent attempted access when there's no data.
Test: Successful Build on master branch
Change-Id: Ie83bd3243f2c79102061d3fa43d809b3ef3c6c78
Signed-off-by: Abdelrahman Daim <adaim@meta.com >
2024-09-24 12:21:22 -07:00
Treehugger Robot
6b7becf63e
Merge "Fix errorprone issues" into main am: fdbd2d1090
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3269750
Change-Id: Ic329c9b9a82ee8e16b6c94264b3bc6001d98caac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-17 21:59:11 +00:00
Treehugger Robot
fdbd2d1090
Merge "Fix errorprone issues" into main
2024-09-17 21:38:22 +00:00
Cole Faust
784411fc25
Fix errorprone issues
...
IgnoredPureGetter, LenientFormatStringValidation, ProtocolBufferOrdinal, and ReturnValueIgnored.
https://errorprone.info/bugpatterns
Bug: 253827323
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: I9975c8689c9d673d0b676c60d68ccec1953470f8
Merged-In: Ia0e16b8be5284d13bed4366cbee0f92748bf2f85
2024-09-17 14:08:00 -07:00
Treehugger Robot
d387132098
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2024-09-11 23:07:15 +00:00
Treehugger Robot
0e72c6c9eb
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2024-09-11 23:07:15 +00:00
Treehugger Robot
41ac6310b3
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2024-09-11 23:07:15 +00:00
Bill Yi
ffd51906c0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: feee29caf8
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3262006
Change-Id: I5a82f9cc705d725f3c000fec95f181cc27d76bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 23:00:28 +00:00
Bill Yi
1d89705c11
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 905e347339
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3262006
Change-Id: I123d9f94f21772c268f4ab114ee89e0cdadfd3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 23:00:22 +00:00
Bill Yi
7fe805ba53
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 110375b901
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3260548
Change-Id: Ic89b524acd5125ca3220e0bbcfaaeb7fd678ef6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 23:00:18 +00:00
Bill Yi
1ecafa4265
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65d9c39a51
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3260548
Change-Id: Ide486ac722c55d598195a8dfb003e3d9cb1b62f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 23:00:10 +00:00
Bill Yi
e642348450
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: ce0fa685e4
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3260547
Change-Id: I57344ae5ccb4e7c0d854ce6c3a915e69b2054a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 22:59:59 +00:00
Bill Yi
3dbd7c54bd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 730b913bc6
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3260547
Change-Id: I21289bfbdaa4ff581272f87cc6b626bc12a05ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 22:59:52 +00:00
Bill Yi
feee29caf8
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-09-11 22:30:21 +00:00
Bill Yi
110375b901
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-09-11 22:30:21 +00:00
Bill Yi
ce0fa685e4
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-09-11 22:30:21 +00:00
Bill Yi
83f6b71ae7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie36b23e48077023708c6a7bf895ae49ecd4ee099
2024-09-11 13:48:32 -07:00
Bill Yi
ecccb8c92f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4da9179b61e9fb32525708c49bd26a208754d65a
2024-09-11 13:46:06 -07:00
Bill Yi
1d24d09091
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie7a6d17a7356827e2d823fa8f3e9fb312c5d210b
2024-09-11 13:44:14 -07:00
Bill Yi
65d9c39a51
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If28bc3a57b9e98862b7f7fd5bc57167171e6009d
2024-09-11 12:07:00 -07:00
Bill Yi
905e347339
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9205a5ec80240c5ca11946c6e03b4b0e11769c83
2024-09-11 12:05:13 -07:00
Bill Yi
730b913bc6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I40a62c487bc7916eac67a878a59ce68a2139c694
2024-09-11 12:03:50 -07:00
Treehugger Robot
bdd44e5242
Merge "Fix errorprone issues" into main am: eb2e9e4776
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3258078
Change-Id: Idaa9fc8fe53588c16959948de0f32ab74d5187ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 18:13:59 +00:00
Treehugger Robot
d459385feb
Merge "Make java_sdk_library dependencies explicit" into main am: dd578b8274
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3247681
Change-Id: I367d149d944129e2c545bde70690733a235cae5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 18:10:52 +00:00
Treehugger Robot
eb2e9e4776
Merge "Fix errorprone issues" into main
2024-09-11 18:08:19 +00:00
Treehugger Robot
dd578b8274
Merge "Make java_sdk_library dependencies explicit" into main
2024-09-11 17:58:59 +00:00
Jihoon Kang
4ae6ead8d6
Make java_sdk_library dependencies explicit
...
modules should specify the submodule of java_sdk_library that the module
actually depends on
Test: CI
Bug: 358613520
Merged-In: I78dec317d4e74275287e3a5b7f5ffe2b10db05ab
Change-Id: I78dec317d4e74275287e3a5b7f5ffe2b10db05ab
2024-09-10 22:43:05 +00:00
Chun-Wei Wang
6eccd73996
Merge "Support alternate button" into main am: 88bbe8fe1d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3244020
Change-Id: I875a923cac31bd561ff5a1cbf80000d6a1c3803e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-09 14:26:02 +00:00
Chun-Wei Wang
88bbe8fe1d
Merge "Support alternate button" into main
2024-09-09 14:18:11 +00:00
Xin Li
d47d22ecaf
[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 3efb972a55
-s ours
...
am skip reason: Merged-In Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a with SHA-1 b781605c1e
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3258498
Change-Id: Idfb56e083de5edfc54c71641994bb56d0903e179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-07 02:27:57 +00:00