summaryrefslogtreecommitdiff
path: root/tools/aapt/ResourceTable.cpp
diff options
context:
space:
mode:
author George Mount <mount@google.com> 2014-10-21 15:09:11 -0700
committer George Mount <mount@google.com> 2014-10-24 16:19:19 -0700
commit333b8093eaab4b55d91a7a0b3b1484424f8ac975 (patch)
tree623a1ed9d38023b7091fd741bab5ea306a967e99 /tools/aapt/ResourceTable.cpp
parent104d2484ec605d9673e74cc125d92d41b6968327 (diff)
Fixed: Nested shared elements now transition separately.
Bug 18073470 Shared element ordering was based on the key ordering in an ArrayMap. This is normally fine, but when shared elements are nested, the child's layout can be overwritten by the parent's if it is laid out first. The only way to force the ordering of shared element layout was the change the transition name. To fix this, shared elements are now laid out parent first, then child. On return, nested shared elements were not transitioning to their final destination properly because the matrix used to calculate their position was not correct. This change recalculates the parent matrices when appropriate. Change-Id: I62333183cf03519e525587e4ea31fcf14bb83cdc
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
0 files changed, 0 insertions, 0 deletions