Skip to content

Commit f4f5f09

Browse files
committed
Merge branch 'develop' of https://github.com/chrfalch/NControl into develop
2 parents f6ddf1d + ed69b18 commit f4f5f09

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

NControlDemo/NControlDemo.Droid/Properties/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3-
<uses-sdk />
3+
<uses-sdk android:minSdkVersion="18" />
44
<application android:label="NControlDemo" android:theme="@style/Theme.NewSolution" android:icon="@drawable/icon">
55
<meta-data android:name="com.google.android.maps.v2.API_KEY" android:value="YOUR_API_KEY_HERE" />
66
</application>

NControlDemo/NControlDemo.FormsApp/Views/MainView.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ protected override View CreateContents()
120120
}
121121
}, 0, 0);
122122

123-
var buttonOverlay = new BlueFrameControl();
124-
125-
grid.Children.Add(buttonOverlay, 0, 0);
123+
// var buttonOverlay = new BlueFrameControl();
124+
//
125+
// grid.Children.Add(buttonOverlay, 0, 0);
126126

127127
_bottomBar = new NControlView
128128
{

0 commit comments

Comments
 (0)