Capabilities + Extensions + Cast Host Extension Support for Android 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.app.Activity;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
+

[Lambros, 2014/08/14 23:54:25]

nit: remove blank lines

[aiguha, 2014/08/15 03:37:29]

Done.

+import android.support.v7.app.ActionBarActivity;
+
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ImageButton;
 
 import org.chromium.chromoting.jni.JniInterface;
 
 import java.util.Set;
 import java.util.TreeSet;
 
 /**
  * A simple screen that does nothing except display a DesktopView and notify it of rotations.
  */
-public class Desktop extends Activity implements View.OnSystemUiVisibilityChangeListener {
+public class Desktop extends ActionBarActivity implements View.OnSystemUiVisibilityChangeListener {
     /** Web page to be displayed in the Help screen when launched from this activity. */
     private static final String HELP_URL =
             "http://support.google.com/chrome/?p=mobile_crd_connecthost";
 
     /** The surface that displays the remote host's desktop feed. */
     private DesktopView mRemoteHostDesktop;
 
     /** The button used to show the action bar. */
     private ImageButton mOverlayButton;
 
     /** Set of pressed keys for which we've sent TextEvent. */
     private Set<Integer> mPressedTextKeys = new TreeSet<Integer>();
 
+    private ActivityLifecycleListener mActivityLifecycleListener;
+
+
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.desktop);
         mRemoteHostDesktop = (DesktopView)findViewById(R.id.desktop_view);
         mOverlayButton = (ImageButton)findViewById(R.id.desktop_overlay_button);
         mRemoteHostDesktop.setDesktop(this);
 
         // Ensure the button is initially hidden.
         showActionBar();
 
         View decorView = getWindow().getDecorView();
         decorView.setOnSystemUiVisibilityChangeListener(this);
+
+

[Lambros, 2014/08/14 23:54:25]

nit: only one blank line

[aiguha, 2014/08/15 03:37:30]

Done.

+
+        mActivityLifecycleListener = CapabilityManager.getInstance()
+            .onActivityAcceptingListener(this, Capabilities.CAST_CAPABILITY);
+        mActivityLifecycleListener.onActivityCreated(this, savedInstanceState);
+    }
+

[Lambros, 2014/08/14 23:54:25]

nit: only one blank line

[aiguha, 2014/08/15 03:37:29]

Done.

+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        mActivityLifecycleListener.onActivityStarted(this);
+    }
+
+    @Override
+    protected void onPause() {
+      if (isFinishing()) {
+        mActivityLifecycleListener.onActivityPaused(this);
+      }
+      super.onPause();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mActivityLifecycleListener.onActivityResumed(this);
+    }
+
+    @Override
+    protected void onStop() {
+        mActivityLifecycleListener.onActivityStopped(this);
+        super.onStop();
     }
 
     /** Called when the activity is finally finished. */
     @Override
     public void onDestroy() {
         super.onDestroy();
         JniInterface.disconnectFromHost();
     }
 
     /** Called when the display is rotated (as registered in the manifest). */
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         mRemoteHostDesktop.onScreenConfigurationChanged();
     }
 
     /** Called to initialize the action bar. */
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.desktop_actionbar, menu);
+
+        mActivityLifecycleListener.onActivityCreatedOptionsMenu(this, menu);
+
         return super.onCreateOptionsMenu(menu);
     }
 
     /** 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.
 
         // Determine if the system is in fullscreen/lights-out mode. LOW_PROFILE is needed since
@@ skipping 51 matching lines @@
 
     /** The overlay button's onClick handler. */
     public void onOverlayButtonPressed(View view) {
         showActionBar();
     }
 
     /** Called whenever an action bar button is pressed. */
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
+
+        mActivityLifecycleListener.onActivityOptionsItemSelected(this, item);
+
         if (id == R.id.actionbar_keyboard) {
             ((InputMethodManager)getSystemService(INPUT_METHOD_SERVICE)).toggleSoftInput(0, 0);
             return true;
         }
         if (id == R.id.actionbar_hide) {
             hideActionBar();
             return true;
         }
         if (id == R.id.actionbar_disconnect) {
             JniInterface.disconnectFromHost();
@@ skipping 88 matching lines @@
                 JniInterface.sendKeyEvent(KeyEvent.KEYCODE_SHIFT_LEFT, pressed);
                 JniInterface.sendKeyEvent(KeyEvent.KEYCODE_EQUALS, pressed);
                 return true;
 
             default:
                 // We try to send all other key codes to the host directly.
                 return JniInterface.sendKeyEvent(keyCode, pressed);
         }
     }
 }