Treehugger Robot
984e74a32e
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
am: 61d8dee2a0
am: 41e0e6fea7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: I03ee47dea1bfc1ac0f5d6f49e738346571f304e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 09:57:27 +00:00
Treehugger Robot
41e0e6fea7
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
am: 61d8dee2a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: Iaeef4967d528aca3e4d66f98952635cb97ed9350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 09:27:24 +00:00
Treehugger Robot
61d8dee2a0
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: Ib4c2a39144bfe7870f39e5797cf42c75b9a49572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 08:54:52 +00:00
Treehugger Robot
4d5951c6ef
Merge "Settings: Protect sensitive data on the about phone"
2022-09-24 08:23:53 +00:00
Tom Hsu
1a4f16cd70
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
am: 7e610abd3c
am: 7c813dced4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Iaccb8b8c54a5f84ed3ca6fec869ba0153f4eb623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 07:59:37 +00:00
Tom Hsu
7c813dced4
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
am: 7e610abd3c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Iacf9e213bb1f40859320957d7846803f4aeaa30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 07:32:19 +00:00
Tom Hsu
7e610abd3c
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Icd4cb165939b49e24ebbc83059c55914610e7eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 07:01:01 +00:00
Tom Hsu
8a9dc9ca90
Merge "[Settings] Update UI when bluetooth connection is down."
2022-09-23 06:39:35 +00:00
Gil Cukierman
ccfd44162f
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
am: 24ac97a0bf
am: 1f750fcba6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: I43a581174938d47bb6b5aea5eb552057a5ce9b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 16:12:54 +00:00
Gil Cukierman
1f750fcba6
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
am: 24ac97a0bf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: I50305e27b205160d85825143f614cd52b1bab2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:23:54 +00:00
Gil Cukierman
24ac97a0bf
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: Ib46bd4f287a80582afb67f7ef052a3ff25862b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 14:30:53 +00:00
Gil Cukierman
594002e21a
Merge "Use AAPT2 For SettingsUnitTests"
2022-09-22 13:40:19 +00:00
tom hsu
3d138b372b
[Settings] Update UI when bluetooth connection is down.
...
- When Airplane mode on, all connection shall be disconnected. In
current design, when bluebooth disconnected, network page in Settings
does not udpate the UI.
Bug: b/246925011
Test: Maunal
Change-Id: I1bf56e96737157d8e76057028b22e94e0e8d76e4
2022-09-22 19:34:35 +08:00
TreeHugger Robot
8849c71d38
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6
-s ours am: 323d7fa302
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Ic0ff3c28c3c810ee4a2b026ddaaea3c582303591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:27:13 +00:00
Bill Yi
dd99336380
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b
-s ours am: 5d5b545e3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Id2519e8ee136982781b6900db4e51750a0867364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:26:56 +00:00
Bill Yi
5d07821c08
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3
-s ours am: f15ab25c5b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: I141e9f19a823a7dc5acb56aea963f613e571f39f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 22:26:44 +00:00
TreeHugger Robot
79dbc576ec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6
-s ours am: ac3b26c186
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I7658bd07de80149507d170281bad250b7654539c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:47:13 +00:00
Bill Yi
3e363c0549
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b
-s ours am: f6a5f7a782
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I2ef6f1ef7674f64d7f239f7424f68423f846ff38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:46:57 +00:00
Bill Yi
c2faa5ccc6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3
-s ours am: 9cc6bc637f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: I6b2953e71ef984f008f2fc2762d5fe3804f6b702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:46:41 +00:00
TreeHugger Robot
ac3b26c186
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Idfa7dec8282c603577c87c8be95953270eb34ed5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:34:28 +00:00
Bill Yi
f6a5f7a782
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I90e4740ba9156827905152924cd4e16c837043d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:34:11 +00:00
Bill Yi
9cc6bc637f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: If23cbcb75bb7c7101a7a40943082b78c90d0ad99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:57 +00:00
TreeHugger Robot
ac92abd818
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 85702ae62d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: I37b11ce456cd9165250295ac7052be3edc13b868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:08 +00:00
Bill Yi
ac8e5a5efd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fbf2cd00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: If53f0cbd33af90bac023c46636cc1e705e9a33bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:00 +00:00
TreeHugger Robot
e0e3ca6646
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f33a95d6f8
-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: I200fba460875d49b6864e06de995d910e0315671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:32:51 +00:00
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
TreeHugger Robot
323d7fa302
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Ia7c89c65eb9c4a92614e9c8d071c9ca0dbe5a988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:31:00 +00:00
Bill Yi
5d5b545e3d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I930d2dca18728294d91ce946055de46c228c1412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:30:46 +00:00
Bill Yi
f15ab25c5b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: Ieef58eb9ebb601a187194d713d60d4097e0a3948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:30:22 +00:00
Gil Cukierman
4429054bb1
Use AAPT2 For SettingsUnitTests
...
Forces tradefed to use aapt2 for SettingsUnitTests to get around
the issue of Settings.apk not being parseable by aapt.
Bug: 247779071
Test: atest SettingsUnitTests
Change-Id: I8af260f8d2c438512d3e61f0028accf7b40c8a00
2022-09-21 17:48:20 +00:00
TreeHugger Robot
7c21f2eaa6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-09-20 23:20:11 +00:00
TreeHugger Robot
85702ae62d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-09-20 21:00:30 +00:00
TreeHugger Robot
f33a95d6f8
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-09-20 21:00:30 +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
51fbf2cd00
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I097bac3bd6e774f0cac2eb4b46723f7fa5ec7641
2022-09-19 20:43:49 -07:00
Bill Yi
5c3d8f340b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I985329532c210b25458142a2c0fb637056ba384e
2022-09-19 20:37:28 -07: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
Bill Yi
6a44c6afa3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3ddd1cecee3dbd09bb5fb12541666e3ec09d0b1f
2022-09-19 20:31:46 -07:00
althafvly
ed95f35423
Settings: Protect sensitive data on the about phone
...
- Hide some personal info like phone number and IMEI.
- IMEI shows on a tap, so why not.
- Avoid showing this in screenshot/screenrecord
Co-authored-by: El Dainosor <eldainosor@gmail.com >
Change-Id: I45b7898da440c36045aec64a0a86fb804116cd9d
2022-09-17 13:48:02 +00: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