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

Commit 5a2b9adc authored by LuK1337's avatar LuK1337
Browse files

Migrate to AndroidX 

Change-Id: Ic9503cffe10a91a9aa07cc9e1537d883ee38c556
parent d0cde76f

Android.mk

+6 −9
Original line number Diff line number Diff line
@@ -9,16 +9,13 @@ LOCAL_SRC_FILES += $(call all-java-files-under, src_aosp) 


LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res)



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-v8-renderscript \

    android-common



LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-v4 \

    android-support-v7-appcompat \

    android-support-v7-cardview \

    android-support-v7-palette \

    android-support-v7-recyclerview

    androidx.appcompat_appcompat \

    androidx.cardview_cardview \

    androidx.core_core \

    androidx.legacy_legacy-support-v4 \

    androidx.palette_palette \

    androidx.recyclerview_recyclerview



LOCAL_USE_AAPT2 := true

build.gradle

+8 −7
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ task updateGradleWrapper(type: Wrapper) { 
apply plugin: 'com.android.application'



android {

    compileSdkVersion 28

    compileSdkVersion 29



    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_8
@@ -42,7 +42,7 @@ android { 
        applicationId "org.lineageos.eleven"



        minSdkVersion 26

        targetSdkVersion 28

        targetSdkVersion 29



        versionCode 3

        versionName '3.0'
@@ -121,10 +121,11 @@ android { 
}



dependencies {

    // see https://developer.android.com/topic/libraries/support-library/revisions.html

    implementation "com.android.support:appcompat-v7:28.0.0"

    implementation "com.android.support:cardview-v7:28.0.0"

    implementation "com.android.support:palette-v7:28.0.0"

    implementation "com.android.support:recyclerview-v7:28.0.0"

    implementation 'androidx.appcompat:appcompat:1.1.0'

    implementation 'androidx.cardview:cardview:1.0.0'

    implementation 'androidx.core:core:1.1.0'

    implementation 'androidx.legacy:legacy-support-v4:1.0.0'

    implementation 'androidx.palette:palette:1.0.0'

    implementation 'androidx.recyclerview:recyclerview:1.0.0'

}

res/layout/artist_detail_album.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  See the License for the specific language governing permissions and

  limitations under the License.

-->

<android.support.v7.widget.CardView

<androidx.cardview.widget.CardView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:card_view="http://schemas.android.com/apk/res-auto"

    android:layout_width="156dp"
@@ -78,4 +78,4 @@ 


    </RelativeLayout>



</android.support.v7.widget.CardView>
 
</androidx.cardview.widget.CardView>

res/layout/artist_detail_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        android:textSize="@dimen/text_size_medium"

        android:text="@string/header_albums" />



    <android.support.v7.widget.RecyclerView

    <androidx.recyclerview.widget.RecyclerView

        android:id="@+id/albums"

        android:scrollbars="none"

        android:layout_width="match_parent"

res/layout/fragment_music_browser_phone.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
            android:elevation="@dimen/action_bar_elevation"

            style="@style/HeaderTabTextStyle" />



        <android.support.v4.view.ViewPager

        <androidx.viewpager.widget.ViewPager

            android:id="@+id/fragment_home_phone_pager"

            android:layout_width="match_parent"

            android:layout_height="match_parent"