Updater: Move to AndroidX (91f33aa0) · Commits · e / os / android_packages_apps_Updater

Android.mk

+7 −11

Original line number	Diff line number	Diff line
		@@ -9,13 +9,12 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
		LOCAL_USE_AAPT2 := true

		LOCAL_STATIC_ANDROID_LIBRARIES := \
		android-support-design \
		android-support-transition \
		android-support-v4 \
		android-support-v7-appcompat \
		android-support-v7-cardview \
		android-support-v7-preference \
		android-support-v7-recyclerview
		com.google.android.material_material \
		androidx.core_core \
		androidx.appcompat_appcompat \
		androidx.cardview_cardview \
		androidx.preference_preference \
		androidx.recyclerview_recyclerview \

		LOCAL_RESOURCE_DIR := \
		$(LOCAL_PATH)/res
		@@ -37,13 +36,10 @@ updater_system_libs_path := $(abspath $(LOCAL_PATH))/system_libs

		include $(BUILD_SYSTEM)/base_rules.mk

		.PHONY: copy_updater_system_deps
		copy_updater_system_deps: $(updater_system_deps)
		$(LOCAL_BUILT_MODULE): $(updater_system_deps)
		$(hide) mkdir -p $(updater_system_libs_path)
		$(hide) rm -rf $(updater_system_libs_path)/*.jar
		$(hide) cp $(updater_system_deps) $(updater_system_libs_path)/framework.jar

		$(LOCAL_BUILT_MODULE): copy_updater_system_deps
		$(hide) echo "Fake: $@"
		$(hide) mkdir -p $(dir $@)
		$(hide) touch $@

build.gradle

+8 −10

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ buildscript {
		}

		dependencies {
		classpath 'com.android.tools.build:gradle:3.1.0'
		classpath 'com.android.tools.build:gradle:3.5.0'
		}
		}

		@@ -21,12 +21,11 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
		apply plugin: 'com.android.application'

		android {
		compileSdkVersion 27
		buildToolsVersion '27.0.3'
		compileSdkVersion 29

		defaultConfig {
		minSdkVersion 27
		targetSdkVersion 27
		targetSdkVersion 29
		}

		lintOptions {
		@@ -61,10 +60,9 @@ android {
		dependencies {
		compileOnly fileTree(dir: 'system_libs/', include: ['*.jar'])

		def supportLibVersion = "27.1.0"
		implementation "com.android.support:appcompat-v7:${supportLibVersion}"
		implementation "com.android.support:cardview-v7:${supportLibVersion}"
		implementation "com.android.support:design:${supportLibVersion}"
		implementation "com.android.support:preference-v7:${supportLibVersion}"
		implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
		implementation 'com.google.android.material:material:1.0.0'
		implementation 'androidx.appcompat:appcompat:1.1.0'
		implementation 'androidx.cardview:cardview:1.0.0'
		implementation 'androidx.preference:preference:1.1.0'
		implementation 'androidx.recyclerview:recyclerview:1.0.0'
		}

gradle.properties

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		android.enableJetifier=true
		android.useAndroidX=true
		No newline at end of file

proguard.flags

+0 −3

Original line number	Diff line number	Diff line
		-keep class android.support.design.widget.** { *; }
		-keep interface android.support.design.widget.** { *; }

		-keep class org.lineageos.updater.ui.FlingBehavior { *; }

res/layout/activity_updates.xml

+10 −10

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<android.support.design.widget.CoordinatorLayout
		<androidx.coordinatorlayout.widget.CoordinatorLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:id="@+id/main_container"
		@@ -7,14 +7,14 @@
		android:layout_height="match_parent"
		android:fitsSystemWindows="true">

		<android.support.design.widget.AppBarLayout
		<com.google.android.material.appbar.AppBarLayout
		android:id="@+id/app_bar"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:fitsSystemWindows="true"
		app:layout_behavior="org.lineageos.updater.ui.FlingBehavior">

		<android.support.design.widget.CollapsingToolbarLayout
		<com.google.android.material.appbar.CollapsingToolbarLayout
		android:id="@+id/collapsing_toolbar"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		@@ -67,16 +67,16 @@
		android:textSize="12sp" />
		</RelativeLayout>

		<android.support.v7.widget.Toolbar
		<androidx.appcompat.widget.Toolbar
		android:id="@+id/toolbar"
		android:layout_width="match_parent"
		android:layout_height="?attr/actionBarSize"
		android:textColor="?android:attr/textColorPrimary"
		app:layout_collapseMode="pin" />
		</android.support.design.widget.CollapsingToolbarLayout>
		</android.support.design.widget.AppBarLayout>
		</com.google.android.material.appbar.CollapsingToolbarLayout>
		</com.google.android.material.appbar.AppBarLayout>

		<android.support.v4.widget.NestedScrollView
		<androidx.core.widget.NestedScrollView
		android:id="@+id/no_new_updates_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		@@ -89,9 +89,9 @@
		android:gravity="center"
		android:text="@string/list_no_updates"
		android:textColor="?android:textColorSecondary" />
		</android.support.v4.widget.NestedScrollView>
		</androidx.core.widget.NestedScrollView>

		<android.support.v7.widget.RecyclerView
		<androidx.recyclerview.widget.RecyclerView
		android:id="@+id/recycler_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		@@ -99,4 +99,4 @@
		android:paddingBottom="5dp"
		android:scrollbars="vertical"
		app:layout_behavior="@string/appbar_scrolling_view_behavior" />
		</android.support.design.widget.CoordinatorLayout>
		</androidx.coordinatorlayout.widget.CoordinatorLayout>