Merge "Update design library dependencies using latest pom2mk" into pi-dev
diff --git a/current/android.jar b/current/android.jar
index a62cfa5..5409c26 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ
diff --git a/current/car/Android.mk b/current/car/Android.mk
new file mode 100644
index 0000000..421dab9
--- /dev/null
+++ b/current/car/Android.mk
@@ -0,0 +1,37 @@
+# Automatically generated with:
+# pom2mk -static-deps -sdk-version current '-rewrite=^support-media-compat$=android-support-media-compat' '-rewrite=^android.arch.persistence.room:runtime$=android-arch-room-runtime' '-rewrite=^android.arch.lifecycle:common$=android-arch-lifecycle-common' '-rewrite=^gridlayout-v7$=android-support-v7-gridlayout' '-rewrite=^androidx.dynamicanimation:dynamicanimation$=android-support-dynamic-animation' '-rewrite=^asynclayoutinflater$=android-support-asynclayoutinflater' '-rewrite=^design$=android-support-design' '-rewrite=^androidx.appcompat:appcompat$=android-support-v7-appcompat' '-rewrite=^support-v13$=android-support-v13' '-rewrite=^androidx.annotation:annotation$=android-support-annotations' '-rewrite=^design-color$=android-support-design-color' '-rewrite=^androidx.vectordrawable:vectordrawable$=android-support-vectordrawable' '-rewrite=^design-bottomappbar$=android-support-design-bottomappbar' '-rewrite=^collections$=android-support-collections' '-rewrite=^android.arch.lifecycle:extensions$=android-arch-lifecycle-extensions' '-rewrite=^wear$=android-support-wear' '-rewrite=^localbroadcastmanager$=android-support-localbroadcastmanager' '-rewrite=^androidx.fragment:fragment$=android-support-fragment' '-rewrite=^design-navigation$=android-support-design-navigation' '-rewrite=^preference-v7$=android-support-v7-preference' '-rewrite=^android.arch.persistence:db-framework$=android-arch-persistence-db-framework' '-rewrite=^constraint-layout-solver$=android-support-constraint-layout-solver' '-rewrite=^androidx.legacy:legacy-support-core-ui$=android-support-core-ui' '-rewrite=^design-theme$=android-support-design-theme' '-rewrite=^design-circularreveal$=android-support-design-circularreveal' '-rewrite=^viewpager$=android-support-viewpager' '-rewrite=^design-drawable$=android-support-design-drawable' '-rewrite=^support-core-utils$=android-support-core-utils' '-rewrite=^support-compat$=android-support-compat' '-rewrite=^recyclerview-v7$=android-support-v7-recyclerview' '-rewrite=^design-ripple$=android-support-design-ripple' '-rewrite=^design-circularreveal-coordinatorlayout$=android-support-design-circularreveal-coordinatorlayout' '-rewrite=^androidx.collection:collection$=android-support-collections' '-rewrite=^androidx.cardview:cardview$=android-support-v7-cardview' '-rewrite=^textclassifier$=android-support-textclassifier' '-rewrite=^percent$=android-support-percent' '-rewrite=^android.arch.core:testing$=android-arch-core-testing' '-rewrite=^androidx.core:core$=android-support-compat' '-rewrite=^design-dialog$=android-support-design-dialog' '-rewrite=^androidx.emoji:emoji-appcompat$=android-support-emoji-appcompat' '-rewrite=^documentfile$=android-support-documentfile' '-rewrite=^androidx.percentlayout:percentlayout$=android-support-percent' '-rewrite=^design-canvas$=android-support-design-canvas' '-rewrite=^recommendation$=android-support-recommendation' '-rewrite=^design-snackbar$=android-support-design-snackbar' '-rewrite=^androidx.gridlayout:gridlayout$=android-support-v7-gridlayout' '-rewrite=^leanback-v17$=android-support-v17-leanback' '-rewrite=^androidx.leanback:leanback-preference$=android-support-v17-preference-leanback' '-rewrite=^android.arch.paging:common$=android-arch-paging-common' '-rewrite=^multidex$=android-support-multidex' '-rewrite=^androidx.leanback:leanback$=android-support-v17-leanback' '-rewrite=^support-content$=android-support-support-content' '-rewrite=^palette-v7$=android-support-v7-palette' '-rewrite=^com.google.android:flexbox$=flexbox' '-rewrite=^design-expandable$=android-support-design-expandable' '-rewrite=^mediarouter-v7$=android-support-v7-mediarouter' '-rewrite=^slidingpanelayout$=android-support-slidingpanelayout' '-rewrite=^slices-view$=android-slices-view' '-rewrite=^recyclerview-selection$=android-support-recyclerview-selection' '-rewrite=^heifwriter$=android-support-heifwriter' '-rewrite=^support-dynamic-animation$=android-support-dynamic-animation' '-rewrite=^support-emoji-bundled$=android-support-emoji-bundled' '-rewrite=^android.arch.lifecycle:livedata-core$=android-arch-lifecycle-livedata-core' '-rewrite=^android.arch.persistence:db$=android-arch-persistence-db' '-rewrite=^androidx.legacy:legacy-support-core-utils$=android-support-core-utils' '-rewrite=^design-circularreveal-cardview$=android-support-design-circularreveal-cardview' '-rewrite=^support-tv-provider$=android-support-tv-provider' '-rewrite=^loader$=android-support-loader' '-rewrite=^support-annotations$=android-support-annotations' '-rewrite=^design-tabs$=android-support-design-tabs' '-rewrite=^design-stateful$=android-support-design-stateful' '-rewrite=^android.arch.core:runtime$=android-arch-core-runtime' '-rewrite=^design-transformation$=android-support-design-transformation' '-rewrite=^androidx.emoji:emoji$=android-support-emoji' '-rewrite=^transition$=android-support-transition' '-rewrite=^multidex-instrumentation$=android-support-multidex-instrumentation' '-rewrite=^android.arch.persistence.room:common$=android-arch-room-common' '-rewrite=^design-animation$=android-support-design-animation' '-rewrite=^car$=android-support-car' '-rewrite=^android.arch.lifecycle:common-java8$=android-arch-lifecycle-common-java8' '-rewrite=^preference-leanback-v17$=android-support-v17-preference-leanback' '-rewrite=^slices-core$=android-slices-core' '-rewrite=^constraint-layout$=android-support-constraint-layout' '-rewrite=^androidx.legacy:legacy-preference-v14$=android-support-v14-preference' '-rewrite=^android.arch.lifecycle:runtime$=android-arch-lifecycle-runtime' '-rewrite=^design-textfield$=android-support-design-textfield' '-rewrite=^design-floatingactionbutton$=android-support-design-floatingactionbutton' '-rewrite=^cursoradapter$=android-support-cursoradapter' '-rewrite=^android.arch.lifecycle:viewmodel$=android-arch-lifecycle-viewmodel' '-rewrite=^support-emoji-appcompat$=android-support-emoji-appcompat' '-rewrite=^androidx.tvprovider:tvprovider$=android-support-tv-provider' '-rewrite=^design-button$=android-support-design-button' '-rewrite=^customtabs$=android-support-customtabs' '-rewrite=^contentpaging$=android-support-contentpaging' '-rewrite=^print$=android-support-print' '-rewrite=^coordinatorlayout$=android-support-coordinatorlayout' '-rewrite=^design-card$=android-support-design-card' '-rewrite=^design-shape$=android-support-design-shape' '-rewrite=^android.arch.persistence.room:migration$=android-arch-room-migration' '-rewrite=^androidx.browser:browser$=android-support-customtabs' '-rewrite=^customview$=android-support-customview' '-rewrite=^interpolator$=android-support-interpolator' '-rewrite=^androidx.legacy:legacy-support-v4$=android-support-v4' '-rewrite=^androidx.recyclerview:recyclerview$=android-support-v7-recyclerview' '-rewrite=^android.arch.persistence.room:testing$=android-arch-room-testing' '-rewrite=^exifinterface$=android-support-exifinterface' '-rewrite=^androidx.vectordrawable:vectordrawable-animated$=android-support-animatedvectordrawable' '-rewrite=^android.arch.core:common$=android-arch-core-common' '-rewrite=^androidx.legacy:legacy-support-v13$=android-support-v13' '-rewrite=^cardview-v7$=android-support-v7-cardview' '-rewrite=^swiperefreshlayout$=android-support-swiperefreshlayout' '-rewrite=^android.arch.lifecycle:livedata$=android-arch-lifecycle-livedata' '-rewrite=^design-internal$=android-support-design-internal' '-rewrite=^design-chip$=android-support-design-chip' '-rewrite=^design-math$=android-support-design-math' '-rewrite=^androidx.preference:preference$=android-support-v7-preference' '-rewrite=^drawerlayout$=android-support-drawerlayout' '-rewrite=^design-bottomsheet$=android-support-design-bottomsheet' '-rewrite=^animated-vector-drawable$=android-support-animatedvectordrawable' '-rewrite=^androidx.media:media$=android-support-media-compat' '-rewrite=^support-v4$=android-support-v4' '-rewrite=^design-widget$=android-support-design-widget' '-rewrite=^support-core-ui$=android-support-core-ui' '-rewrite=^androidx.palette:palette$=android-support-v7-palette' '-rewrite=^android.arch.paging:runtime$=android-arch-paging-runtime' '-rewrite=^androidx.emoji:emoji-bundled$=android-support-emoji-bundled' '-rewrite=^appcompat-v7$=android-support-v7-appcompat' '-rewrite=^design-typography$=android-support-design-typography' '-rewrite=^design-resources$=android-support-design-resources' '-rewrite=^webkit$=android-support-webkit' '-rewrite=^support-vector-drawable$=android-support-vectordrawable' '-rewrite=^design-bottomnavigation$=android-support-design-bottomnavigation' '-rewrite=^slices-builders$=android-slices-builders' '-rewrite=^support-emoji$=android-support-emoji' '-rewrite=^androidx.mediarouter:mediarouter$=android-support-v7-mediarouter' '-rewrite=^support-fragment$=android-support-fragment' '-rewrite=^preference-v14$=android-support-v14-preference' .
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android-support-car-nodeps
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_SRC_FILES := m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.aar
+LOCAL_BUILT_MODULE_STEM := javalib.jar
+LOCAL_MODULE_SUFFIX := .aar
+LOCAL_USE_AAPT2 := true
+LOCAL_SDK_VERSION := current
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ android-support-v7-appcompat \
+ android-support-v7-cardview \
+ android-support-design-widget \
+ android-support-v4 \
+ android-support-v7-recyclerview
+include $(BUILD_PREBUILT)
+include $(CLEAR_VARS)
+LOCAL_MODULE := android-support-car
+LOCAL_SDK_VERSION := current
+LOCAL_MANIFEST_FILE := manifests/android-support-car/AndroidManifest.xml
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android-support-annotations
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ android-support-car-nodeps \
+ android-support-v7-appcompat \
+ android-support-v7-cardview \
+ android-support-design-widget \
+ android-support-v4 \
+ android-support-v7-recyclerview
+LOCAL_JAR_EXCLUDE_FILES := none
+LOCAL_JAVA_LANGUAGE_VERSION := 1.7
+LOCAL_USE_AAPT2 := true
+include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/current/support/car/res/anim/fade_in_trans_left.xml b/current/car/car/res/anim/fade_in_trans_left.xml
similarity index 100%
rename from current/support/car/res/anim/fade_in_trans_left.xml
rename to current/car/car/res/anim/fade_in_trans_left.xml
diff --git a/current/support/car/res/anim/fade_in_trans_left_layout_anim.xml b/current/car/car/res/anim/fade_in_trans_left_layout_anim.xml
similarity index 100%
rename from current/support/car/res/anim/fade_in_trans_left_layout_anim.xml
rename to current/car/car/res/anim/fade_in_trans_left_layout_anim.xml
diff --git a/current/support/car/res/anim/fade_in_trans_right.xml b/current/car/car/res/anim/fade_in_trans_right.xml
similarity index 100%
rename from current/support/car/res/anim/fade_in_trans_right.xml
rename to current/car/car/res/anim/fade_in_trans_right.xml
diff --git a/current/support/car/res/anim/fade_in_trans_right_layout_anim.xml b/current/car/car/res/anim/fade_in_trans_right_layout_anim.xml
similarity index 100%
rename from current/support/car/res/anim/fade_in_trans_right_layout_anim.xml
rename to current/car/car/res/anim/fade_in_trans_right_layout_anim.xml
diff --git a/current/support/car/res/anim/lock_out_message_bar.xml b/current/car/car/res/anim/lock_out_message_bar.xml
similarity index 100%
rename from current/support/car/res/anim/lock_out_message_bar.xml
rename to current/car/car/res/anim/lock_out_message_bar.xml
diff --git a/current/support/car/res/anim/lock_out_message_bg_color_change.xml b/current/car/car/res/anim/lock_out_message_bg_color_change.xml
similarity index 100%
rename from current/support/car/res/anim/lock_out_message_bg_color_change.xml
rename to current/car/car/res/anim/lock_out_message_bg_color_change.xml
diff --git a/current/support/car/res/anim/lock_out_message_in.xml b/current/car/car/res/anim/lock_out_message_in.xml
similarity index 100%
rename from current/support/car/res/anim/lock_out_message_in.xml
rename to current/car/car/res/anim/lock_out_message_in.xml
diff --git a/current/support/car/res/anim/lock_out_message_out.xml b/current/car/car/res/anim/lock_out_message_out.xml
similarity index 100%
rename from current/support/car/res/anim/lock_out_message_out.xml
rename to current/car/car/res/anim/lock_out_message_out.xml
diff --git a/current/support/car/res/drawable/car_action_button_activated_ring_foreground.xml b/current/car/car/res/drawable/car_action_button_activated_ring_foreground.xml
similarity index 100%
rename from current/support/car/res/drawable/car_action_button_activated_ring_foreground.xml
rename to current/car/car/res/drawable/car_action_button_activated_ring_foreground.xml
diff --git a/current/support/car/res/drawable/car_action_button_background.xml b/current/car/car/res/drawable/car_action_button_background.xml
similarity index 100%
rename from current/support/car/res/drawable/car_action_button_background.xml
rename to current/car/car/res/drawable/car_action_button_background.xml
diff --git a/current/support/car/res/drawable/car_borderless_button_text_color.xml b/current/car/car/res/drawable/car_borderless_button_text_color.xml
similarity index 100%
rename from current/support/car/res/drawable/car_borderless_button_text_color.xml
rename to current/car/car/res/drawable/car_borderless_button_text_color.xml
diff --git a/current/support/car/res/drawable/car_button_background.xml b/current/car/car/res/drawable/car_button_background.xml
similarity index 100%
rename from current/support/car/res/drawable/car_button_background.xml
rename to current/car/car/res/drawable/car_button_background.xml
diff --git a/current/support/car/res/drawable/car_button_ripple_background.xml b/current/car/car/res/drawable/car_button_ripple_background.xml
similarity index 100%
rename from current/support/car/res/drawable/car_button_ripple_background.xml
rename to current/car/car/res/drawable/car_button_ripple_background.xml
diff --git a/current/support/car/res/drawable/car_button_ripple_background_day.xml b/current/car/car/res/drawable/car_button_ripple_background_day.xml
similarity index 100%
rename from current/support/car/res/drawable/car_button_ripple_background_day.xml
rename to current/car/car/res/drawable/car_button_ripple_background_day.xml
diff --git a/current/support/car/res/drawable/car_button_ripple_background_inverse.xml b/current/car/car/res/drawable/car_button_ripple_background_inverse.xml
similarity index 100%
rename from current/support/car/res/drawable/car_button_ripple_background_inverse.xml
rename to current/car/car/res/drawable/car_button_ripple_background_inverse.xml
diff --git a/current/support/car/res/drawable/car_button_ripple_background_night.xml b/current/car/car/res/drawable/car_button_ripple_background_night.xml
similarity index 100%
rename from current/support/car/res/drawable/car_button_ripple_background_night.xml
rename to current/car/car/res/drawable/car_button_ripple_background_night.xml
diff --git a/current/support/car/res/drawable/car_button_text_color.xml b/current/car/car/res/drawable/car_button_text_color.xml
similarity index 100%
rename from current/support/car/res/drawable/car_button_text_color.xml
rename to current/car/car/res/drawable/car_button_text_color.xml
diff --git a/current/support/car/res/drawable/car_card_background.xml b/current/car/car/res/drawable/car_card_background.xml
similarity index 100%
rename from current/support/car/res/drawable/car_card_background.xml
rename to current/car/car/res/drawable/car_card_background.xml
diff --git a/current/support/car/res/drawable/car_card_ripple_background.xml b/current/car/car/res/drawable/car_card_ripple_background.xml
similarity index 100%
rename from current/support/car/res/drawable/car_card_ripple_background.xml
rename to current/car/car/res/drawable/car_card_ripple_background.xml
diff --git a/current/support/car/res/drawable/car_card_ripple_background_day.xml b/current/car/car/res/drawable/car_card_ripple_background_day.xml
similarity index 100%
rename from current/support/car/res/drawable/car_card_ripple_background_day.xml
rename to current/car/car/res/drawable/car_card_ripple_background_day.xml
diff --git a/current/support/car/res/drawable/car_card_ripple_background_inverse.xml b/current/car/car/res/drawable/car_card_ripple_background_inverse.xml
similarity index 100%
rename from current/support/car/res/drawable/car_card_ripple_background_inverse.xml
rename to current/car/car/res/drawable/car_card_ripple_background_inverse.xml
diff --git a/current/support/car/res/drawable/car_card_ripple_background_night.xml b/current/car/car/res/drawable/car_card_ripple_background_night.xml
similarity index 100%
rename from current/support/car/res/drawable/car_card_ripple_background_night.xml
rename to current/car/car/res/drawable/car_card_ripple_background_night.xml
diff --git a/current/support/car/res/drawable/car_card_rounded_background.xml b/current/car/car/res/drawable/car_card_rounded_background.xml
similarity index 100%
rename from current/support/car/res/drawable/car_card_rounded_background.xml
rename to current/car/car/res/drawable/car_card_rounded_background.xml
diff --git a/current/support/car/res/drawable/car_card_rounded_bottom_background.xml b/current/car/car/res/drawable/car_card_rounded_bottom_background.xml
similarity index 100%
rename from current/support/car/res/drawable/car_card_rounded_bottom_background.xml
rename to current/car/car/res/drawable/car_card_rounded_bottom_background.xml
diff --git a/current/support/car/res/drawable/car_card_rounded_top_background.xml b/current/car/car/res/drawable/car_card_rounded_top_background.xml
similarity index 100%
rename from current/support/car/res/drawable/car_card_rounded_top_background.xml
rename to current/car/car/res/drawable/car_card_rounded_top_background.xml
diff --git a/current/support/car/res/drawable/car_drawer_list_item_background.xml b/current/car/car/res/drawable/car_drawer_list_item_background.xml
similarity index 100%
rename from current/support/car/res/drawable/car_drawer_list_item_background.xml
rename to current/car/car/res/drawable/car_drawer_list_item_background.xml
diff --git a/current/support/car/res/drawable/car_list_divider.xml b/current/car/car/res/drawable/car_list_divider.xml
similarity index 100%
rename from current/support/car/res/drawable/car_list_divider.xml
rename to current/car/car/res/drawable/car_list_divider.xml
diff --git a/current/support/car/res/drawable/car_list_divider_dark.xml b/current/car/car/res/drawable/car_list_divider_dark.xml
similarity index 100%
rename from current/support/car/res/drawable/car_list_divider_dark.xml
rename to current/car/car/res/drawable/car_list_divider_dark.xml
diff --git a/current/support/car/res/drawable/car_list_divider_light.xml b/current/car/car/res/drawable/car_list_divider_light.xml
similarity index 100%
rename from current/support/car/res/drawable/car_list_divider_light.xml
rename to current/car/car/res/drawable/car_list_divider_light.xml
diff --git a/current/support/car/res/drawable/car_scrollbar_thumb.xml b/current/car/car/res/drawable/car_scrollbar_thumb.xml
similarity index 100%
rename from current/support/car/res/drawable/car_scrollbar_thumb.xml
rename to current/car/car/res/drawable/car_scrollbar_thumb.xml
diff --git a/current/support/car/res/drawable/car_seekbar_thumb.xml b/current/car/car/res/drawable/car_seekbar_thumb.xml
similarity index 100%
rename from current/support/car/res/drawable/car_seekbar_thumb.xml
rename to current/car/car/res/drawable/car_seekbar_thumb.xml
diff --git a/current/support/car/res/drawable/car_seekbar_track.xml b/current/car/car/res/drawable/car_seekbar_track.xml
similarity index 100%
rename from current/support/car/res/drawable/car_seekbar_track.xml
rename to current/car/car/res/drawable/car_seekbar_track.xml
diff --git a/current/support/car/res/drawable/ic_down.xml b/current/car/car/res/drawable/ic_down.xml
similarity index 100%
rename from current/support/car/res/drawable/ic_down.xml
rename to current/car/car/res/drawable/ic_down.xml
diff --git a/current/support/car/res/drawable/ic_list_view_disable.xml b/current/car/car/res/drawable/ic_list_view_disable.xml
similarity index 100%
rename from current/support/car/res/drawable/ic_list_view_disable.xml
rename to current/car/car/res/drawable/ic_list_view_disable.xml
diff --git a/current/support/car/res/drawable/ic_overflow.xml b/current/car/car/res/drawable/ic_overflow.xml
similarity index 100%
rename from current/support/car/res/drawable/ic_overflow.xml
rename to current/car/car/res/drawable/ic_overflow.xml
diff --git a/current/support/car/res/drawable/ic_up.xml b/current/car/car/res/drawable/ic_up.xml
similarity index 100%
rename from current/support/car/res/drawable/ic_up.xml
rename to current/car/car/res/drawable/ic_up.xml
diff --git a/current/support/car/res/drawable/lock_out_message_animation.xml b/current/car/car/res/drawable/lock_out_message_animation.xml
similarity index 100%
rename from current/support/car/res/drawable/lock_out_message_animation.xml
rename to current/car/car/res/drawable/lock_out_message_animation.xml
diff --git a/current/support/car/res/drawable/lock_out_message_background.xml b/current/car/car/res/drawable/lock_out_message_background.xml
similarity index 100%
rename from current/support/car/res/drawable/lock_out_message_background.xml
rename to current/car/car/res/drawable/lock_out_message_background.xml
diff --git a/current/support/car/res/drawable/speed_bump_scrim.xml b/current/car/car/res/drawable/speed_bump_scrim.xml
similarity index 100%
rename from current/support/car/res/drawable/speed_bump_scrim.xml
rename to current/car/car/res/drawable/speed_bump_scrim.xml
diff --git a/current/support/car/res/interpolator/speed_bump_interpolator.xml b/current/car/car/res/interpolator/speed_bump_interpolator.xml
similarity index 100%
rename from current/support/car/res/interpolator/speed_bump_interpolator.xml
rename to current/car/car/res/interpolator/speed_bump_interpolator.xml
diff --git a/current/support/car/res/layout/action_bar.xml b/current/car/car/res/layout/action_bar.xml
similarity index 100%
rename from current/support/car/res/layout/action_bar.xml
rename to current/car/car/res/layout/action_bar.xml
diff --git a/current/support/car/res/layout/action_bar_button.xml b/current/car/car/res/layout/action_bar_button.xml
similarity index 100%
rename from current/support/car/res/layout/action_bar_button.xml
rename to current/car/car/res/layout/action_bar_button.xml
diff --git a/current/support/car/res/layout/action_bar_slot.xml b/current/car/car/res/layout/action_bar_slot.xml
similarity index 100%
rename from current/support/car/res/layout/action_bar_slot.xml
rename to current/car/car/res/layout/action_bar_slot.xml
diff --git a/current/support/car/res/layout/car_alert_dialog.xml b/current/car/car/res/layout/car_alert_dialog.xml
similarity index 100%
rename from current/support/car/res/layout/car_alert_dialog.xml
rename to current/car/car/res/layout/car_alert_dialog.xml
diff --git a/current/support/car/res/layout/car_drawer.xml b/current/car/car/res/layout/car_drawer.xml
similarity index 100%
rename from current/support/car/res/layout/car_drawer.xml
rename to current/car/car/res/layout/car_drawer.xml
diff --git a/current/support/car/res/layout/car_drawer_activity.xml b/current/car/car/res/layout/car_drawer_activity.xml
similarity index 100%
rename from current/support/car/res/layout/car_drawer_activity.xml
rename to current/car/car/res/layout/car_drawer_activity.xml
diff --git a/current/support/car/res/layout/car_drawer_list_item_empty.xml b/current/car/car/res/layout/car_drawer_list_item_empty.xml
similarity index 100%
rename from current/support/car/res/layout/car_drawer_list_item_empty.xml
rename to current/car/car/res/layout/car_drawer_list_item_empty.xml
diff --git a/current/support/car/res/layout/car_drawer_list_item_normal.xml b/current/car/car/res/layout/car_drawer_list_item_normal.xml
similarity index 100%
rename from current/support/car/res/layout/car_drawer_list_item_normal.xml
rename to current/car/car/res/layout/car_drawer_list_item_normal.xml
diff --git a/current/support/car/res/layout/car_drawer_list_item_small.xml b/current/car/car/res/layout/car_drawer_list_item_small.xml
similarity index 100%
rename from current/support/car/res/layout/car_drawer_list_item_small.xml
rename to current/car/car/res/layout/car_drawer_list_item_small.xml
diff --git a/current/support/car/res/layout/car_list_dialog.xml b/current/car/car/res/layout/car_list_dialog.xml
similarity index 100%
rename from current/support/car/res/layout/car_list_dialog.xml
rename to current/car/car/res/layout/car_list_dialog.xml
diff --git a/current/support/car/res/layout/car_list_item_seekbar_content.xml b/current/car/car/res/layout/car_list_item_seekbar_content.xml
similarity index 100%
rename from current/support/car/res/layout/car_list_item_seekbar_content.xml
rename to current/car/car/res/layout/car_list_item_seekbar_content.xml
diff --git a/current/support/car/res/layout/car_list_item_text_content.xml b/current/car/car/res/layout/car_list_item_text_content.xml
similarity index 100%
rename from current/support/car/res/layout/car_list_item_text_content.xml
rename to current/car/car/res/layout/car_list_item_text_content.xml
diff --git a/current/support/car/res/layout/car_paged_recycler_view.xml b/current/car/car/res/layout/car_paged_recycler_view.xml
similarity index 100%
rename from current/support/car/res/layout/car_paged_recycler_view.xml
rename to current/car/car/res/layout/car_paged_recycler_view.xml
diff --git a/current/support/car/res/layout/car_paged_scrollbar_buttons.xml b/current/car/car/res/layout/car_paged_scrollbar_buttons.xml
similarity index 100%
rename from current/support/car/res/layout/car_paged_scrollbar_buttons.xml
rename to current/car/car/res/layout/car_paged_scrollbar_buttons.xml
diff --git a/current/support/car/res/layout/car_toolbar.xml b/current/car/car/res/layout/car_toolbar.xml
similarity index 100%
rename from current/support/car/res/layout/car_toolbar.xml
rename to current/car/car/res/layout/car_toolbar.xml
diff --git a/current/support/car/res/layout/lock_out_message.xml b/current/car/car/res/layout/lock_out_message.xml
similarity index 100%
rename from current/support/car/res/layout/lock_out_message.xml
rename to current/car/car/res/layout/lock_out_message.xml
diff --git a/current/support/car/res/values-af/values-af.xml b/current/car/car/res/values-af/values-af.xml
similarity index 100%
rename from current/support/car/res/values-af/values-af.xml
rename to current/car/car/res/values-af/values-af.xml
diff --git a/current/support/car/res/values-am/values-am.xml b/current/car/car/res/values-am/values-am.xml
similarity index 100%
rename from current/support/car/res/values-am/values-am.xml
rename to current/car/car/res/values-am/values-am.xml
diff --git a/current/support/car/res/values-ar/values-ar.xml b/current/car/car/res/values-ar/values-ar.xml
similarity index 100%
rename from current/support/car/res/values-ar/values-ar.xml
rename to current/car/car/res/values-ar/values-ar.xml
diff --git a/current/support/car/res/values-az/values-az.xml b/current/car/car/res/values-az/values-az.xml
similarity index 100%
rename from current/support/car/res/values-az/values-az.xml
rename to current/car/car/res/values-az/values-az.xml
diff --git a/current/support/car/res/values-b+sr+Latn/values-b+sr+Latn.xml b/current/car/car/res/values-b+sr+Latn/values-b+sr+Latn.xml
similarity index 100%
rename from current/support/car/res/values-b+sr+Latn/values-b+sr+Latn.xml
rename to current/car/car/res/values-b+sr+Latn/values-b+sr+Latn.xml
diff --git a/current/support/car/res/values-be/values-be.xml b/current/car/car/res/values-be/values-be.xml
similarity index 100%
rename from current/support/car/res/values-be/values-be.xml
rename to current/car/car/res/values-be/values-be.xml
diff --git a/current/support/car/res/values-bg/values-bg.xml b/current/car/car/res/values-bg/values-bg.xml
similarity index 100%
rename from current/support/car/res/values-bg/values-bg.xml
rename to current/car/car/res/values-bg/values-bg.xml
diff --git a/current/support/car/res/values-bn/values-bn.xml b/current/car/car/res/values-bn/values-bn.xml
similarity index 100%
rename from current/support/car/res/values-bn/values-bn.xml
rename to current/car/car/res/values-bn/values-bn.xml
diff --git a/current/support/car/res/values-bs/values-bs.xml b/current/car/car/res/values-bs/values-bs.xml
similarity index 100%
rename from current/support/car/res/values-bs/values-bs.xml
rename to current/car/car/res/values-bs/values-bs.xml
diff --git a/current/support/car/res/values-ca/values-ca.xml b/current/car/car/res/values-ca/values-ca.xml
similarity index 100%
rename from current/support/car/res/values-ca/values-ca.xml
rename to current/car/car/res/values-ca/values-ca.xml
diff --git a/current/support/car/res/values-cs/values-cs.xml b/current/car/car/res/values-cs/values-cs.xml
similarity index 100%
rename from current/support/car/res/values-cs/values-cs.xml
rename to current/car/car/res/values-cs/values-cs.xml
diff --git a/current/support/car/res/values-da/values-da.xml b/current/car/car/res/values-da/values-da.xml
similarity index 100%
rename from current/support/car/res/values-da/values-da.xml
rename to current/car/car/res/values-da/values-da.xml
diff --git a/current/support/car/res/values-de/values-de.xml b/current/car/car/res/values-de/values-de.xml
similarity index 100%
rename from current/support/car/res/values-de/values-de.xml
rename to current/car/car/res/values-de/values-de.xml
diff --git a/current/support/car/res/values-el/values-el.xml b/current/car/car/res/values-el/values-el.xml
similarity index 100%
rename from current/support/car/res/values-el/values-el.xml
rename to current/car/car/res/values-el/values-el.xml
diff --git a/current/support/car/res/values-en-rAU/values-en-rAU.xml b/current/car/car/res/values-en-rAU/values-en-rAU.xml
similarity index 100%
rename from current/support/car/res/values-en-rAU/values-en-rAU.xml
rename to current/car/car/res/values-en-rAU/values-en-rAU.xml
diff --git a/current/support/car/res/values-en-rCA/values-en-rCA.xml b/current/car/car/res/values-en-rCA/values-en-rCA.xml
similarity index 100%
rename from current/support/car/res/values-en-rCA/values-en-rCA.xml
rename to current/car/car/res/values-en-rCA/values-en-rCA.xml
diff --git a/current/support/car/res/values-en-rGB/values-en-rGB.xml b/current/car/car/res/values-en-rGB/values-en-rGB.xml
similarity index 100%
rename from current/support/car/res/values-en-rGB/values-en-rGB.xml
rename to current/car/car/res/values-en-rGB/values-en-rGB.xml
diff --git a/current/support/car/res/values-en-rIN/values-en-rIN.xml b/current/car/car/res/values-en-rIN/values-en-rIN.xml
similarity index 100%
rename from current/support/car/res/values-en-rIN/values-en-rIN.xml
rename to current/car/car/res/values-en-rIN/values-en-rIN.xml
diff --git a/current/support/car/res/values-en-rXC/values-en-rXC.xml b/current/car/car/res/values-en-rXC/values-en-rXC.xml
similarity index 100%
rename from current/support/car/res/values-en-rXC/values-en-rXC.xml
rename to current/car/car/res/values-en-rXC/values-en-rXC.xml
diff --git a/current/support/car/res/values-es-rUS/values-es-rUS.xml b/current/car/car/res/values-es-rUS/values-es-rUS.xml
similarity index 100%
rename from current/support/car/res/values-es-rUS/values-es-rUS.xml
rename to current/car/car/res/values-es-rUS/values-es-rUS.xml
diff --git a/current/support/car/res/values-es/values-es.xml b/current/car/car/res/values-es/values-es.xml
similarity index 100%
rename from current/support/car/res/values-es/values-es.xml
rename to current/car/car/res/values-es/values-es.xml
diff --git a/current/support/car/res/values-et/values-et.xml b/current/car/car/res/values-et/values-et.xml
similarity index 100%
rename from current/support/car/res/values-et/values-et.xml
rename to current/car/car/res/values-et/values-et.xml
diff --git a/current/support/car/res/values-eu/values-eu.xml b/current/car/car/res/values-eu/values-eu.xml
similarity index 100%
rename from current/support/car/res/values-eu/values-eu.xml
rename to current/car/car/res/values-eu/values-eu.xml
diff --git a/current/support/car/res/values-fa/values-fa.xml b/current/car/car/res/values-fa/values-fa.xml
similarity index 100%
rename from current/support/car/res/values-fa/values-fa.xml
rename to current/car/car/res/values-fa/values-fa.xml
diff --git a/current/support/car/res/values-fi/values-fi.xml b/current/car/car/res/values-fi/values-fi.xml
similarity index 100%
rename from current/support/car/res/values-fi/values-fi.xml
rename to current/car/car/res/values-fi/values-fi.xml
diff --git a/current/support/car/res/values-fr-rCA/values-fr-rCA.xml b/current/car/car/res/values-fr-rCA/values-fr-rCA.xml
similarity index 100%
rename from current/support/car/res/values-fr-rCA/values-fr-rCA.xml
rename to current/car/car/res/values-fr-rCA/values-fr-rCA.xml
diff --git a/current/support/car/res/values-fr/values-fr.xml b/current/car/car/res/values-fr/values-fr.xml
similarity index 100%
rename from current/support/car/res/values-fr/values-fr.xml
rename to current/car/car/res/values-fr/values-fr.xml
diff --git a/current/support/car/res/values-gl/values-gl.xml b/current/car/car/res/values-gl/values-gl.xml
similarity index 100%
rename from current/support/car/res/values-gl/values-gl.xml
rename to current/car/car/res/values-gl/values-gl.xml
diff --git a/current/support/car/res/values-gu/values-gu.xml b/current/car/car/res/values-gu/values-gu.xml
similarity index 100%
rename from current/support/car/res/values-gu/values-gu.xml
rename to current/car/car/res/values-gu/values-gu.xml
diff --git a/current/support/car/res/values-h1752dp-v13/values-h1752dp-v13.xml b/current/car/car/res/values-h1752dp-v13/values-h1752dp-v13.xml
similarity index 100%
rename from current/support/car/res/values-h1752dp-v13/values-h1752dp-v13.xml
rename to current/car/car/res/values-h1752dp-v13/values-h1752dp-v13.xml
diff --git a/current/support/car/res/values-h668dp-v13/values-h668dp-v13.xml b/current/car/car/res/values-h668dp-v13/values-h668dp-v13.xml
similarity index 100%
rename from current/support/car/res/values-h668dp-v13/values-h668dp-v13.xml
rename to current/car/car/res/values-h668dp-v13/values-h668dp-v13.xml
diff --git a/current/support/car/res/values-hi/values-hi.xml b/current/car/car/res/values-hi/values-hi.xml
similarity index 100%
rename from current/support/car/res/values-hi/values-hi.xml
rename to current/car/car/res/values-hi/values-hi.xml
diff --git a/current/support/car/res/values-hr/values-hr.xml b/current/car/car/res/values-hr/values-hr.xml
similarity index 100%
rename from current/support/car/res/values-hr/values-hr.xml
rename to current/car/car/res/values-hr/values-hr.xml
diff --git a/current/support/car/res/values-hu/values-hu.xml b/current/car/car/res/values-hu/values-hu.xml
similarity index 100%
rename from current/support/car/res/values-hu/values-hu.xml
rename to current/car/car/res/values-hu/values-hu.xml
diff --git a/current/support/car/res/values-hy/values-hy.xml b/current/car/car/res/values-hy/values-hy.xml
similarity index 100%
rename from current/support/car/res/values-hy/values-hy.xml
rename to current/car/car/res/values-hy/values-hy.xml
diff --git a/current/support/car/res/values-in/values-in.xml b/current/car/car/res/values-in/values-in.xml
similarity index 100%
rename from current/support/car/res/values-in/values-in.xml
rename to current/car/car/res/values-in/values-in.xml
diff --git a/current/support/car/res/values-is/values-is.xml b/current/car/car/res/values-is/values-is.xml
similarity index 100%
rename from current/support/car/res/values-is/values-is.xml
rename to current/car/car/res/values-is/values-is.xml
diff --git a/current/support/car/res/values-it/values-it.xml b/current/car/car/res/values-it/values-it.xml
similarity index 100%
rename from current/support/car/res/values-it/values-it.xml
rename to current/car/car/res/values-it/values-it.xml
diff --git a/current/support/car/res/values-iw/values-iw.xml b/current/car/car/res/values-iw/values-iw.xml
similarity index 100%
rename from current/support/car/res/values-iw/values-iw.xml
rename to current/car/car/res/values-iw/values-iw.xml
diff --git a/current/support/car/res/values-ja/values-ja.xml b/current/car/car/res/values-ja/values-ja.xml
similarity index 100%
rename from current/support/car/res/values-ja/values-ja.xml
rename to current/car/car/res/values-ja/values-ja.xml
diff --git a/current/support/car/res/values-ka/values-ka.xml b/current/car/car/res/values-ka/values-ka.xml
similarity index 100%
rename from current/support/car/res/values-ka/values-ka.xml
rename to current/car/car/res/values-ka/values-ka.xml
diff --git a/current/support/car/res/values-kk/values-kk.xml b/current/car/car/res/values-kk/values-kk.xml
similarity index 100%
rename from current/support/car/res/values-kk/values-kk.xml
rename to current/car/car/res/values-kk/values-kk.xml
diff --git a/current/support/car/res/values-km/values-km.xml b/current/car/car/res/values-km/values-km.xml
similarity index 100%
rename from current/support/car/res/values-km/values-km.xml
rename to current/car/car/res/values-km/values-km.xml
diff --git a/current/support/car/res/values-kn/values-kn.xml b/current/car/car/res/values-kn/values-kn.xml
similarity index 100%
rename from current/support/car/res/values-kn/values-kn.xml
rename to current/car/car/res/values-kn/values-kn.xml
diff --git a/current/support/car/res/values-ko/values-ko.xml b/current/car/car/res/values-ko/values-ko.xml
similarity index 100%
rename from current/support/car/res/values-ko/values-ko.xml
rename to current/car/car/res/values-ko/values-ko.xml
diff --git a/current/support/car/res/values-ky/values-ky.xml b/current/car/car/res/values-ky/values-ky.xml
similarity index 100%
rename from current/support/car/res/values-ky/values-ky.xml
rename to current/car/car/res/values-ky/values-ky.xml
diff --git a/current/support/car/res/values-lo/values-lo.xml b/current/car/car/res/values-lo/values-lo.xml
similarity index 100%
rename from current/support/car/res/values-lo/values-lo.xml
rename to current/car/car/res/values-lo/values-lo.xml
diff --git a/current/support/car/res/values-lt/values-lt.xml b/current/car/car/res/values-lt/values-lt.xml
similarity index 100%
rename from current/support/car/res/values-lt/values-lt.xml
rename to current/car/car/res/values-lt/values-lt.xml
diff --git a/current/support/car/res/values-lv/values-lv.xml b/current/car/car/res/values-lv/values-lv.xml
similarity index 100%
rename from current/support/car/res/values-lv/values-lv.xml
rename to current/car/car/res/values-lv/values-lv.xml
diff --git a/current/support/car/res/values-mk/values-mk.xml b/current/car/car/res/values-mk/values-mk.xml
similarity index 100%
rename from current/support/car/res/values-mk/values-mk.xml
rename to current/car/car/res/values-mk/values-mk.xml
diff --git a/current/support/car/res/values-ml/values-ml.xml b/current/car/car/res/values-ml/values-ml.xml
similarity index 100%
rename from current/support/car/res/values-ml/values-ml.xml
rename to current/car/car/res/values-ml/values-ml.xml
diff --git a/current/support/car/res/values-mn/values-mn.xml b/current/car/car/res/values-mn/values-mn.xml
similarity index 100%
rename from current/support/car/res/values-mn/values-mn.xml
rename to current/car/car/res/values-mn/values-mn.xml
diff --git a/current/support/car/res/values-mr/values-mr.xml b/current/car/car/res/values-mr/values-mr.xml
similarity index 100%
rename from current/support/car/res/values-mr/values-mr.xml
rename to current/car/car/res/values-mr/values-mr.xml
diff --git a/current/support/car/res/values-ms/values-ms.xml b/current/car/car/res/values-ms/values-ms.xml
similarity index 100%
rename from current/support/car/res/values-ms/values-ms.xml
rename to current/car/car/res/values-ms/values-ms.xml
diff --git a/current/support/car/res/values-my/values-my.xml b/current/car/car/res/values-my/values-my.xml
similarity index 100%
rename from current/support/car/res/values-my/values-my.xml
rename to current/car/car/res/values-my/values-my.xml
diff --git a/current/support/car/res/values-nb/values-nb.xml b/current/car/car/res/values-nb/values-nb.xml
similarity index 100%
rename from current/support/car/res/values-nb/values-nb.xml
rename to current/car/car/res/values-nb/values-nb.xml
diff --git a/current/support/car/res/values-ne/values-ne.xml b/current/car/car/res/values-ne/values-ne.xml
similarity index 100%
rename from current/support/car/res/values-ne/values-ne.xml
rename to current/car/car/res/values-ne/values-ne.xml
diff --git a/current/support/car/res/values-night-v8/values-night-v8.xml b/current/car/car/res/values-night-v8/values-night-v8.xml
similarity index 100%
rename from current/support/car/res/values-night-v8/values-night-v8.xml
rename to current/car/car/res/values-night-v8/values-night-v8.xml
diff --git a/current/support/car/res/values-nl/values-nl.xml b/current/car/car/res/values-nl/values-nl.xml
similarity index 100%
rename from current/support/car/res/values-nl/values-nl.xml
rename to current/car/car/res/values-nl/values-nl.xml
diff --git a/current/support/car/res/values-pa/values-pa.xml b/current/car/car/res/values-pa/values-pa.xml
similarity index 100%
rename from current/support/car/res/values-pa/values-pa.xml
rename to current/car/car/res/values-pa/values-pa.xml
diff --git a/current/support/car/res/values-pl/values-pl.xml b/current/car/car/res/values-pl/values-pl.xml
similarity index 100%
rename from current/support/car/res/values-pl/values-pl.xml
rename to current/car/car/res/values-pl/values-pl.xml
diff --git a/current/support/car/res/values-pt-rBR/values-pt-rBR.xml b/current/car/car/res/values-pt-rBR/values-pt-rBR.xml
similarity index 100%
rename from current/support/car/res/values-pt-rBR/values-pt-rBR.xml
rename to current/car/car/res/values-pt-rBR/values-pt-rBR.xml
diff --git a/current/support/car/res/values-pt-rPT/values-pt-rPT.xml b/current/car/car/res/values-pt-rPT/values-pt-rPT.xml
similarity index 100%
rename from current/support/car/res/values-pt-rPT/values-pt-rPT.xml
rename to current/car/car/res/values-pt-rPT/values-pt-rPT.xml
diff --git a/current/support/car/res/values-pt/values-pt.xml b/current/car/car/res/values-pt/values-pt.xml
similarity index 100%
rename from current/support/car/res/values-pt/values-pt.xml
rename to current/car/car/res/values-pt/values-pt.xml
diff --git a/current/support/car/res/values-ro/values-ro.xml b/current/car/car/res/values-ro/values-ro.xml
similarity index 100%
rename from current/support/car/res/values-ro/values-ro.xml
rename to current/car/car/res/values-ro/values-ro.xml
diff --git a/current/support/car/res/values-ru/values-ru.xml b/current/car/car/res/values-ru/values-ru.xml
similarity index 100%
rename from current/support/car/res/values-ru/values-ru.xml
rename to current/car/car/res/values-ru/values-ru.xml
diff --git a/current/support/car/res/values-si/values-si.xml b/current/car/car/res/values-si/values-si.xml
similarity index 100%
rename from current/support/car/res/values-si/values-si.xml
rename to current/car/car/res/values-si/values-si.xml
diff --git a/current/support/car/res/values-sk/values-sk.xml b/current/car/car/res/values-sk/values-sk.xml
similarity index 100%
rename from current/support/car/res/values-sk/values-sk.xml
rename to current/car/car/res/values-sk/values-sk.xml
diff --git a/current/support/car/res/values-sl/values-sl.xml b/current/car/car/res/values-sl/values-sl.xml
similarity index 100%
rename from current/support/car/res/values-sl/values-sl.xml
rename to current/car/car/res/values-sl/values-sl.xml
diff --git a/current/support/car/res/values-sq/values-sq.xml b/current/car/car/res/values-sq/values-sq.xml
similarity index 100%
rename from current/support/car/res/values-sq/values-sq.xml
rename to current/car/car/res/values-sq/values-sq.xml
diff --git a/current/support/car/res/values-sr/values-sr.xml b/current/car/car/res/values-sr/values-sr.xml
similarity index 100%
rename from current/support/car/res/values-sr/values-sr.xml
rename to current/car/car/res/values-sr/values-sr.xml
diff --git a/current/support/car/res/values-sv/values-sv.xml b/current/car/car/res/values-sv/values-sv.xml
similarity index 100%
rename from current/support/car/res/values-sv/values-sv.xml
rename to current/car/car/res/values-sv/values-sv.xml
diff --git a/current/support/car/res/values-sw/values-sw.xml b/current/car/car/res/values-sw/values-sw.xml
similarity index 100%
rename from current/support/car/res/values-sw/values-sw.xml
rename to current/car/car/res/values-sw/values-sw.xml
diff --git a/current/support/car/res/values-ta/values-ta.xml b/current/car/car/res/values-ta/values-ta.xml
similarity index 100%
rename from current/support/car/res/values-ta/values-ta.xml
rename to current/car/car/res/values-ta/values-ta.xml
diff --git a/current/support/car/res/values-te/values-te.xml b/current/car/car/res/values-te/values-te.xml
similarity index 100%
rename from current/support/car/res/values-te/values-te.xml
rename to current/car/car/res/values-te/values-te.xml
diff --git a/current/support/car/res/values-th/values-th.xml b/current/car/car/res/values-th/values-th.xml
similarity index 100%
rename from current/support/car/res/values-th/values-th.xml
rename to current/car/car/res/values-th/values-th.xml
diff --git a/current/support/car/res/values-tl/values-tl.xml b/current/car/car/res/values-tl/values-tl.xml
similarity index 100%
rename from current/support/car/res/values-tl/values-tl.xml
rename to current/car/car/res/values-tl/values-tl.xml
diff --git a/current/support/car/res/values-tr/values-tr.xml b/current/car/car/res/values-tr/values-tr.xml
similarity index 100%
rename from current/support/car/res/values-tr/values-tr.xml
rename to current/car/car/res/values-tr/values-tr.xml
diff --git a/current/support/car/res/values-uk/values-uk.xml b/current/car/car/res/values-uk/values-uk.xml
similarity index 100%
rename from current/support/car/res/values-uk/values-uk.xml
rename to current/car/car/res/values-uk/values-uk.xml
diff --git a/current/support/car/res/values-ur/values-ur.xml b/current/car/car/res/values-ur/values-ur.xml
similarity index 100%
rename from current/support/car/res/values-ur/values-ur.xml
rename to current/car/car/res/values-ur/values-ur.xml
diff --git a/current/support/car/res/values-uz/values-uz.xml b/current/car/car/res/values-uz/values-uz.xml
similarity index 100%
rename from current/support/car/res/values-uz/values-uz.xml
rename to current/car/car/res/values-uz/values-uz.xml
diff --git a/current/support/car/res/values-vi/values-vi.xml b/current/car/car/res/values-vi/values-vi.xml
similarity index 100%
rename from current/support/car/res/values-vi/values-vi.xml
rename to current/car/car/res/values-vi/values-vi.xml
diff --git a/current/support/car/res/values-w1280dp-v13/values-w1280dp-v13.xml b/current/car/car/res/values-w1280dp-v13/values-w1280dp-v13.xml
similarity index 100%
rename from current/support/car/res/values-w1280dp-v13/values-w1280dp-v13.xml
rename to current/car/car/res/values-w1280dp-v13/values-w1280dp-v13.xml
diff --git a/current/support/car/res/values-w1920dp-v13/values-w1920dp-v13.xml b/current/car/car/res/values-w1920dp-v13/values-w1920dp-v13.xml
similarity index 100%
rename from current/support/car/res/values-w1920dp-v13/values-w1920dp-v13.xml
rename to current/car/car/res/values-w1920dp-v13/values-w1920dp-v13.xml
diff --git a/current/support/car/res/values-w690dp-v13/values-w690dp-v13.xml b/current/car/car/res/values-w690dp-v13/values-w690dp-v13.xml
similarity index 100%
rename from current/support/car/res/values-w690dp-v13/values-w690dp-v13.xml
rename to current/car/car/res/values-w690dp-v13/values-w690dp-v13.xml
diff --git a/current/support/car/res/values-w930dp-v13/values-w930dp-v13.xml b/current/car/car/res/values-w930dp-v13/values-w930dp-v13.xml
similarity index 100%
rename from current/support/car/res/values-w930dp-v13/values-w930dp-v13.xml
rename to current/car/car/res/values-w930dp-v13/values-w930dp-v13.xml
diff --git a/current/support/car/res/values-zh-rCN/values-zh-rCN.xml b/current/car/car/res/values-zh-rCN/values-zh-rCN.xml
similarity index 100%
rename from current/support/car/res/values-zh-rCN/values-zh-rCN.xml
rename to current/car/car/res/values-zh-rCN/values-zh-rCN.xml
diff --git a/current/support/car/res/values-zh-rHK/values-zh-rHK.xml b/current/car/car/res/values-zh-rHK/values-zh-rHK.xml
similarity index 100%
rename from current/support/car/res/values-zh-rHK/values-zh-rHK.xml
rename to current/car/car/res/values-zh-rHK/values-zh-rHK.xml
diff --git a/current/support/car/res/values-zh-rTW/values-zh-rTW.xml b/current/car/car/res/values-zh-rTW/values-zh-rTW.xml
similarity index 100%
rename from current/support/car/res/values-zh-rTW/values-zh-rTW.xml
rename to current/car/car/res/values-zh-rTW/values-zh-rTW.xml
diff --git a/current/support/car/res/values-zu/values-zu.xml b/current/car/car/res/values-zu/values-zu.xml
similarity index 100%
rename from current/support/car/res/values-zu/values-zu.xml
rename to current/car/car/res/values-zu/values-zu.xml
diff --git a/current/support/car/res/values/values.xml b/current/car/car/res/values/values.xml
similarity index 100%
rename from current/support/car/res/values/values.xml
rename to current/car/car/res/values/values.xml
diff --git a/current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.aar b/current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.aar
similarity index 100%
rename from current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.aar
rename to current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.aar
Binary files differ
diff --git a/current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.aar.md5 b/current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.aar.md5
similarity index 100%
rename from current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.aar.md5
rename to current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.aar.md5
diff --git a/current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.aar.sha1 b/current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.aar.sha1
similarity index 100%
rename from current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.aar.sha1
rename to current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.aar.sha1
diff --git a/current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.pom b/current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.pom
similarity index 100%
rename from current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.pom
rename to current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.pom
diff --git a/current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.pom.md5 b/current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.pom.md5
similarity index 100%
rename from current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.pom.md5
rename to current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.pom.md5
diff --git a/current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.pom.sha1 b/current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.pom.sha1
similarity index 100%
rename from current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.pom.sha1
rename to current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.pom.sha1
diff --git a/current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/maven-metadata.xml b/current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/maven-metadata.xml
similarity index 100%
rename from current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/maven-metadata.xml
rename to current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/maven-metadata.xml
diff --git a/current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/maven-metadata.xml.md5 b/current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/maven-metadata.xml.md5
similarity index 100%
rename from current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/maven-metadata.xml.md5
rename to current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/maven-metadata.xml.md5
diff --git a/current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/maven-metadata.xml.sha1 b/current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/maven-metadata.xml.sha1
similarity index 100%
rename from current/support/m2repository/androidx/car/car/1.0.0-SNAPSHOT/maven-metadata.xml.sha1
rename to current/car/m2repository/androidx/car/car/1.0.0-SNAPSHOT/maven-metadata.xml.sha1
diff --git a/current/support/manifests/android-support-car/AndroidManifest.xml b/current/car/manifests/android-support-car/AndroidManifest.xml
similarity index 100%
rename from current/support/manifests/android-support-car/AndroidManifest.xml
rename to current/car/manifests/android-support-car/AndroidManifest.xml
diff --git a/current/core.jar b/current/core.jar
index 34e8c81..cc5fc8c 100644
--- a/current/core.jar
+++ b/current/core.jar
Binary files differ
diff --git a/current/framework.aidl b/current/framework.aidl
index 0048ebb..4caa50e 100644
--- a/current/framework.aidl
+++ b/current/framework.aidl
@@ -52,6 +52,7 @@
parcelable android.app.slice.SliceSpec;
parcelable android.app.usage.CacheQuotaHint;
parcelable android.app.usage.ConfigurationStats;
+parcelable android.app.usage.EventStats;
parcelable android.app.usage.ExternalStorageStats;
parcelable android.app.usage.StorageStats;
parcelable android.app.usage.UsageEvents;
@@ -148,9 +149,13 @@
parcelable android.hardware.hdmi.HdmiHotplugEvent;
parcelable android.hardware.hdmi.HdmiPortInfo;
parcelable android.hardware.location.ContextHubInfo;
+parcelable android.hardware.location.ContextHubMessage;
parcelable android.hardware.location.GeofenceHardwareMonitorEvent;
parcelable android.hardware.location.MemoryRegion;
+parcelable android.hardware.location.NanoApp;
parcelable android.hardware.location.NanoAppBinary;
+parcelable android.hardware.location.NanoAppFilter;
+parcelable android.hardware.location.NanoAppInstanceInfo;
parcelable android.hardware.location.NanoAppMessage;
parcelable android.hardware.location.NanoAppState;
parcelable android.hardware.radio.Announcement;
@@ -266,8 +271,6 @@
parcelable android.net.wifi.p2p.nsd.WifiP2pServiceRequest;
parcelable android.net.wifi.p2p.nsd.WifiP2pUpnpServiceInfo;
parcelable android.net.wifi.p2p.nsd.WifiP2pUpnpServiceRequest;
-parcelable android.net.wifi.rtt.LocationCivic;
-parcelable android.net.wifi.rtt.LocationConfigurationInformation;
parcelable android.net.wifi.rtt.RangingRequest;
parcelable android.net.wifi.rtt.RangingResult;
parcelable android.net.wifi.rtt.ResponderConfig;
@@ -365,7 +368,6 @@
parcelable android.telecom.StatusHints;
parcelable android.telecom.TelecomAnalytics.SessionTiming;
parcelable android.telecom.TelecomAnalytics;
-parcelable android.telecom.TransformationInfo;
parcelable android.telecom.VideoProfile.CameraCapabilities;
parcelable android.telecom.VideoProfile;
parcelable android.telephony.CellIdentity;
@@ -477,8 +479,10 @@
parcelable android.view.inputmethod.InputContentInfo;
parcelable android.view.inputmethod.InputMethodInfo;
parcelable android.view.inputmethod.InputMethodSubtype;
+parcelable android.view.textclassifier.SelectionEvent;
parcelable android.view.textclassifier.TextClassification.Options;
parcelable android.view.textclassifier.TextClassification;
+parcelable android.view.textclassifier.TextClassificationSessionId;
parcelable android.view.textclassifier.TextClassifier.EntityConfig;
parcelable android.view.textclassifier.TextLinks.Options;
parcelable android.view.textclassifier.TextLinks.TextLink;
diff --git a/current/optional/android.test.base.jar b/current/optional/android.test.base.jar
index e770f99..e765455 100644
--- a/current/optional/android.test.base.jar
+++ b/current/optional/android.test.base.jar
Binary files differ
diff --git a/current/optional/android.test.mock.jar b/current/optional/android.test.mock.jar
index 0cae38f..dedea5e 100644
--- a/current/optional/android.test.mock.jar
+++ b/current/optional/android.test.mock.jar
Binary files differ
diff --git a/current/optional/android.test.runner.jar b/current/optional/android.test.runner.jar
index 29fb4cf..9750a80 100644
--- a/current/optional/android.test.runner.jar
+++ b/current/optional/android.test.runner.jar
Binary files differ
diff --git a/current/support/Android.mk b/current/support/Android.mk
index a1ec331..2c462c3 100644
--- a/current/support/Android.mk
+++ b/current/support/Android.mk
@@ -121,103 +121,6 @@
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(CLEAR_VARS)
-LOCAL_MODULE := android-support-car-nodeps
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_SRC_FILES := m2repository/androidx/car/car/1.0.0-SNAPSHOT/car-1.0.0-20180312.215303-1.aar
-LOCAL_BUILT_MODULE_STEM := javalib.jar
-LOCAL_MODULE_SUFFIX := .aar
-LOCAL_USE_AAPT2 := true
-LOCAL_SDK_VERSION := current
-LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-v7-appcompat \
- android-support-v7-cardview \
- android-support-v7-appcompat \
- android-support-v7-cardview \
- android-support-design-animation \
- android-support-design-bottomappbar \
- android-support-design-bottomnavigation \
- android-support-design-bottomsheet \
- android-support-design-button \
- android-support-design-canvas \
- android-support-design-card \
- android-support-design-chip \
- android-support-design-circularreveal \
- android-support-design-circularreveal-cardview \
- android-support-design-circularreveal-coordinatorlayout \
- android-support-design-color \
- android-support-design-dialog \
- android-support-design-drawable \
- android-support-design-expandable \
- android-support-design-floatingactionbutton \
- android-support-design-math \
- android-support-design-navigation \
- android-support-design-resources \
- android-support-design-ripple \
- android-support-design-shape \
- android-support-design-snackbar \
- android-support-design-stateful \
- android-support-design-tabs \
- android-support-design-textfield \
- android-support-design-theme \
- android-support-design-transformation \
- android-support-design-typography \
- android-support-design-widget \
- android-support-design-internal \
- flexbox \
- android-support-v4 \
- android-support-v7-recyclerview
-include $(BUILD_PREBUILT)
-include $(CLEAR_VARS)
-LOCAL_MODULE := android-support-car
-LOCAL_SDK_VERSION := current
-LOCAL_MANIFEST_FILE := manifests/android-support-car/AndroidManifest.xml
-LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-annotations \
- prebuilt-android.car-stubs
-LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-car-nodeps \
- android-support-v7-appcompat \
- android-support-v7-cardview \
- android-support-design-animation \
- android-support-design-bottomappbar \
- android-support-design-bottomnavigation \
- android-support-design-bottomsheet \
- android-support-design-button \
- android-support-design-canvas \
- android-support-design-card \
- android-support-design-chip \
- android-support-design-circularreveal \
- android-support-design-circularreveal-cardview \
- android-support-design-circularreveal-coordinatorlayout \
- android-support-design-color \
- android-support-design-dialog \
- android-support-design-drawable \
- android-support-design-expandable \
- android-support-design-floatingactionbutton \
- android-support-design-math \
- android-support-design-navigation \
- android-support-design-resources \
- android-support-design-ripple \
- android-support-design-shape \
- android-support-design-snackbar \
- android-support-design-stateful \
- android-support-design-tabs \
- android-support-design-textfield \
- android-support-design-theme \
- android-support-design-transformation \
- android-support-design-typography \
- android-support-design-widget \
- android-support-design-internal \
- flexbox \
- android-support-v4 \
- android-support-v7-recyclerview
-LOCAL_JAR_EXCLUDE_FILES := none
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-LOCAL_USE_AAPT2 := true
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
LOCAL_MODULE := android-support-v7-cardview-nodeps
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_UNINSTALLABLE_MODULE := true
diff --git a/current/uiautomator.jar b/current/uiautomator.jar
index 075fb1e..6da538a 100644
--- a/current/uiautomator.jar
+++ b/current/uiautomator.jar
Binary files differ
diff --git a/system_current/android.jar b/system_current/android.jar
index 61b3a7a..0568186 100644
--- a/system_current/android.jar
+++ b/system_current/android.jar
Binary files differ
diff --git a/system_current/framework.aidl b/system_current/framework.aidl
index 0048ebb..4caa50e 100644
--- a/system_current/framework.aidl
+++ b/system_current/framework.aidl
@@ -52,6 +52,7 @@
parcelable android.app.slice.SliceSpec;
parcelable android.app.usage.CacheQuotaHint;
parcelable android.app.usage.ConfigurationStats;
+parcelable android.app.usage.EventStats;
parcelable android.app.usage.ExternalStorageStats;
parcelable android.app.usage.StorageStats;
parcelable android.app.usage.UsageEvents;
@@ -148,9 +149,13 @@
parcelable android.hardware.hdmi.HdmiHotplugEvent;
parcelable android.hardware.hdmi.HdmiPortInfo;
parcelable android.hardware.location.ContextHubInfo;
+parcelable android.hardware.location.ContextHubMessage;
parcelable android.hardware.location.GeofenceHardwareMonitorEvent;
parcelable android.hardware.location.MemoryRegion;
+parcelable android.hardware.location.NanoApp;
parcelable android.hardware.location.NanoAppBinary;
+parcelable android.hardware.location.NanoAppFilter;
+parcelable android.hardware.location.NanoAppInstanceInfo;
parcelable android.hardware.location.NanoAppMessage;
parcelable android.hardware.location.NanoAppState;
parcelable android.hardware.radio.Announcement;
@@ -266,8 +271,6 @@
parcelable android.net.wifi.p2p.nsd.WifiP2pServiceRequest;
parcelable android.net.wifi.p2p.nsd.WifiP2pUpnpServiceInfo;
parcelable android.net.wifi.p2p.nsd.WifiP2pUpnpServiceRequest;
-parcelable android.net.wifi.rtt.LocationCivic;
-parcelable android.net.wifi.rtt.LocationConfigurationInformation;
parcelable android.net.wifi.rtt.RangingRequest;
parcelable android.net.wifi.rtt.RangingResult;
parcelable android.net.wifi.rtt.ResponderConfig;
@@ -365,7 +368,6 @@
parcelable android.telecom.StatusHints;
parcelable android.telecom.TelecomAnalytics.SessionTiming;
parcelable android.telecom.TelecomAnalytics;
-parcelable android.telecom.TransformationInfo;
parcelable android.telecom.VideoProfile.CameraCapabilities;
parcelable android.telecom.VideoProfile;
parcelable android.telephony.CellIdentity;
@@ -477,8 +479,10 @@
parcelable android.view.inputmethod.InputContentInfo;
parcelable android.view.inputmethod.InputMethodInfo;
parcelable android.view.inputmethod.InputMethodSubtype;
+parcelable android.view.textclassifier.SelectionEvent;
parcelable android.view.textclassifier.TextClassification.Options;
parcelable android.view.textclassifier.TextClassification;
+parcelable android.view.textclassifier.TextClassificationSessionId;
parcelable android.view.textclassifier.TextClassifier.EntityConfig;
parcelable android.view.textclassifier.TextLinks.Options;
parcelable android.view.textclassifier.TextLinks.TextLink;
diff --git a/system_current/optional/android.test.mock.jar b/system_current/optional/android.test.mock.jar
index 9a6483e..4a43346 100644
--- a/system_current/optional/android.test.mock.jar
+++ b/system_current/optional/android.test.mock.jar
Binary files differ
diff --git a/update_current/update_current.py b/update_current/update_current.py
index adc7781..db5b5c3 100755
--- a/update_current/update_current.py
+++ b/update_current/update_current.py
@@ -368,7 +368,7 @@
return maven_lib_info
-def transform_maven_repos(maven_repo_dirs, transformed_dir, extract_res=True):
+def transform_maven_repos(maven_repo_dirs, transformed_dir, extract_res=True, include_static_deps=False):
cwd = os.getcwd()
# Use a temporary working directory.
@@ -387,6 +387,8 @@
makefile = os.path.join(working_dir, 'Android.mk')
with open(makefile, 'w') as f:
args = ["pom2mk", "-sdk-version", "current"]
+ if include_static_deps:
+ args.append("-static-deps")
rewriteNames = [name for name in maven_to_make if ":" in name] + [name for name in maven_to_make if ":" not in name]
args.extend(["-rewrite=^" + name + "$=" + maven_to_make[name][0] for name in rewriteNames])
args.extend(["-extra-deps=android-support-car=prebuilt-android.car-stubs"])
@@ -500,7 +502,7 @@
return False
# Transform the repo archive into a Makefile-compatible format.
- return transform_maven_repos([repo_dir], support_dir)
+ return transform_maven_repos([repo_dir], support_dir, extract_res=True, include_static_deps=True)
def update_androidx(target, target_toolkit, build_id, local_file):
@@ -547,7 +549,7 @@
return False
# Transform the repo archive into a Makefile-compatible format.
- return transform_maven_repos([repo_dir], os.path.join(extras_dir, 'app-toolkit'))
+ return transform_maven_repos([repo_dir], os.path.join(extras_dir, 'app-toolkit'), extract_res=True, include_static_deps=True)
def update_constraint(target, build_id):