Chromium Code Reviews| Index: remoting/android/java/src/org/chromium/chromoting/Desktop.java |
| diff --git a/remoting/android/java/src/org/chromium/chromoting/Desktop.java b/remoting/android/java/src/org/chromium/chromoting/Desktop.java |
| index 8e0117aaf7b6fd4901d5e810f2a2ecf7e68f2e6b..cc8b81a8a00a74cc400f9c241fb2c2d2db11aa43 100644 |
| --- a/remoting/android/java/src/org/chromium/chromoting/Desktop.java |
| +++ b/remoting/android/java/src/org/chromium/chromoting/Desktop.java |
| @@ -18,7 +18,6 @@ import android.view.MotionEvent; |
| import android.view.View; |
| import android.view.View.OnLayoutChangeListener; |
| import android.view.View.OnTouchListener; |
| -import android.view.ViewGroup; |
| import android.view.inputmethod.InputMethodManager; |
| import org.chromium.chromoting.help.HelpContext; |
| @@ -77,6 +76,8 @@ public class Desktop |
| private CapabilityManager.HostCapability mHostTouchCapability = |
| CapabilityManager.HostCapability.UNKNOWN; |
| + private DesktopView mRemoteHostDesktop; |
| + |
| /** Called when the activity is first created. */ |
| @Override |
| public void onCreate(Bundle savedInstanceState) { |
| @@ -89,10 +90,8 @@ public class Desktop |
| mToolbar = (Toolbar) findViewById(R.id.toolbar); |
| setSupportActionBar(mToolbar); |
| - DesktopView remoteHostDesktop = mClient.createDesktopView(this, mClient); |
| - remoteHostDesktop.setLayoutParams(new ViewGroup.LayoutParams( |
| - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); |
| - ((ViewGroup) findViewById(R.id.desktop_view_placeholder)).addView(remoteHostDesktop); |
| + mRemoteHostDesktop = (DesktopView) findViewById(R.id.desktop_view); |
| + mRemoteHostDesktop.attach(mClient, this, mClient.getRenderStub()); |
| getSupportActionBar().setDisplayShowTitleEnabled(false); |
| getSupportActionBar().setDisplayHomeAsUpEnabled(true); |
| @@ -140,11 +139,17 @@ public class Desktop |
| } |
| }); |
| } else { |
| - remoteHostDesktop.setFitsSystemWindows(true); |
| + mRemoteHostDesktop.setFitsSystemWindows(true); |
| } |
| } |
| @Override |
| + public void onDestroy() { |
| + super.onDestroy(); |
|
Hzj_jie
2016/09/10 02:06:32
Though there should be zero impact, super.onDestro
Yuwei
2016/09/12 18:56:13
Done.
|
| + mRemoteHostDesktop.detach(); |
| + } |
| + |
| + @Override |
| protected void onStart() { |
| super.onStart(); |
| mActivityLifecycleListener.onActivityStarted(this); |