Auto-update

AdvancedImmersiveModeSample/build.gradle → Application/build.gradle

@@ -8,14 +8,12 @@ buildscript {
     }
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 
 dependencies {
 
-    // Add the support lib that is appropriate for SDK 4
-    compile "com.android.support:support-v4:20.+"
-
+    compile "com.android.support:support-v4:21.+"
 
 }
 
@@ -28,9 +26,13 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion 21
+    buildToolsVersion "21.0.0"
 
-    buildToolsVersion "20"
+    defaultConfig {
+        minSdkVersion 4
+        targetSdkVersion 21
+    }
 
     sourceSets {
         main {
@@ -43,6 +45,7 @@ android {
         androidTest.java.srcDirs = ['tests/src']
 
     }
+
 }
 
 

AdvancedImmersiveModeSample/src/main/AndroidManifest.xml → Application/src/main/AndroidManifest.xml

@@ -27,7 +27,7 @@
     <!-- This sample is to demonstrate features released in API 19.
          So while it would technically run on an earlier version of Android,
          there wouldn't be much point) -->
-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="19" />
+    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
     <!-- allowBackup declares if the app can be part of device-wide backups such as "adb backup" -->
     <!-- theme is a way of applying UI decisions across your entire application.  You can also
          define it on a per-application basis. -->

AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/MainActivity.java → Application/src/main/java/com/example/android/advancedimmersivemode/MainActivity.java

@@ -47,10 +47,12 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-        AdvancedImmersiveModeFragment fragment = new AdvancedImmersiveModeFragment();
-        transaction.replace(R.id.sample_content_fragment, fragment);
-        transaction.commit();
+        if (savedInstanceState == null) {
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+            AdvancedImmersiveModeFragment fragment = new AdvancedImmersiveModeFragment();
+            transaction.replace(R.id.sample_content_fragment, fragment);
+            transaction.commit();
+        }
     }
 
     @Override

Application/src/main/res/values-v21/template-styles.xml

@@ -0,0 +1,22 @@
+<!--
+  Copyright 2014 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<resources>
+
+    <!-- Activity themes -->
+    <style name="Theme.Base" parent="android:Theme.Material.Light" />
+
+</resources>

AdvancedImmersiveModeSample/tests/AndroidManifest.xml → Application/tests/AndroidManifest.xml

@@ -20,9 +20,7 @@
           android:versionCode="1"
           android:versionName="1.0">
 
-    <uses-sdk
-            android:minSdkVersion="19"
-            android:targetSdkVersion="19" />
+    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
 
     <!-- We add an application tag here just so that we can indicate that
          this package needs to link against the android.test library,

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip

settings.gradle

@@ -1 +1 @@
-include 'AdvancedImmersiveModeSample'
+include 'Application'