From 269c72232ac96d069af9c4ca05009346397528a8 Mon Sep 17 00:00:00 2001 From: vineel sadineni Date: Tue, 15 May 2018 15:18:45 -0700 Subject: [PATCH] Migrated various apps under packages/apps/Camera2 to androidx Bug: 76692459 Test: mmma packages/apps/Camera2 Change-Id: Ie802a96af687192ca68c318cb142f17e76b2988f --- Android.mk | 6 +++--- src/com/android/camera/AccessibilityUtil.java | 2 +- src/com/android/camera/burst/RingBuffer.java | 2 +- src/com/android/camera/one/v2/OneCameraZslImpl.java | 2 +- src/com/android/camera/one/v2/autofocus/TriggerStateMachine.java | 2 +- src/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java | 2 +- src/com/android/camera/processing/ProcessingService.java | 2 +- src/com/android/camera/settings/CameraSettingsActivity.java | 2 +- src/com/android/camera/util/AndroidContext.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Android.mk b/Android.mk index 879692eef..96c4fb8dd 100644 --- a/Android.mk +++ b/Android.mk @@ -5,9 +5,9 @@ include $(CLEAR_VARS) 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 155a1495b..3b4c8f511 100644 --- a/src/com/android/camera/AccessibilityUtil.java +++ b/src/com/android/camera/AccessibilityUtil.java @@ -2,7 +2,7 @@ package com.android.camera; 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 04fa7decd..d5090c2ad 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 6bdad4402..5464ab8a9 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.Build; 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 95d2523e6..86721acb7 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 4b8e8fc62..cb4edd758 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 c67ebd613..1e4809563 100644 --- a/src/com/android/camera/processing/ProcessingService.java +++ b/src/com/android/camera/processing/ProcessingService.java @@ -27,7 +27,7 @@ import android.os.IBinder; 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 50641fd22..2d32a54c2 100644 --- a/src/com/android/camera/settings/CameraSettingsActivity.java +++ b/src/com/android/camera/settings/CameraSettingsActivity.java @@ -29,7 +29,7 @@ import android.preference.Preference.OnPreferenceClickListener; 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 6fc50c4aa..72f347804 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 -- 2.11.0