Matías Hernández
b971690a4e
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
am: d7608c84b4
-s ours am: 78a4048eac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I26937792ea087b7b2516e71525fa12602d312696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 14:26:51 +00:00
David Magno
50e8eab484
'Mobile plan' is searchable even if it is unavailable
...
'Mobile plan' yields a search hit event though the 'Mobile plan'
setting is unavailable on the device.
Bug: 287198186
Test: Manual
Change-Id: Ibc6f01602a364ae902f8a6ce15083890e89446d2
2023-06-14 16:25:27 +02:00
Matías Hernández
0aa241be99
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I8cd7cc9605b3728f9f96c3479d17aa1b362d9cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 14:22:10 +00:00
Matías Hernández
a49e14f8ff
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I840d7836ae899bcd40eafc772b96c9460c3f8a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 13:42:07 +00:00
Matías Hernández
78a4048eac
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
am: d7608c84b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: Ifee74173a3e0f410d4d76f06149b496a9ae62241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 13:40:43 +00:00
Matías Hernández
50df60c93c
Don't hide approved NLSes in Settings am: ff255c6eda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I42099e38ef7b479b9339b545fe8d12d3bbe95112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 12:57:15 +00:00
Matías Hernández
d7608c84b4
DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I11ee7cc3bfd291f32e602eff65ce93ba57bcc407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 12:52:41 +00:00
tom hsu
bcd6bf1f8f
[Settings] Fix roboletric test fail and add new test case.
...
Bug: 287177689
Test: atest passed
Change-Id: If927f4e4bf7ee9702e865e77f350164a93729940
2023-06-14 10:13:55 +00:00
SongFerng Wang
7f29649aa9
Merge "Remove the owner" am: 286344d539
am: 448c8b61a8
am: 61ef9024c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772
Change-Id: I278260f1a36ed24fd1ca2d53ffc7ff2431fd1005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 07:54:48 +00:00
SongFerng Wang
61ef9024c8
Merge "Remove the owner" am: 286344d539
am: 448c8b61a8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772
Change-Id: I9b061b1c90bc7033e4400d192ed5211e9ea9bb13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 06:20:17 +00:00
SongFerng Wang
448c8b61a8
Merge "Remove the owner" am: 286344d539
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772
Change-Id: Iad21da9fbcd8d9279c27beb7a7c0761644d8f2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:36:47 +00:00
Treehugger Robot
e2ee732578
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c
-s ours am: ee8cd42af0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: Ia4c331a763becd473d4fcb399e1d548c1fd1a334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:09:36 +00:00
Bill Yi
a49576b187
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6
-s ours am: 4368d3a79a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I28779f4e321c73a8ddf81f0a9c0659359e5c9a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:09:32 +00:00
SongFerng Wang
286344d539
Merge "Remove the owner"
2023-06-14 05:01:51 +00:00
Treehugger Robot
ee8cd42af0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: Ib395e7d7df3c13dd700f0345e26b4304a78d6bfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:26:39 +00:00
Bill Yi
4368d3a79a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I3cf6e2db154acc9d2b64a47a9fd1a43e70e10063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:26:23 +00:00
Treehugger Robot
7e88b1ed07
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: Icd531ab1576b548a996d8f975d130eefb8a30360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:42:34 +00:00
Bill Yi
d0d5c9d84c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I87b24056f4a0d370634fe2ccc2237ea8045fddea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:42:25 +00:00
Treehugger Robot
7930f72c4d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: I850098c780abe7d600eee7243df0f033d387f1c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:42:18 +00:00
Bill Yi
7c2f3a4ba1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Ibcd3f5106e8f6ca98315c92437b7a0179f1e66ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:41:55 +00:00
Treehugger Robot
7d610e7f85
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I12b528b5410a96bf63d6fb645f12682e57e40b6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:41:36 +00:00
Bill Yi
94f17b981a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I29ed00f4ef95520f1ebbe6ecdadf9eaa6d1432c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:41:19 +00:00
Zaiyue Xue
da62051efd
Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: Ie9e6621a39e30b5ba000e2bf6516719eea2a8fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 03:39:42 +00:00
Treehugger Robot
b8ddf4126c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-06-14 03:33:21 +00:00
Treehugger Robot
a505517090
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:32:14 +00:00
Treehugger Robot
c706f8544d
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:32:14 +00:00
Treehugger Robot
958690e3a5
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:32:14 +00:00
Zaiyue Xue
8c25fe4c60
Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev
2023-06-14 03:01:25 +00:00
Bill Yi
fec819220b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours am: 32b73cd4ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: If4718b30ee626a955a2da4d2d577116cde5bd6d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:48:15 +00:00
Bill Yi
d152123a74
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a
-s ours am: c7d760438a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I9b83f96b046054735004994bba24dba2b53c610f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:15:54 +00:00
Bill Yi
a20c952bb6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours am: c52befa925
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I2b1476f7e11814649388cc8c08c976b1bb1a643d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:15:33 +00:00
Bill Yi
c7d760438a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29e59fbd3a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664033
Change-Id: I31527b6935660fe76669f6d711beb978e55600b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:08:05 +00:00
Bill Yi
32b73cd4ea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: I5cc0f93640e97a83a96c3e37d1a891dd0dd82d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:04:11 +00:00
Bill Yi
c52befa925
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e54379b8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664037
Change-Id: Iab183d63901b1abd798cce19c452634518daca35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 18:03:19 +00:00
SongFerngWang
f405dadcf2
Remove the owner
...
Bug: 286964921
Test: build pass
Change-Id: I4daf629e8cb994753dca36a811f0d25685df6928
2023-06-13 15:10:46 +08:00
Bill Yi
58628e0170
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2daf643f4601e64d83742cfbf1d895e8b272bc98
2023-06-12 13:36:39 -07:00
Bill Yi
23819646e2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7203e546696a4dde1d8c8f7b32e6a432f7a5bcb8
2023-06-12 13:29:45 -07:00
Treehugger Robot
c823f0aa45
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: Icba0b458b25bdef0dc25a4882c9c8799d0a46885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:29:38 +00:00
Taran Singh
6f6747910d
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057
Change-Id: I44012b898eec57e26fdc4d6d4a38c54578b8a0e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 20:29:37 +00:00
Bill Yi
5e54379b8a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib262798ed73568339f2f5ac4e6cf40c1ab08f7c6
2023-06-12 13:28:15 -07:00
Bill Yi
b86bd3cfe3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I03150507e9d454e50da97bbf70752f7fc2736975
2023-06-12 13:26:17 -07:00
Bill Yi
49d00437a6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id5d119a140094265999e5ac40d4444956d1cbf4c
2023-06-12 13:24:36 -07:00
Bill Yi
29e59fbd3a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9f0371fcd4317dd3da3dbcb11f0b0d472ca24673
2023-06-12 13:22:55 -07:00
Treehugger Robot
decc428857
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev
2023-06-12 19:57:26 +00:00
Han Xu
2fb6c5887d
Add manufactured year into hardware info page am: b452bc9f9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342
Change-Id: I59bab60a59b531e25663b3e34a554f3ac7dfc87b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 17:44:38 +00:00
Han Xu
b452bc9f9d
Add manufactured year into hardware info page
...
Bug: 285471557
Test: manual visually
Change-Id: Iaab254ac6ee77217e29d89524d782577f44119cb
2023-06-12 17:43:55 +08:00
Jason Hsu
d2c7424293
Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965
Change-Id: I4fd0ed02f598224a5f93aa646f8895298a64ac90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 04:09:31 +00:00
Jason Hsu
fecfa96723
Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev
2023-06-12 03:54:11 +00:00
Zaiyue Xue
ec032710dc
Don't load battery entry names and icons in offline job to improve memory usage.
...
Risk: low (The name and icon will be always loaded again in the UI.)
Bug: 280720236
Fix: 280720236
Test: manual
Change-Id: I86f50e953ffd4910acbf9f318e1cc1caa3a7a232
Merged-In: I86f50e953ffd4910acbf9f318e1cc1caa3a7a232
2023-06-12 10:49:01 +08:00
Avinash Vadlamudi
90d3d346e6
[Auto Pin Confirmation]: Add talkback capability for Auto-confirm correct PIN checkbox even if it is not in focus am: 01637b556e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601571
Change-Id: I58b483720e2a7ed6ed5d92094192fe2b7a5f3df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-10 01:58:13 +00:00