Revert "Convert sysui to bp"
Bug: 112822358
This reverts commit 76aff98b2c3b77001c5e075ad9aa5408fb9e0963.
Reason for revert: issue with overlays
Change-Id: If33a42615f9cf430eadde1589d68b3bf0bd7287a
(cherry picked from commit 614a950b7b06bd220744b25c07d3e261608ad8a8)
diff --git a/car_product/overlay/frameworks/base/packages/SettingsLib/res/values/dimens.xml b/car_product/overlay/frameworks/base/packages/SettingsLib/res/values/dimens.xml
index 70d19e0..f295e6c 100644
--- a/car_product/overlay/frameworks/base/packages/SettingsLib/res/values/dimens.xml
+++ b/car_product/overlay/frameworks/base/packages/SettingsLib/res/values/dimens.xml
@@ -15,8 +15,12 @@
~ limitations under the License
-->
<resources>
- <add-resource type="dimen" name="small_text_size" />
<dimen name="small_text_size">24sp</dimen>
- <add-resource type="dimen" name="medium_text_size" />
<dimen name="medium_text_size">28sp</dimen>
+ <dimen name="drawer_icon_size">54dp</dimen>
+ <dimen name="normal_icon_size">54dp</dimen>
+ <dimen name="drawer_icon_margin">44dp</dimen>
+ <dimen name="drawer_width">600dp</dimen>
+ <dimen name="drawer_item_top_bottom_margin">8dp</dimen>
+ <dimen name="drawer_spacer_height">70dp</dimen>
</resources>
diff --git a/service/Android.mk b/service/Android.mk
index e961fbb..9ab7df3 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -49,7 +49,7 @@
car-systemtest \
com.android.car.procfsinspector-client \
-LOCAL_STATIC_ANDROID_LIBRARIES := SettingsLib androidx.preference_preference
+include frameworks/base/packages/SettingsLib/common.mk
include $(BUILD_PACKAGE)
@@ -78,7 +78,7 @@
LOCAL_MIN_SDK_VERSION := 25
-LOCAL_STATIC_ANDROID_LIBRARIES := SettingsLib androidx.preference_preference
+include frameworks/base/packages/SettingsLib/common.mk
include $(BUILD_STATIC_JAVA_LIBRARY)
