diff options
| author | Jonathan Koo <jonathankoo@google.com> | 2019-05-31 22:56:58 +0000 |
|---|---|---|
| committer | Jonathan Koo <jonathankoo@google.com> | 2019-05-31 22:56:58 +0000 |
| commit | 4a138fdb18e86e5d550fde212bb8df9a6d54d2d2 (patch) | |
| tree | a80b98387d5bed8357c286707dff780b454568ed | |
| parent | 48629c95db1a2213a24363fc1597845a0bf1bab9 (diff) | |
| download | android_packages_apps_PackageInstaller-4a138fdb18e86e5d550fde212bb8df9a6d54d2d2.tar.gz android_packages_apps_PackageInstaller-4a138fdb18e86e5d550fde212bb8df9a6d54d2d2.tar.bz2 android_packages_apps_PackageInstaller-4a138fdb18e86e5d550fde212bb8df9a6d54d2d2.zip | |
Revert "DO NOT MERGE: Add PagedRecyclerView in PermissionController."
This reverts commit 48629c95db1a2213a24363fc1597845a0bf1bab9.
Reason for revert: minSdk change to 29 causes build failure elsewhere.
Change-Id: Ie6d89e5fc95e568634505d7c3e69e4c4434ed106
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | proguard.flags | 2 | ||||
| -rw-r--r-- | res/layout/car_settings_frame.xml | 10 |
4 files changed, 4 insertions, 11 deletions
@@ -44,7 +44,6 @@ android_app { static_libs: [ "iconloader", - "car-apps-common", "com.google.android.material_material", "androidx.transition_transition", "androidx-constraintlayout_constraintlayout", diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6f6716b0..2c77f523 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -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" diff --git a/proguard.flags b/proguard.flags index 1a922cbd..a2e58846 100644 --- a/proguard.flags +++ b/proguard.flags @@ -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 diff --git a/res/layout/car_settings_frame.xml b/res/layout/car_settings_frame.xml index 0fdf644c..4381d014 100644 --- a/res/layout/car_settings_frame.xml +++ b/res/layout/car_settings_frame.xml @@ -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:layout_height="match_parent" + android:paddingEnd="@*android:dimen/car_margin" + android:paddingStart="@*android:dimen/car_margin"/> </LinearLayout> |