Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bde4e521 authored by Joey's avatar Joey
Browse files

Refactor to androidx libraries 



Change-Id: I0245c566c734719bb66eb1f20fdae5369e95dd67
Signed-off-by: default avatarJoey <joey@lineageos.org>
parent 26373586

app/build.gradle

+6 −6
Original line number Original line Diff line number Diff line 
apply plugin: 'com.android.application'

apply plugin: 'com.android.application'





android {

android {

    compileSdkVersion 27

    compileSdkVersion 28

    buildToolsVersion "27.0.3"

    buildToolsVersion '28.0.3'

    defaultConfig {

    defaultConfig {

        applicationId "org.lineageos.recorder"

        applicationId "org.lineageos.recorder"

        minSdkVersion 24

        minSdkVersion 24
@@ -25,8 +25,8 @@ android { 
}

}





dependencies {

dependencies {

    implementation 'com.android.support:appcompat-v7:27.1.1'

    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'

    implementation 'com.android.support:design:27.1.1'

    implementation 'com.google.android.material:material:1.1.0-alpha02'

    implementation 'com.android.support:cardview-v7:27.1.1'

    implementation 'androidx.cardview:cardview:1.0.0'

    implementation 'com.android.support.constraint:constraint-layout:1.1.0'

    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'

}
 
}

app/src/main/Android.mk

+7 −8
Original line number Original line Diff line number Diff line
@@ -26,14 +26,13 @@ LOCAL_SRC_FILES := \ 
LOCAL_USE_AAPT2 := true

LOCAL_USE_AAPT2 := true





LOCAL_STATIC_ANDROID_LIBRARIES += \

LOCAL_STATIC_ANDROID_LIBRARIES += \

    android-support-annotations \

    androidx.annotation_annotation \

    android-support-constraint-layout \

    androidx-constraintlayout_constraintlayout \

    android-support-constraint-layout-solver \

    androidx-constraintlayout_constraintlayout-solver \

    android-support-design \

    androidx.appcompat_appcompat \

    android-support-v4 \

    androidx.cardview_cardview \

    android-support-v7-appcompat \

    androidx.recyclerview_recyclerview \

    android-support-v7-cardview \

    com.google.android.material_material \

    android-support-v7-recyclerview





LOCAL_PACKAGE_NAME := Recorder

LOCAL_PACKAGE_NAME := Recorder

LOCAL_CERTIFICATE := platform

LOCAL_CERTIFICATE := platform

app/src/main/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ 




        <!-- File provider -->

        <!-- File provider -->

        <provider

        <provider

            android:name="android.support.v4.content.FileProvider"

            android:name="androidx.core.content.FileProvider"

            android:authorities="org.lineageos.recorder.fileprovider"

            android:authorities="org.lineageos.recorder.fileprovider"

            android:exported="false"

            android:exported="false"

            android:grantUriPermissions="true">

            android:grantUriPermissions="true">

app/src/main/java/org/lineageos/recorder/DialogActivity.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -20,10 +20,10 @@ import android.content.Intent; 
import android.content.SharedPreferences;

import android.content.SharedPreferences;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.os.Bundle;

import android.os.Bundle;

import android.support.annotation.LayoutRes;

import androidx.annotation.LayoutRes;

import android.support.annotation.NonNull;

import androidx.annotation.NonNull;

import android.support.v7.app.AlertDialog;

import androidx.appcompat.app.AlertDialog;

import android.support.v7.app.AppCompatActivity;

import androidx.appcompat.app.AppCompatActivity;

import android.view.LayoutInflater;

import android.view.LayoutInflater;

import android.view.View;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup;

app/src/main/java/org/lineageos/recorder/RecorderActivity.java

+10 −10
Original line number Original line Diff line number Diff line
@@ -29,16 +29,16 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.Handler;

import android.os.IBinder;

import android.os.IBinder;

import android.provider.Settings;

import android.provider.Settings;

import android.support.annotation.NonNull;

import androidx.annotation.NonNull;

import android.support.constraint.ConstraintLayout;

import androidx.constraintlayout.widget.ConstraintLayout;

import android.support.constraint.ConstraintSet;

import androidx.constraintlayout.widget.ConstraintSet;

import android.support.design.widget.FloatingActionButton;

import com.google.android.material.floatingactionbutton.FloatingActionButton;

import android.support.transition.TransitionManager;

import androidx.transition.TransitionManager;

import android.support.v4.app.ActivityCompat;

import androidx.core.app.ActivityCompat;

import android.support.v4.app.ActivityOptionsCompat;

import androidx.core.app.ActivityOptionsCompat;

import android.support.v4.content.ContextCompat;

import androidx.core.content.ContextCompat;

import android.support.v7.app.AlertDialog;

import androidx.appcompat.app.AlertDialog;

import android.support.v7.app.AppCompatActivity;

import androidx.appcompat.app.AppCompatActivity;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.view.View;

import android.view.View;

import android.widget.ImageView;

import android.widget.ImageView;