aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-28Snap for 11510257 from 9a90f5ac6830432e2641304629d9a84f29603a4c to ↵simpleperf-releaseAndroid Build Coastguard Worker
simpleperf-release Change-Id: Ie53cc53fa6208cc7f6cb5c05a92776ab4ed74bf5
2024-02-02Snap for 11400057 from 9810aeaf50dfc294b0734b17e19af195d8a502a7 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I90ad3b71a292e154591df2f8357d44fa7f759cdc
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: Ic9a41c43139cca69ff036cadd33c73ea0e27ed3f
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: Id88f6f00a1546ae459f36320b8979627b9767462 Bug: 315507370 Change-Id: I05d081ca29aef7ae112ef058555c16e732f6403e
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: I968e4a90bfa57c838bd43c73839e817fe201ff95 Change-Id: Id88f6f00a1546ae459f36320b8979627b9767462
2023-10-16Snap for 10957012 from 494987d8dd9e361be3d2f9c33c0ab2907d9b04b6 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Ie92345eed9748c4aa34aef3616cda54863d56489
2023-10-06[automerger skipped] Merge Android 14 am: 494987d8dd -s ours am: 30566c18a7 ↵Xin Li
-s ours am: c3179ee6d6 -s ours am: ad87e5f4b6 -s ours am skip reason: Merged-In I3f54f963e58842ba6648d082517b9778f30bd59b with SHA-1 6b80976ba3 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/2775837 Change-Id: I968e4a90bfa57c838bd43c73839e817fe201ff95 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 494987d8dd -s ours am: 30566c18a7 ↵Xin Li
-s ours am: c3179ee6d6 -s ours am skip reason: Merged-In I3f54f963e58842ba6648d082517b9778f30bd59b with SHA-1 6b80976ba3 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/2775837 Change-Id: Ie6c66d527dccdec4bdb9b06d3052996f3b0ad441 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 494987d8dd -s ours am: 30566c18a7 ↵Xin Li
-s ours am skip reason: Merged-In I3f54f963e58842ba6648d082517b9778f30bd59b with SHA-1 6b80976ba3 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/2775837 Change-Id: Ifa1d01d4d7f8942c5f122c3811b13550a19f64b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 494987d8dd -s oursXin Li
am skip reason: Merged-In I3f54f963e58842ba6648d082517b9778f30bd59b with SHA-1 6b80976ba3 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/2775837 Change-Id: I4fb63ce98a5f943d02c498113399097df577423d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I3f54f963e58842ba6648d082517b9778f30bd59b Change-Id: I83a5ac0ea88125c15900f030a6635c18f0bff335
2023-09-01Adapt change of calculateInsets am: 813c3565e5Tiger
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/24598189 Change-Id: I912509a081a3ed458a04ce676e2e9e4b4955baf5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30Adapt change of calculateInsetsTiger
Bug: 291825755 Test: presubmit Change-Id: I605b2c1b3a586b6f06d7e828f1cc9df504afa0ea
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 7104e56ac7 -s ours ↵Xin Li
am: 937756af58 -s ours am: 1ab1cf7089 -s ours am skip reason: Merged-In I698bbf58bf8dbf3687ca8f642260a274a9fa2948 with SHA-1 153a04d123 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/24181015 Change-Id: Ic70b0498e4ab9aa3686e666785405966148a4c30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 7104e56ac7 -s ours ↵Xin Li
am: 937756af58 -s ours am skip reason: Merged-In I698bbf58bf8dbf3687ca8f642260a274a9fa2948 with SHA-1 153a04d123 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/24181015 Change-Id: I4ae2b743e7314008446e2317bbf6737bc7ed50ef 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: 7104e56ac7 -s oursXin Li
am skip reason: Merged-In I698bbf58bf8dbf3687ca8f642260a274a9fa2948 with SHA-1 153a04d123 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/24181015 Change-Id: I1da7942d4629c4a4fec3847a21674c6176a97e42 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: I698bbf58bf8dbf3687ca8f642260a274a9fa2948 Change-Id: I8a73b1e0c717bfe95800f4ad05142325d7a6dba2
2023-07-20Snap for 10448490 from 6b80976ba3433e5b25892d71e2d626b61041afcf to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Id8a7712063bd3e4430cb7372fab71341a052fdf8
2023-07-04Revert "Remove alwaysConsumeSystemBars" am: 7fac9a0ea6Luke Chang
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/23875132 Change-Id: I0bda40c8360d856b8c3d6bcc80eebec015818dca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04Revert "Remove alwaysConsumeSystemBars"Luke Chang
Revert submission 23844763-remove_alwaysConsumeSystemBars Reason for revert: DroidMonitor-triggered revert due to breakage v2/android-accessibility-eng/robolectric/framework/accessibility, bug 289849945. Reverted changes: /q/submissionid:23844763-remove_alwaysConsumeSystemBars BUG: 289849945 Change-Id: I88c0df871dc1446980b611fef1dd10f305528d12
2023-07-03Remove alwaysConsumeSystemBars am: c9adb5803aTiger
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/23844546 Change-Id: I2637e7096fac1b7c691691266a892c80adce11d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30[automerger skipped] Support new TestApi. am: 6b80976ba3 am: 2d4f48e82b am: ↵Kweku Adams
1a9342a4e1 -s ours am: 31cb54ba9b -s ours am: 47ff84235f -s ours am skip reason: Merged-In I3f54f963e58842ba6648d082517b9778f30bd59b with SHA-1 c4a0a89d97 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/2636255 Change-Id: Ic14e2c26626c211876cac69f1ab70957dec95664 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30[automerger skipped] Support new TestApi. am: 6b80976ba3 am: 2d4f48e82b am: ↵Kweku Adams
1a9342a4e1 -s ours am: 31cb54ba9b -s ours am skip reason: Merged-In I3f54f963e58842ba6648d082517b9778f30bd59b with SHA-1 c4a0a89d97 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/2636255 Change-Id: I6dab17d4a9d93f34a92fb8098ebbfb7e53b57a45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30[automerger skipped] Support new TestApi. am: 6b80976ba3 am: 2d4f48e82b am: ↵Kweku Adams
1a9342a4e1 -s ours am skip reason: Merged-In I3f54f963e58842ba6648d082517b9778f30bd59b with SHA-1 c4a0a89d97 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/2636255 Change-Id: I3d847acf0ac6c6bd47cce671224f26d35f097f90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30Support new TestApi. am: 6b80976ba3 am: 2d4f48e82bKweku Adams
Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/2636255 Change-Id: If5b6aaf1d761f3dfcd63f6cd170940279488ffc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30Support new TestApi. am: 6b80976ba3Kweku Adams
Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/2636255 Change-Id: Ie5a5878b24b86ec2595e8f821754d2c075dc626d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28Remove alwaysConsumeSystemBarsTiger
The parameter has been removed from InsetsState#calculateInsets. Bug: 277891341 Test: presubmit Change-Id: I80e210b8bd37a216af0917bcce6c0cff227e0b2c
2023-06-23Support new TestApi.Kweku Adams
Bug: 240108412 Bug: 240630396 Test: Manually go through CTS-V "Ignore Battery Optimizations Test" Test: atest CtsUsageStatsTestCases:UsageStatsTest Change-Id: I3f54f963e58842ba6648d082517b9778f30bd59b (cherry picked from commit c4a0a89d970e2f04a66e03ebcd130771ca13cc6c) Merged-In: I3f54f963e58842ba6648d082517b9778f30bd59b
2023-05-11Add isDisplayInteractive method to BridgePowerManager am: bc473ebba6 am: ↵Antony Sargent
e95989f7ea am: 81158d1e35 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/22938200 Change-Id: I2b21a09a93408e5f7b2f2f10a7467b89857c5743 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11Add isDisplayInteractive method to BridgePowerManager am: bc473ebba6 am: ↵Antony Sargent
153a04d123 am: 3de55565ac Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/22938200 Change-Id: I345a52302205cce812e509691fc131a947428736 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11Add isDisplayInteractive method to BridgePowerManager am: bc473ebba6 am: ↵Antony Sargent
e95989f7ea am: e1f1d032e9 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/22938200 Change-Id: I3cc1d86bc6ff42939d0fa2148acfffaf1efa9608 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11Add isDisplayInteractive method to BridgePowerManager am: bc473ebba6 am: ↵Antony Sargent
153a04d123 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/22938200 Change-Id: Id020dae857d91a811e5544676a5b3694fc9c4c91 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11Add isDisplayInteractive method to BridgePowerManager am: bc473ebba6 am: ↵Antony Sargent
e95989f7ea Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/22938200 Change-Id: Ia3873a2f29ee6734b23a065e65dd01bb30521840 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11Add isDisplayInteractive method to BridgePowerManager am: bc473ebba6 am: ↵Antony Sargent
e95989f7ea Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/22938200 Change-Id: I1c78e158a653745a37a25e27d3fdbac3eb62e964 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11Add isDisplayInteractive method to BridgePowerManager am: bc473ebba6Antony Sargent
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/22938200 Change-Id: I5d7124224a7cd5155ba2a72935815e5e0e9207b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11Add isDisplayInteractive method to BridgePowerManager am: bc473ebba6Antony Sargent
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/22938200 Change-Id: I698bbf58bf8dbf3687ca8f642260a274a9fa2948 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28Add isDisplayInteractive method to BridgePowerManagerandroid14-devAntony Sargent
Bug: 279845136 Test: m layoutlib Change-Id: Idaa10a444b524a473b1accd8b40e7ef3c77b722b
2023-04-13Remove InputManager#getInstance am: 1232b1336aAsmita Poddar
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/22252423 Change-Id: I9e681fd22fb56031c5599643108e05a1e2211284 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12Remove InputManager#getInstanceAsmita Poddar
Replace all instances of InputManager with instances of InputManagerGlobal. Bug: b/267758905 Test: Pre-submit Change-Id: I4d08ec51b544c2043e3b30aea98a4147f49056aa
2023-03-23Updated BridgeContentProvider#getStreamTypes with attributionSource am: ↵Ashish Kumar
d4aa7bb81a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/22180834 Change-Id: Ieecb9c14c471201636a904745e125638dd9d59c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22Updated BridgeContentProvider#getStreamTypes with attributionSourceAshish Kumar
Test: build Bug: b/274595210 Change-Id: I8b53bfe9c90d27e0cff3ce67dbd7cde12f47921f Merged-In: I8b53bfe9c90d27e0cff3ce67dbd7cde12f47921f
2023-03-15Snap for 9751898 from 48908e6ada6612bfbaa88aabc7e7acc40d77e4a0 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Ib2b0b1f6ca4f87e9f21cea1398862a506221f09d
2023-03-03Add support for InputManagerGlobal am: 64c5f0af1dAsmita Poddar
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/21706120 Change-Id: Id0973fb89938afdca30c4435151e59597118c330 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02Add support for InputManagerGlobalAsmita Poddar
Addressing an instance where the old InputManager constructor was being used. This was done along with ag/21609952 Bug: b/267758905 Test: Pre-submit Change-Id: I2c69323d14b8cf77ebbdc49e90892bdf29ff0450 (cherry picked from commit 536b7b3fe3a4d91f28d15107aa655131a029ca69) Merged-In: I2c69323d14b8cf77ebbdc49e90892bdf29ff0450
2023-02-24Snap for 9652768 from 78d3cc2713827823fa1d5e0d1b57562b5fb858f5 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Icbd61c768d5e62096b144b853702a63424c0ce9d
2023-02-17Updated BridgeContentProvider with getTypeAnonymousAshish Kumar
Test: build Change-Id: Iefd12d036b1c8b2959ebfbfd8180c65d629e1b8c
2023-02-16Merge "Allow for non-existent style in obtainStyledAttributes"Jerome Gaillard
2023-02-15Merge "Add LowPowerStandby StandbyPorts APIs to BridgePowerManager"Robert Horvath
2023-02-15Allow for non-existent style in obtainStyledAttributesJerome Gaillard
If the style ID passed to the method does not correspond to an existing style, use the underlying theme to find the attribute values. Bug: 268488795 Test: To be tested from Studio Change-Id: I48f8893fee5704e5a886fa871e39986dc896bbee (cherry picked from commit 945ba35fbabe2a92ff0ce1f2235a42e177deb1f7) Merged-In: I48f8893fee5704e5a886fa871e39986dc896bbee
2023-02-10Merge "Add LowPowerStandby policy APIs to BridgePowerManager"Robert Horvath