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

Commit 4a138fdb authored by Jonathan Koo's avatar Jonathan Koo
Browse files

Revert "DO NOT MERGE: Add PagedRecyclerView in PermissionController." 

This reverts commit 48629c95.

Reason for revert: minSdk change to 29 causes build failure elsewhere. 

Change-Id: Ie6d89e5fc95e568634505d7c3e69e4c4434ed106
parent 48629c95

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ android_app { 


    static_libs: [

        "iconloader",

        "car-apps-common",

        "com.google.android.material_material",

        "androidx.transition_transition",

        "androidx-constraintlayout_constraintlayout",

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />

    <uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />



    <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />

    <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />



    <application android:name="com.android.packageinstaller.PackageInstallerApplication"

            android:label="@string/app_name"

proguard.flags

+0 −2
Original line number Diff line number Diff line
@@ -11,5 +11,3 @@ 
-keep class * implements com.android.packageinstaller.role.model.RoleBehavior {

    *;

}
 


-keep class com.android.car.apps.common.widget.CarScrollBar
 
 No newline at end of file

res/layout/car_settings_frame.xml

+3 −7
Original line number Diff line number Diff line
@@ -84,11 +84,7 @@ 
    <FrameLayout

        android:id="@android:id/list_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        <com.android.car.apps.common.widget.PagedRecyclerView

            android:id="@+id/recycler_view"

            android:layout_width="match_parent"

        android:layout_height="match_parent"

            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>

    </FrameLayout>

        android:paddingEnd="@*android:dimen/car_margin"

        android:paddingStart="@*android:dimen/car_margin"/>

</LinearLayout>