diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-10 18:29:31 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-10 18:29:31 +0000 |
| commit | 6293820c96ac1cf6f33377fb510549bf6a4f9ed6 (patch) | |
| tree | 16072b01af38d8947559c63e6479276348bbf180 /samplecode | |
| parent | 8f338a3eebc4321d4048c10133eccb65edd8bc34 (diff) | |
Disable transitions for the Android SampleApp.
Review URL: https://codereview.appspot.com/6642063
git-svn-id: http://skia.googlecode.com/svn/trunk@5887 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/TransitionView.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/samplecode/TransitionView.cpp b/samplecode/TransitionView.cpp index e755288062..4f15bd310a 100644 --- a/samplecode/TransitionView.cpp +++ b/samplecode/TransitionView.cpp @@ -189,5 +189,10 @@ private: }; SkView* create_transition(SkView* prev, SkView* next, int direction) { +#ifdef SK_BUILD_FOR_ANDROID + // Disable transitions for Android + return next; +#else return SkNEW_ARGS(TransitionView, (prev, next, direction)); +#endif } |