diff options
| author | Ralf Kistner <ralf@journeyapps.com> | 2019-09-07 16:12:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-07 16:12:11 +0300 |
| commit | 7042d74f4a7fc29c846315789675bf6c07518be0 (patch) | |
| tree | c473f1ff6f22fe2576ca15a68251ce3dcf25a595 /sample/src/main/java/example/zxing/MainActivity.java | |
| parent | 6556f815584f921e21bb088d2f6423baa99d0547 (diff) | |
| parent | 82e8f9afcc1e691abb9093984b8a75701585ae5a (diff) | |
| download | zxing-android-embedded-7042d74f4a7fc29c846315789675bf6c07518be0.tar.xz | |
Merge pull request #438 from journeyapps/androidx
Switch to androidx
Diffstat (limited to 'sample/src/main/java/example/zxing/MainActivity.java')
| -rw-r--r-- | sample/src/main/java/example/zxing/MainActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sample/src/main/java/example/zxing/MainActivity.java b/sample/src/main/java/example/zxing/MainActivity.java index a6914129..15a8f8eb 100644 --- a/sample/src/main/java/example/zxing/MainActivity.java +++ b/sample/src/main/java/example/zxing/MainActivity.java @@ -3,8 +3,8 @@ package example.zxing; import android.content.Intent; import android.hardware.Camera; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.LayoutInflater; import android.view.View; |