commit 8a4c89a36a039e4f20c2031090fe4a4625c66f9f
author Dake Gu <dake@google.com> Fri Jul 25 19:23:27 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 24 16:56:49 2014 +0000
tree 7333cbef8aa9ec80af4d54d5f27ffc3ce970fcc5
parent 99137c5e8d92ba02ee1a06ae867a08ff328920af
parent d761dcaf1c79fe38ecb533b36f852b3a38a4f6f1

Merge "TransitionSet: fix excludeTarget not working" into lmp-dev

core/java/android/transition/TransitionSet.java

diff --git a/core/java/android/transition/TransitionSet.java b/core/java/android/transition/TransitionSet.java
index 363f97f..83c60af 100644
--- a/core/java/android/transition/TransitionSet.java
+++ b/core/java/android/transition/TransitionSet.java
@@ -371,6 +371,8 @@
 
     private TransitionValuesMaps removeExcludes(TransitionValuesMaps values) {
         if (mTargetIds.isEmpty() && mTargetIdExcludes == null && mTargetTypeExcludes == null
+                && mTargetNames == null && mTargetTypes == null
+                && mTargetExcludes == null && mTargetNameExcludes == null
                 && mTargets.isEmpty()) {
             return values;
         }