Updating SystemUI visibility events in Adroid Client.

remoting/android/java/src/org/chromium/chromoting/Desktop.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chromoting;
 
 import android.annotation.SuppressLint;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ skipping 44 matching lines @@
      * Cardboard function.
      */
     private static final String PREFERENCE_CARDBOARD_DIALOG_SEEN = "cardboard_dialog_seen";
 
     /** Preference used to track the last input mode selected by the user. */
     private static final String PREFERENCE_INPUT_MODE = "input_mode";
 
     /** The amount of time to wait to hide the ActionBar after user input is seen. */
     private static final int ACTIONBAR_AUTO_HIDE_DELAY_MS = 3000;
 
-    private final Event.Raisable<SoftInputMethodVisibilityChangedEventParameter>
-            mOnSoftInputMethodVisibilityChanged = new Event.Raisable<>();
+    private final Event.Raisable<SystemUiVisibilityChangedEventParameter>
+            mOnSystemUiVisibilityChanged = new Event.Raisable<>();
 
     private final Event.Raisable<InputModeChangedEventParameter> mOnInputModeChanged =
             new Event.Raisable<>();
 
     private Client mClient;
     private InputEventSender mInjector;
 
     private ActivityLifecycleListener mActivityLifecycleListener;
 
     /** Flag to indicate whether the current activity is switching to Cardboard desktop activity. */
@@ skipping 169 matching lines @@
         }
 
         ChromotingUtil.tintMenuIcons(this, menu);
 
         // Wait to set the input mode until after the default tinting has been applied.
         setInputMode(mInputMode);
 
         return super.onCreateOptionsMenu(menu);
     }
 
-    public Event<SoftInputMethodVisibilityChangedEventParameter>
-            onSoftInputMethodVisibilityChanged() {
-        return mOnSoftInputMethodVisibilityChanged;
+    public Event<SystemUiVisibilityChangedEventParameter> onSystemUiVisibilityChanged() {
+        return mOnSystemUiVisibilityChanged;
     }
 
     public Event<InputModeChangedEventParameter> onInputModeChanged() {
         return mOnInputModeChanged;
     }
 
     private InputMode getInitialInputModeValue() {
         // Load the previously-selected input mode from Preferences.
         // TODO(joedow): Evaluate and determine if we should use a different input mode based on
         //               a device characteristic such as screen size.
@@ skipping 96 matching lines @@
     // power or activity lifecycle event in which the current System UI state has changed but we
     // never received the notification.
     private void syncActionBarToSystemUiState() {
         onSystemUiVisibilityChange(getWindow().getDecorView().getSystemUiVisibility());
     }
 
     private boolean isActionBarVisible() {
         return getSupportActionBar() != null && getSupportActionBar().isShowing();
     }
 
+    private boolean isSystemUiVisible() {
+        return (getWindow().getDecorView().getSystemUiVisibility() & getFullscreenFlags()) == 0;
+    }
+
     /** Called whenever the visibility of the system status bar or navigation bar changes. */
     @Override
     public void onSystemUiVisibilityChange(int visibility) {
         // Ensure the action-bar's visibility matches that of the system controls. This
         // minimizes the number of states the UI can be in, to keep things simple for the user.
 
         // Check if the system is in fullscreen/lights-out mode then update the ActionBar to match.
         int fullscreenFlags = getFullscreenFlags();
         if ((visibility & fullscreenFlags) != 0) {
             hideActionBar();
@@ skipping 149 matching lines @@
                     return;
                 }
 
                 // If the delta between lowest bound we have seen (should be a System UI such as
                 // the navigation bar) and the current bound does not match, then we have a form
                 // of soft input displayed.  Note that the size of a soft input device can change
                 // when the input method is changed so we want to send updates to the image canvas
                 // whenever they occur.
                 boolean oldSoftInputVisible = mSoftInputVisible;
                 mSoftInputVisible = (bottom < mMaxBottomValue);
-                mOnSoftInputMethodVisibilityChanged.raise(
-                        new SoftInputMethodVisibilityChangedEventParameter(
-                                mSoftInputVisible, left, top, right, bottom));
+                mOnSystemUiVisibilityChanged.raise(new SystemUiVisibilityChangedEventParameter(
+                        isSystemUiVisible(), mSoftInputVisible, left, top, right, bottom));
 
                 boolean softInputVisibilityChanged = oldSoftInputVisible != mSoftInputVisible;
                 if (!mSoftInputVisible && softInputVisibilityChanged && !isActionBarVisible()) {
                     // Queue a task which will run after the current action (OSK dismiss) has
                     // completed, otherwise the hide request will not take effect.
                     new Handler().post(new Runnable() {
                         @Override
                         public void run() {
                             if (!mSoftInputVisible && !isActionBarVisible()) {
                                 hideSystemUi();
@@ skipping 48 matching lines @@
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
         if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
             mClient.destroy();
             return super.dispatchKeyEvent(event);
         }
 
         return mInjector.sendKeyEvent(event);
     }
 }