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

Commit ab2b39c9 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge changes from topic "androidx-settings-stage-aosp-master" into stage-aosp-master 

* changes:
  Migrated various apps under frameworks/base/packages/Shell  to androidx
  Migrated SystemUI & SettingsLib to androidx
parents eac760d2 e0efaddb

packages/SettingsLib/Android.mk

+7 −7
Original line number Diff line number Diff line
@@ -8,17 +8,17 @@ LOCAL_AAPT2_ONLY := true 
LOCAL_MODULE := SettingsLib



LOCAL_JAVA_LIBRARIES := \

    android-support-annotations

    androidx.annotation_annotation



LOCAL_SHARED_ANDROID_LIBRARIES := \

    android-support-v4 \

    android-support-v7-recyclerview \

    android-support-v7-preference \

    android-support-v7-appcompat \

    android-arch-lifecycle-runtime

    androidx.legacy_legacy-support-v4 \

    androidx.recyclerview_recyclerview \

    androidx.preference_preference \

    androidx.appcompat_appcompat \

    androidx.lifecycle_lifecycle-runtime



LOCAL_SHARED_JAVA_LIBRARIES := \

    android-arch-lifecycle-common

    androidx.lifecycle_lifecycle-common



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

packages/SettingsLib/common.mk

+8 −8
Original line number Diff line number Diff line
@@ -14,15 +14,15 @@ 
#



LOCAL_STATIC_JAVA_LIBRARIES += \

    android-support-annotations \

    android-arch-lifecycle-common

    androidx.annotation_annotation \

    androidx.lifecycle_lifecycle-common



LOCAL_STATIC_ANDROID_LIBRARIES += \

    android-support-v4 \

    android-arch-lifecycle-runtime \

    android-support-v7-recyclerview \

    android-support-v7-preference \

    android-support-v7-appcompat \

    android-support-v14-preference \

    androidx.legacy_legacy-support-v4 \

    androidx.lifecycle_lifecycle-runtime \

    androidx.recyclerview_recyclerview \

    androidx.preference_preference \

    androidx.appcompat_appcompat \

    androidx.legacy_legacy-preference-v14 \

    SettingsLib

packages/SettingsLib/res/layout/preference_access_point.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
            android:clipToPadding="false"

            android:paddingTop="4dp"

            android:paddingBottom="4dp">

            <android.support.v7.internal.widget.PreferenceImageView

            <androidx.preference.internal.PreferenceImageView

                android:id="@android:id/icon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

packages/SettingsLib/res/layout/preference_two_target.xml

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
            android:clipToPadding="false"

            android:paddingTop="4dp"

            android:paddingBottom="4dp">

            <android.support.v7.internal.widget.PreferenceImageView

            <androidx.preference.internal.PreferenceImageView

                android:id="@android:id/icon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

packages/SettingsLib/src/com/android/settingslib/CustomDialogPreference.java

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import android.app.Dialog; 
import android.content.Context;

import android.content.DialogInterface;

import android.os.Bundle;

import android.support.v14.preference.PreferenceDialogFragment;

import android.support.v7.preference.DialogPreference;

import androidx.preference.PreferenceDialogFragment;

import androidx.preference.DialogPreference;

import android.util.AttributeSet;

import android.view.View;