summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-01-17Merge Android 24Q1 Release (ab/11220357)HEADmastermainXin Li
Bug: 319669529 Merged-In: Ic17ffe6c6344e65d997a574015d71d7cacbdbbc0 Change-Id: I720d48315a9ace42ff71280c05df2604b3ead109
2023-12-21Merge "List baseline_filename on modules that are implititly using it" into ↵Cole Faust
main am: 66093bf509 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2886449 Change-Id: Ic17ffe6c6344e65d997a574015d71d7cacbdbbc0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21Merge "List baseline_filename on modules that are implititly using it" into mainCole Faust
2023-12-20List baseline_filename on modules that are implititly using itCole Faust
lintable modules currently pick up files named "lint-baseline.xml" to use as the lint baseline implicitly. This is confusing because you could end up using the baseline files in more modules than intended. Lint also has a feature where it requests you remove unnecessary findings from the baseline file, so something could be necessary for one module, but unnecessary for another that accidentally picked up the baseline. We're removing the implicit detection of the baseline file, which requires all modules using it to list the baseline file explicitly. Bug: 272769514 Test: Presubmits Change-Id: Ib640f0642fbb12b96309ce518a505376dda01cb4
2023-12-07Merge "Fix erroneous LXX theme text color mappings" into main am: 1ddd171ce2 ↵Treehugger Robot
am: 50606c8775 am: 2c102c2ae0 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2723073 Change-Id: Id39c69ecf12113811407a1c9826fbeaf2a6622e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Merge "Fix erroneous LXX theme text color mappings" into main am: 1ddd171ce2 ↵Treehugger Robot
am: 64beb0a9e3 am: aa1e083d11 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2723073 Change-Id: I99cbb0639b34ad8db9294be1a09a279bcbfa00c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Merge "Fix erroneous LXX theme text color mappings" into main am: 1ddd171ce2 ↵Treehugger Robot
am: 50606c8775 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2723073 Change-Id: Iac3bacf27d21d97d1b46ab301db934add7c8a30b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Merge "Fix erroneous LXX theme text color mappings" into main am: 1ddd171ce2 ↵Treehugger Robot
am: 64beb0a9e3 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2723073 Change-Id: Iec2d22a85c929da7c163233b344efde4d4ab9cc3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Merge "Fix erroneous LXX theme text color mappings" into main am: 1ddd171ce2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2723073 Change-Id: I2758e3f8cf0bc5a913c956e82b5fc8d2736b55c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Merge "Fix erroneous LXX theme text color mappings" into main am: 1ddd171ce2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2723073 Change-Id: I64bacf809c0c2340b95fd5304bcd4f52a982303e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Merge "Fix erroneous LXX theme text color mappings" into mainTreehugger Robot
2023-11-17Merge "dicttoolkit: pin cpp_std to gnu++17" into main am: 4f396fb453 am: ↵Treehugger Robot
489df8d31c am: be24d24a30 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2833210 Change-Id: I9cfc1f48131079890e7cf606ce3e0695fbf10fa5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17Merge "dicttoolkit: pin cpp_std to gnu++17" into main am: 4f396fb453 am: ↵Treehugger Robot
e6600afade am: 21496a9149 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2833210 Change-Id: If48086c1de5f635d5dbc9eedcca3aa2219fff59a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17Merge "dicttoolkit: pin cpp_std to gnu++17" into main am: 4f396fb453 am: ↵Treehugger Robot
489df8d31c Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2833210 Change-Id: I58e19cabcb483d7d39427dfd131a0429fbd4b263 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17Merge "dicttoolkit: pin cpp_std to gnu++17" into main am: 4f396fb453 am: ↵Treehugger Robot
e6600afade Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2833210 Change-Id: I493d042ec6a733865a5a3f37aeb45520f92d14d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17Merge "dicttoolkit: pin cpp_std to gnu++17" into main am: 4f396fb453Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2833210 Change-Id: I9597e378e9ae4b734d373194b33373e63e2d6f85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17Merge "dicttoolkit: pin cpp_std to gnu++17" into main am: 4f396fb453Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2833210 Change-Id: I3dc6f4e76a131ed874df34a97fc5cab503b343d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17Merge "dicttoolkit: pin cpp_std to gnu++17" into mainTreehugger Robot
2023-11-15dicttoolkit: pin cpp_std to gnu++17Tomasz Wasilczyk
This project doesn't build with gnu++20 and prevents AOSP default to be upgraded to a newer standard. Once the build failure is fixed here, this change can be reverted. Bug: 311052584 Test: m checkbuild Change-Id: If2d19c1b6d970703a1dbf7685588a4a4be5a53c1
2023-10-07[automerger skipped] Merge "Merge Android 14" into main am: 0bba80779a -s ↵Xin Li
ours am: 378d686fee -s ours am: bc1334df98 -s ours am: 70d629ada7 -s ours am: 0bc4569103 -s ours am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: Ic17411a85d7073559f73b5e19dd71eebe5284b0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07[automerger skipped] Merge Android 14 am: 2f0ac31804 -s ours am: 5bbfa7871f ↵Xin Li
-s ours am: ff2fbf654d -s ours am: 7d95f16fe7 -s ours am: 4b819f9f10 -s ours am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: Iac44dca65912624fe1cd8b8f33356dab86ab0d5f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 0bba80779a -s ↵Xin Li
ours am: 378d686fee -s ours am: bc1334df98 -s ours am: 70d629ada7 -s ours am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: If572cc291186a8315e7aac2b775d099f3369d397 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 2f0ac31804 -s ours am: 5bbfa7871f ↵Xin Li
-s ours am: ff2fbf654d -s ours am: 7d95f16fe7 -s ours am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: I6c3ae708500181534b07a6090acdebf221d75736 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 0bba80779a -s ↵Xin Li
ours am: 378d686fee -s ours am: bc1334df98 -s ours am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: Iccb504ade5d581aada92523876c08f7ad86e3660 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 2f0ac31804 -s ours am: 5bbfa7871f ↵Xin Li
-s ours am: ff2fbf654d -s ours am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: Ibd91bf6cd0ac247f5bf0b326d06635ec9077e81b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 0bba80779a -s ↵Xin Li
ours am: 378d686fee -s ours am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: I24b0acd682eed38795430c5b8dff7e435fd16548 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 2f0ac31804 -s ours am: 5bbfa7871f ↵Xin Li
-s ours am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: I093af81fa9587d85c3a6aad982d0ef11f9cf5eae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 0bba80779a -s oursXin Li
am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: I06b761b5d03ddb799a8775797f583f51214e2176 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 2f0ac31804 -s oursXin Li
am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: I251c7e3eaf2ecb4cdd9693ff21576e54942ab660 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge "Merge Android 14" into mainXin Li
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: Ia66766322d6ae8a010b1cb55cc22993fbc6d012c Change-Id: Ic4fcb094b37b72031f9bbd615e2044164aa460a6
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 176fd72c0f -s ours ↵Xin Li
am: 37e099e693 -s ours am: 1016f83ad1 -s ours am: 17a985bf1b -s ours am skip reason: Merged-In I7efbfd50628298c436cb86d5d84af6cbfa7918da with SHA-1 64ce9427f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/24182906 Change-Id: I909c37e05ea794367f1d5ed56c8ebedba86bb9fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 176fd72c0f -s ours ↵Xin Li
am: 37e099e693 -s ours am: 1016f83ad1 -s ours am skip reason: Merged-In I7efbfd50628298c436cb86d5d84af6cbfa7918da with SHA-1 64ce9427f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/24182906 Change-Id: Ia3ca741cbe0adc434a2af8c6469e41f3217c2f4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 176fd72c0f -s ours ↵Xin Li
am: 37e099e693 -s ours am skip reason: Merged-In I7efbfd50628298c436cb86d5d84af6cbfa7918da with SHA-1 64ce9427f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/24182906 Change-Id: Ic2b6fd50ca4a2643968e15c5c91ee0de2a3f250e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 176fd72c0f -s oursXin Li
am skip reason: Merged-In I7efbfd50628298c436cb86d5d84af6cbfa7918da with SHA-1 64ce9427f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/24182906 Change-Id: If8dffda8ab2042b01bcf5dea9d61bafe864b494b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23Fix erroneous LXX theme text color mappingsGeorg Veichtlbauer
keyTextInactivatedColor and functionalTextColor were wrongly assigned, eventhough correct definitions already exist. Change-Id: I06694447ee22fb609267aa2256a36a2585ad6b3f
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: I7efbfd50628298c436cb86d5d84af6cbfa7918da Change-Id: Ic95053849a83d3c13510c05d5fd03cc6863f3b65
2023-03-20Merge "Remove unused variables" am: fe0c000f40 am: 752ef94cfc am: d847619a2b ↵Treehugger Robot
am: 64ce9427f8 am: 5859b263ee Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2445925 Change-Id: Ib7f42a1bf18f07ad2238a2ec00fce0ddfbcc09e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Merge "Remove unused variables" am: fe0c000f40 am: 752ef94cfc am: d847619a2b ↵Treehugger Robot
am: 64ce9427f8 am: 54fceaea60 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2445925 Change-Id: I1186e64df9bad9d5d78053fab11ce0b14573d781 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Merge "Remove unused variables" am: fe0c000f40 am: 752ef94cfc am: d847619a2b ↵android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseTreehugger Robot
am: 64ce9427f8 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2445925 Change-Id: I68c483d1cc5ddea43cf9c9898fb152de14847427 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Merge "Remove unused variables" am: fe0c000f40 am: 752ef94cfc am: d847619a2b ↵Treehugger Robot
am: 64ce9427f8 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2445925 Change-Id: I001954a862e87e59777d2dffcc03aca398d61bc8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Merge "Remove unused variables" am: fe0c000f40 am: 752ef94cfc am: d847619a2bandroid14-devTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2445925 Change-Id: I7efbfd50628298c436cb86d5d84af6cbfa7918da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Merge "Remove unused variables" am: fe0c000f40 am: 752ef94cfcTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2445925 Change-Id: I2bae39a9a7e659300a47203f1b4c99a94c386513 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Merge "Remove unused variables" am: fe0c000f40Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2445925 Change-Id: I996fc354112500e41977b93521e9050bdccce81b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Merge "Remove unused variables"android-u-beta-1-gplTreehugger Robot
2023-03-19Remove unused variablesJing Mike
Since some variables with module LatinIME are defined but not used, when compiled with build combination "sdk_pc_x86_64-userdebug" and build command "mmm packages/inputmethods/LatinIME", the following code lines will be reported that "variable 'XXX' set but not used". (should be similar for all the other build combinations) Repeated 10 times for each: terminal_position_lookup_table.cpp:74:9 removedEntryCount terminal_position_lookup_table.cpp:85:9 removedEntryCount proximity_info_state_utils.cpp:493:9 tempTime trie_map.cpp:56:9 unusedRegionSize suggestion_results.cpp:100:9 index Repeated 80+ times: proximity_info_utils.h:75:25 proximityChar With this patch we are removing some of the unused variables and putting the C++ 17 attribute [[maybe_unused]] to the others which are used for logging. Then all the related build warnings have been eliminated. Test: mmm packages/inputmethods/LatinIME, presubmit check. Change-Id: Ia66766322d6ae8a010b1cb55cc22993fbc6d012c Signed-off-by: Jing Mike <jingyangliu@eswincomputing.com>
2023-03-14Merge "Add required flag to receivers in LatinIME" into udc-dev am: ↵Michael Groover
7b0c5a98c1 am: ad366cf466 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/21941666 Change-Id: I1023d4707116c3138e557476ec3c26abf28876c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Merge "Add required flag to receivers in LatinIME" into udc-dev am: ↵Michael Groover
7b0c5a98c1 am: b10b5ac7a3 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/21941666 Change-Id: Ie81829a6f5094fd8dbfe6709180812bd357ef887 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Merge "Add required flag to receivers in LatinIME" into udc-dev am: 7b0c5a98c1Michael Groover
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/21941666 Change-Id: I20b75f666b1f4e3094508d755c91354ade90b0e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Merge "Add required flag to receivers in LatinIME" into udc-dev am: 7b0c5a98c1Michael Groover
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/21941666 Change-Id: I0feec251e3d9896f260527ec2c57835b7571dc18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 04:20:46 +0000