Sample Improvements for AdvancedImmersiveMode

Updated log statements, moved top line down so not hidden by Actionbar.

Change-Id: Iaa7a6f7630dbf67550ab76010967b037f3fc4332
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle b/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle
index 9f9663f..6d2b65f 100644
--- a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle
+++ b/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle
@@ -1,18 +1,24 @@
+
+
+
 buildscript {
     repositories {
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.6.+'
+        classpath 'com.android.tools.build:gradle:0.8.+'
     }
 }
 
 apply plugin: 'android'
 
 dependencies {
-    // Add the support lib that is appropriate for SDK 4
-    compile "com.android.support:support-v4:18.0.+"
+
+  // Add the support lib that is appropriate for SDK 4
+    compile "com.android.support:support-v4:19.0.+"
+
+
 }
 
 // The sample build uses multiple directories to
@@ -25,7 +31,8 @@
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "18.0.1"
+
+    buildToolsVersion "19.0.1"
 
     sourceSets {
         main {
@@ -36,7 +43,6 @@
         }
         instrumentTest.setRoot('tests')
         instrumentTest.java.srcDirs = ['tests/src']
-
     }
 }
 // BEGIN_EXCLUDE
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java b/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java
index 6d38ce1..d8fb0d4 100644
--- a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java
+++ b/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java
@@ -85,6 +85,8 @@
                 flagsView.setSystemUiVisibility(uiOptions);
                 // END_INCLUDE(immersive_presets)
 
+                dumpFlagStateToLog(uiOptions);
+
                 // The below code just updates the checkboxes to reflect which flags have been set.
                 mLowProfileCheckBox.setChecked(false);
                 mHideNavCheckbox.setChecked(true);
@@ -112,13 +114,14 @@
                 flagsView.setSystemUiVisibility(uiOptions);
                 // END_INCLUDE(leanback_presets)
 
+                dumpFlagStateToLog(uiOptions);
+
                 // The below code just updates the checkboxes to reflect which flags have been set.
                 mLowProfileCheckBox.setChecked(false);
                 mHideNavCheckbox.setChecked(true);
                 mHideStatusBarCheckBox.setChecked(true);
                 mImmersiveModeCheckBox.setChecked(false);
                 mImmersiveModeStickyCheckBox.setChecked(false);
-                toggleUiFlags();
             }
         });
 
@@ -135,6 +138,42 @@
     }
 
     /**
+     * Helper method to dump flag state to the log.
+     * @param uiFlags Set of UI flags to inspect
+     */
+    public void dumpFlagStateToLog(int uiFlags) {
+        if ((uiFlags & View.SYSTEM_UI_FLAG_LOW_PROFILE) != 0) {
+            Log.i(TAG, "SYSTEM_UI_FLAG_LOW_PROFILE is set");
+        } else {
+            Log.i(TAG, "SYSTEM_UI_FLAG_LOW_PROFILE is unset");
+        }
+
+        if ((uiFlags & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0) {
+            Log.i(TAG, "SYSTEM_UI_FLAG_FULLSCREEN is set");
+        } else {
+            Log.i(TAG, "SYSTEM_UI_FLAG_FULLSCREEN is unset");
+        }
+
+        if ((uiFlags & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) != 0) {
+            Log.i(TAG, "SYSTEM_UI_FLAG_HIDE_NAVIGATION is set");
+        } else {
+            Log.i(TAG, "SYSTEM_UI_FLAG_HIDE_NAVIGATION is unset");
+        }
+
+        if ((uiFlags & View.SYSTEM_UI_FLAG_IMMERSIVE) != 0) {
+            Log.i(TAG, "SYSTEM_UI_FLAG_IMMERSIVE is set");
+        } else {
+            Log.i(TAG, "SYSTEM_UI_FLAG_IMMERSIVE is unset");
+        }
+
+        if ((uiFlags & View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY) != 0) {
+            Log.i(TAG, "SYSTEM_UI_FLAG_IMMERSIVE_STICKY is set");
+        } else {
+            Log.i(TAG, "SYSTEM_UI_FLAG_IMMERSIVE_STICKY is unset");
+        }
+    }
+
+    /**
      * Detects and toggles immersive mode (also known as "hidey bar" mode).
      */
     public void toggleUiFlags() {
@@ -217,7 +256,8 @@
         // BEGIN_INCLUDE (set_ui_flags)
         //Set the new UI flags.
         decorView.setSystemUiVisibility(newUiOptions);
-        Log.i(TAG, "Current height: " + decorView.getHeight() + ", width: " + decorView.getWidth());
         // END_INCLUDE (set_ui_flags)
+
+        dumpFlagStateToLog(uiOptions);
     }
 }
diff --git a/ui/window/AdvancedImmersiveMode/template-params.xml b/ui/window/AdvancedImmersiveMode/template-params.xml
index e60bc38..c081c66 100644
--- a/ui/window/AdvancedImmersiveMode/template-params.xml
+++ b/ui/window/AdvancedImmersiveMode/template-params.xml
@@ -27,7 +27,7 @@
     <strings>
         <intro>
             <![CDATA[
-            \"Immersive Mode\", added in Android 4.4, improves the \"hide full screen\" and
+            \n\n\n\"Immersive Mode\", added in Android 4.4, improves the \"hide full screen\" and
             \"hide nav bar\" modes, by letting users swipe the bars in and out.  This sample
             lets the user experiment with immersive mode by seeing how it interacts
             with some of the other UI flags related to full-screen apps.