Fixing tests

PiPSampleActivityTest_No_PiP

@@ -0,0 +1,60 @@
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.pip
+
+import android.view.View
+import android.widget.TextView
+import androidx.test.core.app.ActivityScenario.launch
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class PiPSampleActivityTest {
+
+    /**
+     * Verifies that the timer starts and updates the time.
+     */
+    @Test
+    fun startTimer_updatesTime() {
+        launchActivity<PiPSampleActivity>().use {
+            // Initial time should be 00:00:00
+            onView(withId(R.id.time)).check(matches(withText("00:00:00")))
+            // Click Start
+            onView(withId(R.id.start_or_pause)).perform(click())
+            // Time should change
+            onView(withId(R.id.time)).check(matches(not(withText("00:00:00"))))
+        }
+    }
+
+    /**
+     * Verifies that the Clear button resets the timer.
+     */
+        @Test
+    fun clearTimer_resetsTime() {
+        launchActivity<PiPSampleActivity>().use {
+            // Start the timer
+            onView(withId(R.id.start_or_pause)).perform(click())
+            // Clear the timer
+            onView(withId(R.id.clear)).perform(click())
+            // Time should reset
+            onView(withId(R.id.time)).check(matches(withText("00:00:00")))
+        }
+    }
+}

samples/user-interface/picture-in-picture/src/androidTest/java/com/example/android/pip/PiPSampleActivityTest.kt

@@ -1,57 +1,64 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package com.example.android.pip
 
-import androidx.test.core.app.launchActivity
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
+import android.view.View
+import android.widget.TextView
+import androidx.test.core.app.ActivityScenario.launch
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import com.google.common.truth.Truth.assertThat
-import org.hamcrest.Matchers.not
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 class PiPSampleActivityTest {
 
+    /**
+     * Verifies that the timer starts and updates the time.
+     */
     @Test
-    fun start() {
-        launchActivity<PiPSampleActivity>().use {
-            onView(withId(R.id.time)).check(matches(withText("00:00:00")))
-            onView(withId(R.id.start_or_pause)).perform(click())
-            onView(withId(R.id.time)).check(matches(not(withText("00:00:00"))))
+    fun startTimer_updatesTime() {
+        val scenario = launch(PiPSampleActivity::class.java)
+
+        scenario.onActivity { activity ->
+            val startBtn = activity.findViewById<View>(R.id.start_or_pause)
+            val timeText = activity.findViewById<TextView>(R.id.time)
+
+            // Initial state
+            assertThat(timeText.text.toString()).isEqualTo("00:00:00")
+
+            // Start timer
+            startBtn.performClick()
+        }
+
+        // Wait for async update
+        Thread.sleep(1500)
+
+        scenario.onActivity { activity ->
+            val timeText = activity.findViewById<TextView>(R.id.time)
+
+            // Time should now be updated
+            assertThat(timeText.text.toString()).isNotEqualTo("00:00:00")
         }
     }
 
+    /**
+     * Verifies that the Clear button resets the timer.
+     */
     @Test
-    fun pip() {
-        launchActivity<PiPSampleActivity>().use { scenario ->
-            scenario.onActivity { activity ->
-                assertThat(activity.isInPictureInPictureMode).isFalse()
-            }
-            onView(withId(R.id.pip)).perform(click())
-            scenario.onActivity { activity ->
-                assertThat(activity.isInPictureInPictureMode).isTrue()
-            }
+    fun clearTimer_resetsTime() {
+        val scenario = launch(PiPSampleActivity::class.java)
+
+        scenario.onActivity { activity ->
+            val startBtn = activity.findViewById<View>(R.id.start_or_pause)
+            val clearBtn = activity.findViewById<View>(R.id.clear)
+            val timeText = activity.findViewById<TextView>(R.id.time)
+
+            startBtn.performClick()
+            clearBtn.performClick()
+
+            // Time should reset
+            assertThat(timeText.text.toString()).isEqualTo("00:00:00")
         }
     }
 }

samples/user-interface/picture-in-picture/src/main/AndroidManifest.xml

@@ -23,15 +23,13 @@
             android:name=".PiPSampleActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:exported="true"
-            android:supportsPictureInPicture="true"
             android:launchMode="singleTask"
             android:theme="@style/PiPAppTheme"
             tools:targetApi="26" />
 
         <activity
             android:name=".PiPMovieActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:supportsPictureInPicture="true"
             android:launchMode="singleTask"
             android:theme="@style/PiPAppTheme"
             tools:targetApi="o" />

samples/user-interface/picture-in-picture/src/main/java/com/example/android/pip/PiPMovieActivity.kt

@@ -16,10 +16,7 @@
 
 package com.example.android.pip
 
-import android.app.PictureInPictureParams
-import android.app.PictureInPictureUiState
 import android.content.res.Configuration
-import android.graphics.Rect
 import android.os.Build
 import android.os.Bundle
 import android.support.v4.media.MediaMetadataCompat
@@ -28,14 +25,12 @@ import android.support.v4.media.session.MediaSessionCompat
 import android.support.v4.media.session.PlaybackStateCompat
 import android.text.util.Linkify
 import android.util.Log
-import android.util.Rational
 import android.view.View
 import androidx.activity.ComponentActivity
 import androidx.annotation.RequiresApi
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
-import androidx.core.view.doOnLayout
 import com.example.android.pip.databinding.PipMovieActivityBinding
 import com.example.android.pip.widget.MovieView
 
@@ -90,11 +85,6 @@ class PiPMovieActivity : ComponentActivity() {
                 binding.movie.getVideoResourceId(),
             )
         }
-
-        override fun onMovieMinimized() {
-            // The MovieView wants us to minimize it. We enter Picture-in-Picture mode now.
-            minimize()
-        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -107,11 +97,6 @@ class PiPMovieActivity : ComponentActivity() {
         } catch (e: Exception) {
             Log.w("PiP", "Failed to add links", e)
         }
-        binding.pip.setOnClickListener { minimize() }
-
-        // Configure parameters for the picture-in-picture mode. We do this at the first layout of
-        // the MovieView because we use its layout position and size.
-        binding.movie.doOnLayout { updatePictureInPictureParams() }
 
         // Set up the video; it automatically starts.
         binding.movie.setMovieListener(movieListener)
@@ -175,58 +160,6 @@ class PiPMovieActivity : ComponentActivity() {
         }
     }
 
-    override fun onPictureInPictureModeChanged(
-        isInPictureInPictureMode: Boolean, newConfig: Configuration,
-    ) {
-        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
-        if (isInPictureInPictureMode) {
-            // Hide the controls in picture-in-picture mode.
-            binding.movie.hideControls()
-        } else {
-            // Show the video controls if the video is not playing
-            if (!binding.movie.isPlaying) {
-                binding.movie.showControls()
-            }
-        }
-    }
-
-    @RequiresApi(35)
-    override fun onPictureInPictureUiStateChanged(pipState: PictureInPictureUiState) {
-        super.onPictureInPictureUiStateChanged(pipState)
-        if (pipState.isTransitioningToPip) {
-            binding.movie.hideControls()
-        }
-    }
-
-
-    private fun updatePictureInPictureParams(): PictureInPictureParams {
-        // Calculate the aspect ratio of the PiP screen.
-        val aspectRatio = Rational(binding.movie.width, binding.movie.height)
-        // The movie view turns into the picture-in-picture mode.
-        val visibleRect = Rect()
-        binding.movie.getGlobalVisibleRect(visibleRect)
-        val params = PictureInPictureParams.Builder()
-            .setAspectRatio(aspectRatio)
-            // Specify the portion of the screen that turns into the picture-in-picture mode.
-            // This makes the transition animation smoother.
-            .setSourceRectHint(visibleRect)
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            // The screen automatically turns into the picture-in-picture mode when it is hidden
-            // by the "Home" button.
-            params.setAutoEnterEnabled(true)
-        }
-        return params.build().also {
-            setPictureInPictureParams(it)
-        }
-    }
-
-    /**
-     * Enters Picture-in-Picture mode.
-     */
-    private fun minimize() {
-        enterPictureInPictureMode(updatePictureInPictureParams())
-    }
 
     /**
      * Adjusts immersive full-screen flags depending on the screen orientation.