Deprecate Camera2Basic

- Deprecate old Camera2Basic
- Replace Camera2Basic with Camera2Formats sample

Change-Id: I1dadc9a054b58748b9220ddc56b0b61f38606dad

Author: owahltinez

Camera2Formats/.google/packaging.yaml renamed to Camera2Basic/.google/packaging.yaml

@@ -7,7 +7,7 @@
 status:       PUBLISHED
 technologies: [Android]
 categories:   [Camera]
-languages:    [Java]
+languages:    [Kotlin]
 solutions:    [Mobile]
 github:       android/camera
 level:        INTERMEDIATE

Camera2Formats/README.md renamed to Camera2Basic/README.md

@@ -1,6 +1,6 @@
 
-Android Camera2Formats Sample
-=============================
+Android Camera2Basic Sample
+===========================
 
 This sample demonstrates using the Camera2 API to capture a JPEG, DEPTH or RAW frame.
 Check the source code to see a simple example of how to display the camera preview

Camera2Formats/app/build.gradle renamed to Camera2Basic/app/build.gradle

@@ -24,7 +24,7 @@ android {
     compileSdkVersion 29
     defaultConfig {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        applicationId "com.android.example.camera2.formats"
+        applicationId "com.android.example.camera2.basic"
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
@@ -68,7 +68,7 @@ dependencies {
     // Kotlin lang
     implementation 'androidx.core:core-ktx:1.1.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
 
     // App compat and UI things
     implementation 'androidx.appcompat:appcompat:1.1.0'
@@ -84,8 +84,8 @@ dependencies {
     implementation 'androidx.exifinterface:exifinterface:1.1.0'
 
     // Glide
-    implementation 'com.github.bumptech.glide:glide:4.10.0'
-    kapt 'com.github.bumptech.glide:compiler:4.10.0'
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    kapt 'com.github.bumptech.glide:compiler:4.11.0'
 
     // Unit testing
     testImplementation 'androidx.test.ext:junit:1.1.1'

Camera2Formats/app/src/main/AndroidManifest.xml renamed to Camera2Basic/app/src/main/AndroidManifest.xml

@@ -16,7 +16,7 @@
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.example.android.camera2.formats">
+    package="com.example.android.camera2.basic">
 
     <!-- Permission declarations -->
     <uses-permission android:name="android.permission.CAMERA" />
@@ -33,7 +33,7 @@
         tools:ignore="GoogleAppIndexingWarning">
 
         <activity
-            android:name=".CameraActivity"
+            android:name="com.example.android.camera2.basic.CameraActivity"
             android:clearTaskOnLaunch="true"
             android:theme="@style/AppTheme">
 

Camera2Formats/app/src/main/java/com/example/android/camera2/formats/CameraActivity.kt renamed to Camera2Basic/app/src/main/java/com/example/android/camera2/basic/CameraActivity.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.android.camera2.formats
+package com.example.android.camera2.basic
 
 import android.os.Bundle
 import android.view.View

Camera2Formats/app/src/main/java/com/example/android/camera2/formats/fragments/CameraFragment.kt renamed to Camera2Basic/app/src/main/java/com/example/android/camera2/basic/fragments/CameraFragment.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.android.camera2.formats.fragments
+package com.example.android.camera2.basic.fragments
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -51,7 +51,7 @@ import com.example.android.camera2.common.computeExifOrientation
 import com.example.android.camera2.common.getPreviewOutputSize
 import com.example.android.camera2.common.AutoFitSurfaceView
 import com.example.android.camera2.common.OrientationLiveData
-import com.example.android.camera2.formats.R
+import com.example.android.camera2.basic.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine

Camera2Formats/app/src/main/java/com/example/android/camera2/formats/fragments/ImageViewerFragment.kt renamed to Camera2Basic/app/src/main/java/com/example/android/camera2/basic/fragments/ImageViewerFragment.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.android.camera2.formats.fragments
+package com.example.android.camera2.basic.fragments
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory

Camera2Formats/app/src/main/java/com/example/android/camera2/formats/fragments/PermissionsFragment.kt renamed to Camera2Basic/app/src/main/java/com/example/android/camera2/basic/fragments/PermissionsFragment.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.android.camera2.formats.fragments
+package com.example.android.camera2.basic.fragments
 
 import android.Manifest
 import android.content.Context
@@ -24,7 +24,7 @@ import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.navigation.Navigation
-import com.example.android.camera2.formats.R
+import com.example.android.camera2.basic.R
 
 private const val PERMISSIONS_REQUEST_CODE = 10
 private val PERMISSIONS_REQUIRED = arrayOf(Manifest.permission.CAMERA)

Camera2Formats/app/src/main/java/com/example/android/camera2/formats/fragments/SelectorFragment.kt renamed to Camera2Basic/app/src/main/java/com/example/android/camera2/basic/fragments/SelectorFragment.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.android.camera2.formats.fragments
+package com.example.android.camera2.basic.fragments
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -32,7 +32,7 @@ import androidx.navigation.Navigation
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.example.android.camera2.common.GenericListAdapter
-import com.example.android.camera2.formats.R
+import com.example.android.camera2.basic.R
 
 class SelectorFragment : Fragment() {
 

Camera2Formats/app/src/main/res/drawable-hdpi/ic_launcher.png renamed to Camera2Basic/app/src/main/res/drawable-hdpi/ic_launcher.png

@@ -22,7 +22,7 @@
 
     <fragment
         android:id="@+id/permissions_fragment"
-        android:name="com.example.android.camera2.formats.fragments.PermissionsFragment"
+        android:name="com.example.android.camera2.basic.fragments.PermissionsFragment"
         android:label="Permissions" >
 
         <action
@@ -35,7 +35,7 @@
 
     <fragment
         android:id="@+id/selector_fragment"
-        android:name="com.example.android.camera2.formats.fragments.SelectorFragment"
+        android:name="com.example.android.camera2.basic.fragments.SelectorFragment"
         android:label="Selector" >
 
         <action
@@ -47,7 +47,7 @@
 
     <fragment
         android:id="@+id/camera_fragment"
-        android:name="com.example.android.camera2.formats.fragments.CameraFragment"
+        android:name="com.example.android.camera2.basic.fragments.CameraFragment"
         android:label="Camera" >
 
         <argument
@@ -75,7 +75,7 @@
 
     <fragment
         android:id="@+id/image_viewer_fragment"
-        android:name="com.example.android.camera2.formats.fragments.ImageViewerFragment"
+        android:name="com.example.android.camera2.basic.fragments.ImageViewerFragment"
         android:label="Image Viewer" >
 
         <argument

Camera2Formats/app/src/main/res/drawable-mdpi/ic_launcher.png renamed to Camera2Basic/app/src/main/res/drawable-mdpi/ic_launcher.png

@@ -14,5 +14,5 @@
  limitations under the License.
 -->
 <resources>
-    <string name="app_name">Camera2Formats</string>
+    <string name="app_name">Camera2Basic</string>
 </resources>

Camera2Formats/app/src/main/res/drawable-xhdpi/ic_launcher.png renamed to Camera2Basic/app/src/main/res/drawable-xhdpi/ic_launcher.png

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.android.camera2.formats
+package com.example.android.camera2.basic
 
 import android.Manifest
 import android.content.Context
@@ -41,6 +41,6 @@ class MainInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test
         val context = ApplicationProvider.getApplicationContext() as Context
-        assertEquals("com.android.example.camera2formats", context.packageName)
+        assertEquals("com.android.example.camera2.basic", context.packageName)
     }
 }

Camera2Formats/app/src/main/res/drawable-xxhdpi/ic_launcher.png renamed to Camera2Basic/app/src/main/res/drawable-xxhdpi/ic_launcher.png

@@ -26,7 +26,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0"