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

Commit 9f75fbc0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "androidx-settings-aosp" 

* changes:
  Update to use androidx.car
  Migrate PackageInstaller to androidx.
parents ed73c7a4 b4839c5a

Android.mk

+14 −14
Original line number Diff line number Diff line
@@ -9,25 +9,25 @@ LOCAL_SRC_FILES := \ 
    $(call all-java-files-under, src)



LOCAL_STATIC_ANDROID_LIBRARIES += \

    android-support-car \

    android-support-transition \

    android-support-compat \

    android-support-media-compat \

    android-support-core-utils \

    android-support-core-ui \

    android-support-fragment \

    android-support-v7-appcompat \

    android-support-v7-preference \

    android-support-v7-recyclerview \

    android-support-v14-preference \

    android-support-v17-leanback \

    android-support-v17-preference-leanback \

    androidx.car_car \

    androidx.transition_transition \

    androidx.core_core \

    androidx.media_media \

    androidx.legacy_legacy-support-core-utils \

    androidx.legacy_legacy-support-core-ui \

    androidx.fragment_fragment \

    androidx.appcompat_appcompat \

    androidx.preference_preference \

    androidx.recyclerview_recyclerview \

    androidx.legacy_legacy-preference-v14 \

    androidx.leanback_leanback \

    androidx.leanback_leanback-preference \

    car-list \

    SettingsLib



LOCAL_STATIC_JAVA_LIBRARIES := \

    xz-java \

    android-support-annotations

    androidx.annotation_annotation



LOCAL_PACKAGE_NAME := PackageInstaller

LOCAL_CERTIFICATE := platform

proguard.flags

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Don't warn about those in case this app is linking against an older

# platform version.  We know about them, and they are safe.



-keep class android.support.v7.preference.Preference* {

-keep class androidx.preference.Preference* {

    *;

}

-dontwarn android.support.v4.**
 
-dontwarn androidx.core.**

res/layout/install_confirm_perm.xml

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
                android:layout_height="0dp"

                android:layout_weight="0" />



            <android.support.v4.view.ViewPager android:id="@+id/pager"

            <androidx.viewpager.widget.ViewPager android:id="@+id/pager"

                android:background="?android:attr/windowBackground"

                android:layout_width="match_parent"

                android:layout_height="0dp"

res/layout/install_confirm_perm_update.xml

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ 
                    android:layout_height="0dp"

                    android:layout_weight="0" />



                <android.support.v4.view.ViewPager android:id="@+id/pager"

                <androidx.viewpager.widget.ViewPager android:id="@+id/pager"

                    android:background="?android:attr/windowBackground"

                    android:layout_width="match_parent"

                    android:layout_height="0dp"

src/android/support/wearable/view/AcceptDenyDialog.java

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

 * limitations under the License

 */

package android.support.wearable.view;

package androidx.wear.ble.view;



import android.annotation.TargetApi;

import android.app.Dialog;
@@ -21,7 +21,7 @@ import android.content.Context; 
import android.content.DialogInterface;

import android.graphics.drawable.Drawable;

import android.os.Build;

import android.support.annotation.StyleRes;

import androidx.annotation.StyleRes;

import android.view.View;

import android.widget.ImageButton;

import android.widget.ImageView;