summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Monk2018-08-16 12:43:23 -0500
committerColin Cross2018-08-31 15:50:59 -0500
commitb8fd4e05e549dad6bdea2031effd60d34dd96643 (patch)
treecf78c41eb301f7df790c9f637f97e80db5a9a87b
parentc4a202f4e8f36233d696d38a7680e8c8e0d9be63 (diff)
downloadplatform-packages-services-car-b8fd4e05e549dad6bdea2031effd60d34dd96643.tar.gz
platform-packages-services-car-b8fd4e05e549dad6bdea2031effd60d34dd96643.tar.xz
platform-packages-services-car-b8fd4e05e549dad6bdea2031effd60d34dd96643.zip
Convert sysui to bp
Test: builds gonna build, tests gonna test Change-Id: Ib31d88d0b1ce9ed61d401756d4b85f7e3ce884cd Merged-In: Ib31d88d0b1ce9ed61d401756d4b85f7e3ce884cd (cherry picked from commit 76aff98b2c3b77001c5e075ad9aa5408fb9e0963)
-rw-r--r--car_product/overlay/frameworks/base/packages/SettingsLib/res/values/dimens.xml8
-rw-r--r--service/Android.mk4
2 files changed, 4 insertions, 8 deletions
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 f295e6ca..70d19e0d 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,12 +15,8 @@
15 ~ limitations under the License 15 ~ limitations under the License
16 --> 16 -->
17<resources> 17<resources>
18 <add-resource type="dimen" name="small_text_size" />
18 <dimen name="small_text_size">24sp</dimen> 19 <dimen name="small_text_size">24sp</dimen>
20 <add-resource type="dimen" name="medium_text_size" />
19 <dimen name="medium_text_size">28sp</dimen> 21 <dimen name="medium_text_size">28sp</dimen>
20 <dimen name="drawer_icon_size">54dp</dimen>
21 <dimen name="normal_icon_size">54dp</dimen>
22 <dimen name="drawer_icon_margin">44dp</dimen>
23 <dimen name="drawer_width">600dp</dimen>
24 <dimen name="drawer_item_top_bottom_margin">8dp</dimen>
25 <dimen name="drawer_spacer_height">70dp</dimen>
26</resources> 22</resources>
diff --git a/service/Android.mk b/service/Android.mk
index 9ab7df36..e961fbb0 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -49,7 +49,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += \
49 car-systemtest \ 49 car-systemtest \
50 com.android.car.procfsinspector-client \ 50 com.android.car.procfsinspector-client \
51 51
52include frameworks/base/packages/SettingsLib/common.mk 52LOCAL_STATIC_ANDROID_LIBRARIES := SettingsLib androidx.preference_preference
53 53
54include $(BUILD_PACKAGE) 54include $(BUILD_PACKAGE)
55 55
@@ -78,7 +78,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += \
78 78
79LOCAL_MIN_SDK_VERSION := 25 79LOCAL_MIN_SDK_VERSION := 25
80 80
81include frameworks/base/packages/SettingsLib/common.mk 81LOCAL_STATIC_ANDROID_LIBRARIES := SettingsLib androidx.preference_preference
82 82
83include $(BUILD_STATIC_JAVA_LIBRARY) 83include $(BUILD_STATIC_JAVA_LIBRARY)
84 84