summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot2018-09-04 13:27:37 -0500
committerAndroid (Google) Code Review2018-09-04 13:27:37 -0500
commit1b49835632fdccc30c60d392b01d0beedcf71885 (patch)
treeee4b70b3ad0a98da05704eb6ff29604988aaa0c9
parent802a7545e4a268d516f7e6c32fea85e45fdc3ade (diff)
parentb8fd4e05e549dad6bdea2031effd60d34dd96643 (diff)
downloadplatform-packages-services-car-1b49835632fdccc30c60d392b01d0beedcf71885.tar.gz
platform-packages-services-car-1b49835632fdccc30c60d392b01d0beedcf71885.tar.xz
platform-packages-services-car-1b49835632fdccc30c60d392b01d0beedcf71885.zip
Merge "Convert sysui to bp" into pi-dev-plus-aosp
-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