Reapply fix after bad merge.

Bug 13745751

Change-Id: I8eda37bd0e083b7c7949935973330882f6f5f1dc
This commit is contained in:
George Mount
2014-07-02 07:22:43 -07:00
parent 00dde0bd46
commit 7e20884d85

View File

@@ -397,8 +397,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
}
if (hasFeature(FEATURE_CONTENT_TRANSITIONS)) {
// TODO Augment the scenes/transitions API to support this.
throw new UnsupportedOperationException(
"addContentView does not support content transitions");
Log.v(TAG, "addContentView does not support content transitions");
}
mContentParent.addView(view, params);
final Callback cb = getCallback();