summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-04[automerger skipped] Merge RQ2A.210305.007 am: e420518160 -s ours am: ↵android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devXin Li
da138ba9f6 -s ours am: 7e1dad283a -s ours am skip reason: Change-Id I01a2369e2d88a8ac1b6879653f57c7c27e84cfbc with SHA-1 0cdf233f70 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1613683 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6eaecb972bcf79fcdeb7abf542c82aa70cdcdef3
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: e420518160 -s ours am: ↵temp_ab_7272582Xin Li
da138ba9f6 -s ours am skip reason: Change-Id I01a2369e2d88a8ac1b6879653f57c7c27e84cfbc with SHA-1 0cdf233f70 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1613683 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie6cc616a6887d58590055968e6f03f4cf4a22978
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: e420518160 -s oursXin Li
am skip reason: Change-Id I01a2369e2d88a8ac1b6879653f57c7c27e84cfbc with SHA-1 0cdf233f70 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1613683 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ac3eea1cf57c8c2b4e10e53dd9fe5af9658165c
2021-03-03Merge RQ2A.210305.007android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I01a2369e2d88a8ac1b6879653f57c7c27e84cfbc Change-Id: Ic82b77269ab5308e6b654b083c4a936058c682d0
2021-02-23Removing car code from phone SettingsIntelligenceAlex Stetson
AAOS specific code is to be split out into its own package to remove the phone dependencies on car code. Bug: 174688736 Test: manual (app still functions properly on sdk_gphone_x86) Change-Id: I1a7969aef5819ff510e5db5c0716e3a18aa6dc88
2021-02-23[automerger skipped] Merge ab/7061308 into stage. am: 0cdf233f70 -s ours am: ↵Xin Li
dd565d0717 -s ours am skip reason: Change-Id I7f2edcffeeda6e7e805214c95c08c4fa57a7c50c with SHA-1 f075352694 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/13658529 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia467db1af13d3c005259d01fc13ca0301f9d972e
2021-02-23[automerger skipped] Merge ab/7061308 into stage. am: 0cdf233f70 -s oursXin Li
am skip reason: Change-Id I7f2edcffeeda6e7e805214c95c08c4fa57a7c50c with SHA-1 f075352694 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/13658529 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5df14103e6c7cc847120b9d4605b4316d96ea676
2021-02-21Merge ab/7061308 into stage.temp_RQ2A.210305.007Xin Li
Bug: 180401296 Merged-In: I7f2edcffeeda6e7e805214c95c08c4fa57a7c50c Change-Id: I01a2369e2d88a8ac1b6879653f57c7c27e84cfbc
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/SettingsIntelligence am: ↵Bob Badour
6fdb5be2c2 am: 63261aa2d6 am: 4ced4b4b1f Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1587747 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I032ae5f25d57d749acc0194f5e45fa5bf00b50f3
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/SettingsIntelligence am: ↵Bob Badour
6fdb5be2c2 am: 63261aa2d6 Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1587747 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6e132f9445bbc80b9f0a6d4b7cc5e1f293f71d40
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/SettingsIntelligence am: ↵Bob Badour
6fdb5be2c2 Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1587747 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I719b99f30e5217810b9b10c93584b1bc9f5b704f
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/SettingsIntelligenceBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ief7a4f36a7ea2d9e70f67e57972f6e8b3e133446
2020-12-08[automerger skipped] Integrate wide screen kb in settings search results am: ↵Priyank Singh
9233d2dfb8 am: f075352694 -s ours am skip reason: Change-Id Ice37cf4959681325f8aa9ff7fd5be49df79a43d5 with SHA-1 ff29a28a2e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/13163968 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic129488762df3c9561f449e4c9ac49df912b0b54
2020-12-08Integrate wide screen kb in settings search results am: 9233d2dfb8Priyank Singh
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/13163968 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7f2edcffeeda6e7e805214c95c08c4fa57a7c50c
2020-12-08Integrate wide screen kb in settings search resultsandroid-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releasePriyank Singh
Bug: 172068293 Test: Manual Change-Id: Ice37cf4959681325f8aa9ff7fd5be49df79a43d5 Merged-In: Ice37cf4959681325f8aa9ff7fd5be49df79a43d5
2020-11-24Merge "Integrate settings search with IME wide screen to display the search ↵TreeHugger Robot
results."
2020-11-23Mark ab/6881855 as merged am: de86f929c3 am: b9b77d7bccXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/13112989 Change-Id: I1c401ddda7f87378e579690b9502ce0735584364
2020-11-23Mark ab/6881855 as merged am: de86f929c3Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/13112989 Change-Id: Ib33db9f8a03cc15e510af551eaba1b75b7063d6d
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I0921ede1e25363a8fb813af8ba637874c4425f61
2020-11-19Integrate settings search with IME wide screen to display the search results.Priyank Singh
Bug: 172068293 Test: Manual Change-Id: Ice37cf4959681325f8aa9ff7fd5be49df79a43d5
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: fe5a799aad -s ours am: ↵Xin Li
e06758cd7b -s ours am: a5f59bff1d -s ours am skip reason: Change-Id I2f667508d185caffd07325052f44b7adab992d3c with SHA-1 d999268647 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/12795832 Change-Id: I355943eac5a73a7a65e379110ee4bcf355d18647
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: fe5a799aad -s ours am: ↵Xin Li
e06758cd7b -s ours am skip reason: Change-Id I2f667508d185caffd07325052f44b7adab992d3c with SHA-1 d999268647 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/12795832 Change-Id: I012c4eea53a4de0b0758cec6851fabba323d3a79
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: fe5a799aad -s oursXin Li
am skip reason: Change-Id I2f667508d185caffd07325052f44b7adab992d3c with SHA-1 d999268647 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/12795832 Change-Id: I77889fe499021b68fb2bc253677149cfa01db6cf
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I2f667508d185caffd07325052f44b7adab992d3c Change-Id: I698640a9d1b999dc30555f85c5be8930d85291d0
2020-09-15Update the target sdk version of SettingsIntelligence app. am: 0bd36f4890 ↵Stanley Wang
am: 7667949ef1 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/12201631 Change-Id: Ia231f87de61561268a03bed1baabb52e7de52000
2020-09-15Remove usage of deprecated toolbar methods am: 1033c500cf am: 9c268ce5a6Cole Faust
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/11723392 Change-Id: I15ef48e492342362798966fd01c41cad172a4ea9
2020-09-15Remove adjustPan from car settings search am: 3360ad616e am: 247d62a9e9Alex Stetson
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/11494002 Change-Id: I0c0fb79fc27454cc69821cf8a9f64023b9e4e5fd
2020-09-15Remove clear history button am: 56b4759cdb am: 2c29d5a806Alex Stetson
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/11480012 Change-Id: I7cefb82ed6c88808e29a1a32fd5acce7200e3127
2020-09-15Merge "Customize actionless car intents" into rvc-dev am: 6a335a153c am: ↵Alex Stetson
3f7c5aafd7 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/11369242 Change-Id: I5f6c8152b020762635f89bb16026b59014234ea6
2020-09-15Update the target SDK to fix the IME UI issue in landscape mode. am: ↵Stanley Wang
0199960756 am: 35743b0062 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/11439288 Change-Id: Id90e69e11386a7c5beedb21119313b293b41c33b
2020-09-14Merge "Align saved query text" into rvc-dev am: 684466b941 am: ab3846c10cAlex Stetson
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/11400022 Change-Id: I9b9f2626dc07ac3d761e5ea1ee203287d14e9f68
2020-09-13Fix the CellBroadcastSettings can't be searched. am: c6ee74c8d7 am: 99a0a05f8bStanley Wang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/11392712 Change-Id: I10ba4d2aa0cb1a51e5e89488e260e92e21296633
2020-09-11[automerger skipped] Merge Android R am: fedfa99090 -s ours am: 8627fde76b ↵Xin Li
-s ours am: a074024df7 -s ours am: e0d659b6df -s ours am: 15d9c8fcb0 -s ours am skip reason: Change-Id I2c3ca1f0794de3b0079b4715f7ce6d33cd786bdc with SHA-1 a4636f52c3 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1421955 Change-Id: I60dded86e03516f11cac122505ef37d7aad82ae1
2020-09-11[automerger skipped] Merge Android R am: fedfa99090 -s ours am: 8627fde76b ↵Xin Li
-s ours am: a074024df7 -s ours am: e0d659b6df -s ours am skip reason: Change-Id I2c3ca1f0794de3b0079b4715f7ce6d33cd786bdc with SHA-1 a4636f52c3 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1421955 Change-Id: Ic4d94dc95fcd14a853a19500a1c6a0a23ad39d08
2020-09-11[automerger skipped] Merge Android R am: fedfa99090 -s ours am: 8627fde76b ↵Xin Li
-s ours am: a074024df7 -s ours am skip reason: Change-Id I2c3ca1f0794de3b0079b4715f7ce6d33cd786bdc with SHA-1 a4636f52c3 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1421955 Change-Id: Ibc9adda558e6415e11100890f9d8875d1c635fb2
2020-09-11[automerger skipped] Merge Android R am: fedfa99090 -s ours am: 8627fde76b ↵Xin Li
-s ours am skip reason: Change-Id I2c3ca1f0794de3b0079b4715f7ce6d33cd786bdc with SHA-1 a4636f52c3 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1421955 Change-Id: I167bece226b605e1ab637c1b176d80d920d31438
2020-09-11[automerger skipped] Merge Android R am: fedfa99090 -s oursXin Li
am skip reason: Change-Id I2c3ca1f0794de3b0079b4715f7ce6d33cd786bdc with SHA-1 a4636f52c3 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1421955 Change-Id: I7e2484fb6f0a583d28eec05d8e98bc506194c62d
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I2c3ca1f0794de3b0079b4715f7ce6d33cd786bdc Change-Id: Ic98265603b0e54f50c2acfab9e4e4149a090ef69
2020-09-02[automerger skipped] Merge RP1A.200720.011 am: a4636f52c3 -s ours am: ↵Xin Li
cfc12ddaaa -s ours am: 19d2a2df91 -s ours am: 8fb9fc6b2b -s ours am skip reason: Change-Id Ica9cd13410aaddd291c73c4f7a75fdc4b17f189a with SHA-1 26aa485b1e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/12514196 Change-Id: Ie146e31cf06075d04c95977e727f45da2ebaf122
2020-09-02[automerger skipped] Merge RP1A.200720.011 am: a4636f52c3 -s ours am: ↵Xin Li
cfc12ddaaa -s ours am: 19d2a2df91 -s ours am skip reason: Change-Id Ica9cd13410aaddd291c73c4f7a75fdc4b17f189a with SHA-1 26aa485b1e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/12514196 Change-Id: Ib450bb51c1f6c269fcfca70030040ef4ad94673d
2020-09-02[automerger skipped] Merge RP1A.200720.011 am: a4636f52c3 -s ours am: ↵Xin Li
cfc12ddaaa -s ours am skip reason: Change-Id Ica9cd13410aaddd291c73c4f7a75fdc4b17f189a with SHA-1 26aa485b1e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/12514196 Change-Id: Ica88309d7bb5c2ac227b0cc9cd00f89861b7670d
2020-09-02[automerger skipped] Merge RP1A.200720.011 am: a4636f52c3 -s oursXin Li
am skip reason: Change-Id Ica9cd13410aaddd291c73c4f7a75fdc4b17f189a with SHA-1 26aa485b1e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/12514196 Change-Id: Iacd13f77e40d0390e69fc59760791d5c8ae19a46
2020-09-02[automerger skipped] Mark RP1A.200720.001 as merged am: c49925929c -s ours ↵Xin Li
am: 19bab2c814 -s ours am: 0f3b3a30fb -s ours am: 80bcc6982c -s ours am skip reason: Change-Id I9405533c2eee3323e5d1b87ca972759bceb29073 with SHA-1 58f3de5330 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/12514186 Change-Id: I9bc8b740cf00cd499ca0022940b99ca61a8f02b1
2020-09-02[automerger skipped] Mark RP1A.200720.001 as merged am: c49925929c -s ours ↵Xin Li
am: 19bab2c814 -s ours am: 0f3b3a30fb -s ours am skip reason: Change-Id I9405533c2eee3323e5d1b87ca972759bceb29073 with SHA-1 58f3de5330 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/12514186 Change-Id: Ie07a24a474de7dab8d35631812810cdd5c68f68b
2020-09-02[automerger skipped] Mark RP1A.200720.001 as merged am: c49925929c -s ours ↵Xin Li
am: 19bab2c814 -s ours am skip reason: Change-Id I9405533c2eee3323e5d1b87ca972759bceb29073 with SHA-1 58f3de5330 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/12514186 Change-Id: I22bb5a271909d8d1b91d359d4bd8aaa50b443610
2020-09-02[automerger skipped] Mark RP1A.200720.001 as merged am: c49925929c -s oursXin Li
am skip reason: Change-Id I9405533c2eee3323e5d1b87ca972759bceb29073 with SHA-1 58f3de5330 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/12514186 Change-Id: Ib7430dcf208f8489aead00e65fd0097e7dc66052
2020-09-02Merge RP1A.200720.011temp_sam_168057903Xin Li
Bug: 167588565 Merged-In: Ica9cd13410aaddd291c73c4f7a75fdc4b17f189a Change-Id: I2c3ca1f0794de3b0079b4715f7ce6d33cd786bdc
2020-09-02Mark RP1A.200720.001 as mergedXin Li
Bug: 167588565 Merged-In: I9405533c2eee3323e5d1b87ca972759bceb29073 Change-Id: I78d65d38cfb0733d5df178a1c171b53454494641
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 58f3de5330 -s ours am: 26aa485b1e -s ours am: 4c2000e5db -s ours am: bb55e44634 -s ours am skip reason: Change-Id I56ccb7002a0f00000936ba02c1926fb4929ae34b with SHA-1 f8dafc97e2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/12470136 Change-Id: Ifb0890c7bb1cecd1fff0e51b3e429723945c6332
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 58f3de5330 -s ours am: 26aa485b1e -s ours am: 4c2000e5db -s ours am skip reason: Change-Id I56ccb7002a0f00000936ba02c1926fb4929ae34b with SHA-1 f8dafc97e2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/12470136 Change-Id: I0038aed7c85dc85becf2708c46db353960923ade
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 15:22:13 +0000