Revert "The demo app now works in multi-window mode"

This reverts commit e8ae1ec.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I168629722af041d95cdd65bb603e949f17cea1f7

README.md

@@ -13,7 +13,7 @@ Requires API Level 9. The library uses Camera 1 API on API Level 9-20 and Camera
 | 9-13      | Camera1    | SurfaceView  |
 | 14-20     | Camera1    | TextureView  |
 | 21-23     | Camera2    | TextureView  |
-| 24+       | Camera2    | SurfaceView  |
+| 24        | Camera2    | SurfaceView  |
 
 ## Features
 
@@ -40,15 +40,15 @@ Requires API Level 9. The library uses Camera 1 API on API Level 9-20 and Camera
 
 ```java
     @Override
-    protected void onStart() {
-        super.onStart();
+    protected void onResume() {
+        super.onResume();
         mCameraView.start();
     }
 
     @Override
-    protected void onStop() {
+    protected void onPause() {
         mCameraView.stop();
-        super.onStop();
+        super.onPause();
     }
 ```
 

demo/src/main/java/com/google/android/cameraview/demo/MainActivity.java

@@ -130,8 +130,8 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     @Override
-    protected void onStart() {
-        super.onStart();
+    protected void onResume() {
+        super.onResume();
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
                 == PackageManager.PERMISSION_GRANTED) {
             mCameraView.start();
@@ -150,9 +150,9 @@ protected void onStart() {
     }
 
     @Override
-    protected void onStop() {
+    protected void onPause() {
         mCameraView.stop();
-        super.onStop();
+        super.onPause();
     }
 
     @Override