diff options
| author | 2024-04-08 17:32:10 +0000 | |
|---|---|---|
| committer | 2024-04-08 17:32:10 +0000 | |
| commit | eb10002cdbec40e8dec55978bdd22e965cdfba18 (patch) | |
| tree | ae11f3eef59c34e52bcb60a0034c4398c9c91bf2 /libs/androidfw/StringPool.cpp | |
| parent | d26ee5b9fd17466b0d24274d5333089d4609be91 (diff) | |
| parent | 34c65d230a814fd83ea0e7131a60c228a507ab4e (diff) | |
Merge changes from topic "am-259fe1f7a5ea4066ad1659bdfe583770" into main
* changes:
[automerger skipped] Add scroll chip to screenshot shelf ui am: a67e1eefff -s ours
[automerger skipped] Pull scroll request/capture code out of ScreenshotController am: f0a301fcca -s ours
[automerger skipped] Abstract screenshot actions into ActionExecutor am: f80effdd67 -s ours
[automerger skipped] Create ScreenshotResult class to simplify null checks am: 431c56498b -s ours
[automerger skipped] Apply diffs to screenshot action updates am: f1e70448a0 -s ours
[automerger skipped] Provide AssistContent to ScreenshotActionsProvider. am: f13c08bc66 -s ours
[automerger skipped] Clean up ScreenshotController am: cff501c84b -s ours
[automerger skipped] Implement screenshot smart actions with new action provider am: d6ca56b299 -s ours
[automerger skipped] Handle pending actions within screenshot action provider am: c5aac9cc46 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions