Merge another head
authorJaroslav Tulach <jtulach@netbeans.org>
Tue, 20 May 2014 06:07:44 +0200
changeset 1465547ab6ee3ce
parent 145 448a2ae2c6e3
parent 141 190061aedaef
child 147 69ff76aa9280
Merge another head
minesweeper/AndroidManifest.xml
     1.1 --- a/minesweeper/AndroidManifest.xml	Tue May 20 06:07:07 2014 +0200
     1.2 +++ b/minesweeper/AndroidManifest.xml	Tue May 20 06:07:44 2014 +0200
     1.3 @@ -33,7 +33,6 @@
     1.4          android:minSdkVersion="8"
     1.5          android:targetSdkVersion="16" />
     1.6  
     1.7 -    <uses-permission android:name="android.permission.INTERNET" />
     1.8      <application
     1.9          android:allowBackup="true"
    1.10          android:icon="@drawable/ic_launcher"
    1.11 @@ -43,13 +42,22 @@
    1.12                    android:configChanges="orientation|screenSize">
    1.13              <intent-filter>
    1.14                  <action android:name="android.intent.action.MAIN" />
    1.15 -
    1.16                  <category android:name="android.intent.category.LAUNCHER" />
    1.17              </intent-filter>
    1.18          </activity>
    1.19 +        
    1.20 +        <!-- Configuration section. Defines: 
    1.21 +           - the HTML page to load on start
    1.22 +           - the class that contains the main initialization method
    1.23 +           - name of the initialization method in the given class
    1.24 +        -->
    1.25          <meta-data android:name="loadPage" android:value="file:///android_asset/pages/index.html" />
    1.26          <meta-data android:name="loadClass" android:value="org.apidesign.demo.minesweeper.MinesModel" />
    1.27          <meta-data android:name="invoke" android:value="main" />
    1.28      </application>
    1.29 -    
    1.30 +
    1.31 +    <!-- allows use of internet and also 'call-home' feature. See 
    1.32 +      licensing section in Javadoc
    1.33 +    -->    
    1.34 +    <uses-permission android:name="android.permission.INTERNET" />
    1.35  </manifest>
    1.36 \ No newline at end of file