Migrated various apps under packages/apps/Camera2 to androidx
Bug: 76692459
Test: mmma packages/apps/Camera2
Change-Id: Ie802a96af687192ca68c318cb142f17e76b2988f
diff --git a/Android.mk b/Android.mk
index 879692e..96c4fb8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,9 +5,9 @@
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-v13 \
- android-support-v4 \
- android-support-compat
+ androidx.legacy_legacy-support-v13 \
+ androidx.legacy_legacy-support-v4 \
+ androidx.core_core
LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2-portability
LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
diff --git a/src/com/android/camera/AccessibilityUtil.java b/src/com/android/camera/AccessibilityUtil.java
index 155a149..3b4c8f5 100644
--- a/src/com/android/camera/AccessibilityUtil.java
+++ b/src/com/android/camera/AccessibilityUtil.java
@@ -2,7 +2,7 @@
import android.accessibilityservice.AccessibilityServiceInfo;
import android.content.Context;
-import android.support.v4.view.accessibility.AccessibilityManagerCompat;
+import androidx.core.view.accessibility.AccessibilityManagerCompat;
import android.view.View;
import android.view.accessibility.AccessibilityManager;
import android.widget.Button;
diff --git a/src/com/android/camera/burst/RingBuffer.java b/src/com/android/camera/burst/RingBuffer.java
index 04fa7de..d5090c2 100644
--- a/src/com/android/camera/burst/RingBuffer.java
+++ b/src/com/android/camera/burst/RingBuffer.java
@@ -16,7 +16,7 @@
package com.android.camera.burst;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
import com.android.camera.async.SafeCloseable;
import com.android.camera.one.v2.camera2proxy.ImageProxy;
diff --git a/src/com/android/camera/one/v2/OneCameraZslImpl.java b/src/com/android/camera/one/v2/OneCameraZslImpl.java
index 6bdad44..5464ab8 100644
--- a/src/com/android/camera/one/v2/OneCameraZslImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraZslImpl.java
@@ -39,7 +39,7 @@
import android.os.Handler;
import android.os.HandlerThread;
import android.os.SystemClock;
-import android.support.v4.util.Pools;
+import androidx.core.util.Pools;
import android.view.Surface;
import com.android.camera.CaptureModuleUtil;
diff --git a/src/com/android/camera/one/v2/autofocus/TriggerStateMachine.java b/src/com/android/camera/one/v2/autofocus/TriggerStateMachine.java
index 95d2523..86721ac 100644
--- a/src/com/android/camera/one/v2/autofocus/TriggerStateMachine.java
+++ b/src/com/android/camera/one/v2/autofocus/TriggerStateMachine.java
@@ -17,7 +17,7 @@
package com.android.camera.one.v2.autofocus;
import android.hardware.camera2.CaptureResult;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.android.camera.async.Updatable;
diff --git a/src/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java b/src/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
index 4b8e8fc..cb4edd7 100644
--- a/src/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
+++ b/src/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
@@ -17,7 +17,7 @@
package com.android.camera.one.v2.photo.zsl;
import android.hardware.camera2.CameraAccessException;
-import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
import com.android.camera.async.BufferQueue;
import com.android.camera.async.Updatable;
diff --git a/src/com/android/camera/processing/ProcessingService.java b/src/com/android/camera/processing/ProcessingService.java
index c67ebd6..1e48095 100644
--- a/src/com/android/camera/processing/ProcessingService.java
+++ b/src/com/android/camera/processing/ProcessingService.java
@@ -27,7 +27,7 @@
import android.os.PowerManager;
import android.os.PowerManager.WakeLock;
import android.os.Process;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.android.camera.app.CameraServices;
import com.android.camera.app.CameraServicesImpl;
diff --git a/src/com/android/camera/settings/CameraSettingsActivity.java b/src/com/android/camera/settings/CameraSettingsActivity.java
index 50641fd..2d32a54 100644
--- a/src/com/android/camera/settings/CameraSettingsActivity.java
+++ b/src/com/android/camera/settings/CameraSettingsActivity.java
@@ -29,7 +29,7 @@
import android.preference.PreferenceFragment;
import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
import android.view.MenuItem;
import com.android.camera.FatalErrorHandler;
diff --git a/src/com/android/camera/util/AndroidContext.java b/src/com/android/camera/util/AndroidContext.java
index 6fc50c4..72f3478 100644
--- a/src/com/android/camera/util/AndroidContext.java
+++ b/src/com/android/camera/util/AndroidContext.java
@@ -17,7 +17,7 @@
package com.android.camera.util;
import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
/**
* Initializable singleton for providing the application level context