Skip to content

Commit f05f758

Browse files
erikschlegelerikschlegel
committed
Merge pull request microsoft#162 from CatalystCode/animation
Animation
2 parents 12acfe5 + 70e752a commit f05f758

32 files changed

+115904
-126
lines changed

‎ReactAndroid/src/main/java/com/facebook/react/animation/AnimationRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ public Animation removeAnimation(int animationID) {
4040
return animation;
4141
}
4242

43-
}
43+
}

‎ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,4 +411,4 @@ private DeviceEventManagerModule.RCTDeviceEventEmitter getEventEmitter() {
411411
return getReactApplicationContext()
412412
.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class);
413413
}
414-
}
414+
}

‎ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
1616
extends ViewManager<T, C> {
1717

1818
private static final String PROP_BACKGROUND_COLOR = ViewProps.BACKGROUND_COLOR;
19-
private static final String PROP_DECOMPOSED_MATRIX = "C";
19+
private static final String PROP_DECOMPOSED_MATRIX = "decomposedMatrix";
2020
private static final String PROP_DECOMPOSED_MATRIX_ROTATE = "rotate";
2121
private static final String PROP_DECOMPOSED_MATRIX_ROTATE_X = "rotateX";
2222
private static final String PROP_DECOMPOSED_MATRIX_ROTATE_Y = "rotateY";

‎ReactWindows/Playground/App.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
5050
#if DEBUG
5151
if (System.Diagnostics.Debugger.IsAttached)
5252
{
53-
this.DebugSettings.EnableFrameRateCounter = true;
53+
//this.DebugSettings.EnableFrameRateCounter = true;
5454
}
5555
#endif
5656

‎ReactWindows/Playground/Playground.csproj

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -126,19 +126,6 @@
126126
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
127127
<Prefer32Bit>true</Prefer32Bit>
128128
</PropertyGroup>
129-
<ItemGroup>
130-
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
131-
<Content Include="ApplicationInsights.config">
132-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
133-
</Content>
134-
<Content Include="main.jsbundle">
135-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
136-
</Content>
137-
<None Include="project.json" />
138-
<Content Include="index.ios.js">
139-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
140-
</Content>
141-
</ItemGroup>
142129
<ItemGroup>
143130
<Compile Include="App.xaml.cs">
144131
<DependentUpon>App.xaml</DependentUpon>
@@ -173,6 +160,19 @@
173160
<Name>ReactNative</Name>
174161
</ProjectReference>
175162
</ItemGroup>
163+
<ItemGroup>
164+
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
165+
<Content Include="ApplicationInsights.config">
166+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
167+
</Content>
168+
<Content Include="main.jsbundle">
169+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
170+
</Content>
171+
<None Include="project.json" />
172+
<Content Include="index.ios.js">
173+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
174+
</Content>
175+
</ItemGroup>
176176
<ItemGroup>
177177
<Reference Include="Facebook.CSSLayout, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
178178
<SpecificVersion>False</SpecificVersion>

0 commit comments

Comments
 (0)