Bill Yi
d86bb6ee9f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ccd859add
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: Ie276d18775fac66211a1a7f2f7445324aa3fb923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:32:41 +00:00
Amy Hsu
b13a190ef7
Merge "[RRS] Send event to AccessibilityManager when an unselect radio button is selected." into tm-d1-dev am: c799cb11f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893206
Change-Id: I206b788c8985b7ebc20093275ed4d1c272349e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-20 09:03:38 +00:00
Amy Hsu
c799cb11f5
Merge "[RRS] Send event to AccessibilityManager when an unselect radio button is selected." into tm-d1-dev
2022-09-20 08:30:41 +00:00
Bill Yi
2ccd859add
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I74590f996207dc0d583d05b2c28628e328d9fe79
2022-09-19 20:34:29 -07:00
Amy Hsu
fc3f25c8b5
[RRS] Send event to AccessibilityManager when an unselect radio button is selected.
...
Change the screen resolution will cause re-layout the screen, so the focus will back to the first view. Before we actually set the screen
resolution, send an event to the AccessibilityManager and set what it
should say when the user selects the unselect option. Therefore TB will
say "selected" before the screen refreshes.
bug: 229352892
Test: Enable/disable Talkback and check RRS app behaivor. It should read
"selected" after user choose one un-selected option.
Change-Id: If14ed3685f85962d4e4b1d4961216c6ca5d5f0f8
2022-09-16 07:09:47 +00:00
Treehugger Robot
e6901aedba
Merge "Mark DataUsageState as nullable to avoid potential NPE risk" am: 0960af0bf3
am: 325b033f85
am: 8c4db8e545
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2217422
Change-Id: Ic87c58e6eb59b154258a97ff54c0e5295637af12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-15 13:15:30 +00:00
Treehugger Robot
8c4db8e545
Merge "Mark DataUsageState as nullable to avoid potential NPE risk" am: 0960af0bf3
am: 325b033f85
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2217422
Change-Id: Ie9d5325556a31c72af3520879212e5fc526ea0dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-15 12:45:07 +00:00
Treehugger Robot
325b033f85
Merge "Mark DataUsageState as nullable to avoid potential NPE risk" am: 0960af0bf3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2217422
Change-Id: I459cae5f473576dd3d9c4f8ee6fa9e7f5581ad75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-15 12:16:23 +00:00
Treehugger Robot
0960af0bf3
Merge "Mark DataUsageState as nullable to avoid potential NPE risk"
2022-09-15 11:56:51 +00:00
Shen Lin
eb627be0b4
Mark DataUsageState as nullable to avoid potential NPE risk
...
mDataUsageState is nullable in UnrestrictedDataAccessPreference.java, so we'd better
add a annotation to getDataUsageState(), and add a null-check before calling it.
Bug: 246828843
Test: manual and Robotest.
Change-Id: If7fea53ec7efd004391a09becdba5709ae686f40
2022-09-15 14:23:38 +08:00
Treehugger Robot
9c695a54f5
Merge "Fix compile warnings due to non-varargs call of varargs method" am: 8b0e08ecee
am: ca3213bf88
am: be35244362
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207309
Change-Id: I11dd065ebb4f1092207fae5b2b78a62f26049a60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 05:28:37 +00:00
Treehugger Robot
68a63e0280
Merge "Fix the IllegalArgumentException from RecyclerView" am: 8f793f5e4f
am: 227b8f0272
am: 4aea873647
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2216421
Change-Id: Iaad1dacbe8f2b477876bc0c12a49bafdfc4dd449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 05:28:17 +00:00
Treehugger Robot
be35244362
Merge "Fix compile warnings due to non-varargs call of varargs method" am: 8b0e08ecee
am: ca3213bf88
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207309
Change-Id: I2562d3ac792867e5b19539ce82137b3fc2dfe40e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 04:58:18 +00:00
Treehugger Robot
4aea873647
Merge "Fix the IllegalArgumentException from RecyclerView" am: 8f793f5e4f
am: 227b8f0272
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2216421
Change-Id: I171aa7c274c51bf67f5a34740782c7ce78f88a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 04:57:58 +00:00
Treehugger Robot
ca3213bf88
Merge "Fix compile warnings due to non-varargs call of varargs method" am: 8b0e08ecee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207309
Change-Id: I87f90878ea379a8f27bd57c13dc777803ec248a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 04:28:52 +00:00
Treehugger Robot
227b8f0272
Merge "Fix the IllegalArgumentException from RecyclerView" am: 8f793f5e4f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2216421
Change-Id: Iad4eab5a28611ea7e8473f34ebb8af9b00158a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-14 04:28:19 +00:00
Treehugger Robot
8b0e08ecee
Merge "Fix compile warnings due to non-varargs call of varargs method"
2022-09-14 04:16:30 +00:00
Treehugger Robot
8f793f5e4f
Merge "Fix the IllegalArgumentException from RecyclerView"
2022-09-14 03:55:49 +00:00
Automerger Merge Worker
808da23434
Merge changes from topic "am-67940f1d9e3d4b94b33b6942a61a0c02" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56
-s ours am: dd445a736a
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748
-s ours am: ffd1ed3a00
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080
-s ours am: 5020aeaf5b
-s ours
2022-09-13 18:54:26 +00:00
TreeHugger Robot
338c608012
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56
-s ours am: 73cfa8885a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I463ef303e41f838db56589f2e01d07168fe79cd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:51:51 +00:00
Bill Yi
fd8f0fee80
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748
-s ours am: cd1753080f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I7cb16d01b31890db0f2b5bc585120d9e52491b44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:51:37 +00:00
TreeHugger Robot
9dbda868e8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56
-s ours am: dd445a736a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I22d4e5beabb84f2f7eb204df23f62aee984fd82f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:51:32 +00:00
Bill Yi
63fc658151
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080
-s ours am: 92b538c0f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032
Change-Id: I204587378c45b54606f0faea021e442f0d5fffd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:51:25 +00:00
Bill Yi
7334ac9765
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748
-s ours am: ffd1ed3a00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I54e65f48186d28ab71978cadb4d5aa6c9cb76ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:51:18 +00:00
Bill Yi
94b95cd07c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080
-s ours am: 5020aeaf5b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032
Change-Id: Ifb42aaa4bc5b011d9c5397096e341818c06989bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:51:06 +00:00
TreeHugger Robot
dd445a736a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I7dcc61b6ab4486462819e00f32ad0257eab4bac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:11:40 +00:00
Bill Yi
ffd1ed3a00
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I727cf5bfa8c148e0f589bd8c8e87aa8d59fd7c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:11:26 +00:00
Bill Yi
5020aeaf5b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032
Change-Id: Ib510c3a81b652a330367a43560050f78531f34ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:11:14 +00:00
TreeHugger Robot
73cfa8885a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I4b0bb9c5644698a69ea1bac97dab0d14a99163fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:11:07 +00:00
Bill Yi
cd1753080f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I28cc254ac98e63f6ca79b17a0e0938a5a8961ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:10:55 +00:00
Bill Yi
92b538c0f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032
Change-Id: I1146a9d8ceea29a070889cab45fe93aeb1189b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:10:40 +00:00
TreeHugger Robot
d04dc24d56
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-09-13 17:20:55 +00:00
Shen Lin
c463aee2b8
Fix the IllegalArgumentException from RecyclerView
...
Attempt to remove the animator as early as possible to avoid a RecyclerView crash.
Bug: 246411107
Related bug: 184214085
Test: manual.
Change-Id: I8fcb06836217f4de200a53bb88a1a0b5e42bbe21
2022-09-13 08:46:30 +00:00
Bill Yi
65b45b6ecb
[automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616
-s ours am: 3464e33135
-s ours am: 9c26bb64b8
-s ours
...
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399
Change-Id: Ie01abae883d751824703018a75ef7a41de38cc8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-12 20:29:27 +00:00
Bill Yi
aab60c8d68
[automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4
-s ours am: 49efcf7816
-s ours am: 517f250e13
-s ours
...
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399
Change-Id: I17f23d231f04f41092a3be5ce59a732faad85b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-12 20:29:16 +00:00
Bill Yi
9c26bb64b8
[automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616
-s ours am: 3464e33135
-s ours
...
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399
Change-Id: Id4b69cddf31a9a3d0bb781d7fecd0f21d369c0c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-12 19:57:13 +00:00
Bill Yi
517f250e13
[automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4
-s ours am: 49efcf7816
-s ours
...
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399
Change-Id: I9474f8a455c20b5335f584ba8261fd5b29435995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-12 19:57:01 +00:00
Bill Yi
3464e33135
[automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616
-s ours
...
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399
Change-Id: I20ddfee04e6de1e681b647a97296fcf29d97ce66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-12 18:56:26 +00:00
Bill Yi
49efcf7816
[automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4
-s ours
...
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399
Change-Id: I3e2c668af16aec333680c1ac7fad768b1db94c6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-12 18:56:14 +00:00
Bill Yi
677cd61616
Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE"
2022-09-12 17:59:03 +00:00
Bill Yi
a4f092c748
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie871e5bb344fce432b8741e50b34954cf5fc6ec9
2022-09-11 16:28:01 -07:00
Bill Yi
f3457e4080
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iee13f8fc3f15a25a78f77111b5098b3a01d5ab8f
2022-09-11 16:23:01 -07:00
Treehugger Robot
2d1b325cd0
Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad
am: 1f9c4c483a
am: 693ce48efb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776
Change-Id: If71d8f5e024a9ecc993ff35140995c3627c85196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-09 15:46:13 +00:00
Treehugger Robot
693ce48efb
Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad
am: 1f9c4c483a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776
Change-Id: I2b246b643ff341ff8a2158cbabd3f4a33c04703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-09 15:18:57 +00:00
Treehugger Robot
1f9c4c483a
Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776
Change-Id: Ib115186ff66f8246082bc274624cb116a63c790c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-09 14:49:24 +00:00
Treehugger Robot
4378ee11ad
Merge "Fix potential NPE crash in ConversationHeaderPreferenceController"
2022-09-09 14:20:05 +00:00
Shen Lin
78fc8a21a4
Fix potential NPE crash in ConversationHeaderPreferenceController
...
mChannel is nullable and we have to do a null-check before calling its method.
Bug: 245506600
Test: manual and atest
Change-Id: Ib739f0f66f1a2aee1b2741263e7c206341782892
2022-09-09 10:16:29 +08:00
Bill Yi
89fe1313c2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727
-s ours am: 158bf69a42
-s ours am: 4ad699717a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917
Change-Id: Ic78f0dbf0eb4e14f8c10855fbd7219f70d315b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 22:58:30 +00:00
Bill Yi
bbd35cbe45
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023
-s ours am: 19de182abb
-s ours am: f1d8ba94d5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917
Change-Id: I3f20fbccb440dce4ae45998ab8714310476a3285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 22:58:12 +00:00
Bill Yi
19640b0bc2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a
-s ours am: 5f1549cee7
-s ours am: 28d6d5a7c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916
Change-Id: I8f4ced9ea0c104aeabf97c3b7f1634aecda90330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 22:57:51 +00:00