Move -port values back to non-port qualifier
To better support screen rotation and pass CTS.
Bug: 294251669
Test: atest android.server.wm.MultiDisplayPolicyTests#testRotationNotAffectingSecondaryScreen
Change-Id: I3676164aa762737576c3a6e261534e84f22645f5
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable-port-night/base_layer_wallpaper.png b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable-night/base_layer_wallpaper.png
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable-port-night/base_layer_wallpaper.png
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable-night/base_layer_wallpaper.png
Binary files differ
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable-port/app_icon_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable/app_icon_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable-port/app_icon_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable/app_icon_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable-port/base_layer_wallpaper.png b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable/base_layer_wallpaper.png
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable-port/base_layer_wallpaper.png
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable/base_layer_wallpaper.png
Binary files differ
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable-port/control_bar_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable/control_bar_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable-port/control_bar_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable/control_bar_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable-port/grip_bar_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable/grip_bar_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable-port/grip_bar_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable/grip_bar_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable-port/immersive_back.xml b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable/immersive_back.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable-port/immersive_back.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/drawable/immersive_back.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout-port/car_ui_portrait_audio_card.xml b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout/car_ui_portrait_audio_card.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout-port/car_ui_portrait_audio_card.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout/car_ui_portrait_audio_card.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout-port/car_ui_portrait_background_panel_base.xml b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout/car_ui_portrait_background_panel_base.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout-port/car_ui_portrait_background_panel_base.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout/car_ui_portrait_background_panel_base.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout-port/car_ui_portrait_grip_bar.xml b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout/car_ui_portrait_grip_bar.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout-port/car_ui_portrait_grip_bar.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout/car_ui_portrait_grip_bar.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout-port/car_ui_portrait_launcher.xml b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout/car_ui_portrait_launcher.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout-port/car_ui_portrait_launcher.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout/car_ui_portrait_launcher.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout-port/car_ui_portrait_panel.xml b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout/car_ui_portrait_panel.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout-port/car_ui_portrait_panel.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout/car_ui_portrait_panel.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout-port/car_ui_portrait_panel_overlay.xml b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout/car_ui_portrait_panel_overlay.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout-port/car_ui_portrait_panel_overlay.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout/car_ui_portrait_panel_overlay.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout-port/car_ui_portrait_toolbar.xml b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout/car_ui_portrait_toolbar.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout-port/car_ui_portrait_toolbar.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/layout/car_ui_portrait_toolbar.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values-port/config.xml b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values/config.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values-port/config.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values/config.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values-port/dimens.xml b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values/dimens.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values-port/dimens.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values/dimens.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values-port/strings.xml b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values/strings.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values-port/strings.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values/strings.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values-port/styles.xml b/car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values/styles.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values-port/styles.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitLauncher/res/values/styles.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/anim-port/hvac_close_anim.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/anim/hvac_close_anim.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/anim-port/hvac_close_anim.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/anim/hvac_close_anim.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/anim-port/hvac_open_anim.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/anim/hvac_open_anim.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/anim-port/hvac_open_anim.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/anim/hvac_open_anim.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port-night/qc_seekbar_thumb_selector.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-night/qc_seekbar_thumb_selector.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port-night/qc_seekbar_thumb_selector.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-night/qc_seekbar_thumb_selector.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port-night/qc_switch_thumb_selector.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-night/qc_switch_thumb_selector.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port-night/qc_switch_thumb_selector.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-night/qc_switch_thumb_selector.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port-night/qc_toggle_background_color.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-night/qc_toggle_background_color.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port-night/qc_toggle_background_color.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-night/qc_toggle_background_color.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port-night/qc_toggle_icon_fill_color.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-night/qc_toggle_icon_fill_color.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port-night/qc_toggle_icon_fill_color.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-night/qc_toggle_icon_fill_color.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port-night/system_bar_icon_color_with_selection.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-night/system_bar_icon_color_with_selection.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port-night/system_bar_icon_color_with_selection.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-night/system_bar_icon_color_with_selection.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port/car_nav_icon_fill_color_selected.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color/car_nav_icon_fill_color_selected.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port/car_nav_icon_fill_color_selected.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color/car_nav_icon_fill_color_selected.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port/qc_seekbar_thumb_selector.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color/qc_seekbar_thumb_selector.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port/qc_seekbar_thumb_selector.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color/qc_seekbar_thumb_selector.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port/qc_switch_thumb_selector.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color/qc_switch_thumb_selector.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port/qc_switch_thumb_selector.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color/qc_switch_thumb_selector.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port/qc_toggle_background_color.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color/qc_toggle_background_color.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port/qc_toggle_background_color.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color/qc_toggle_background_color.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port/qc_toggle_icon_fill_color.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color/qc_toggle_icon_fill_color.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port/qc_toggle_icon_fill_color.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color/qc_toggle_icon_fill_color.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port/qc_toggle_unavailable_color.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color/qc_toggle_unavailable_color.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port/qc_toggle_unavailable_color.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color/qc_toggle_unavailable_color.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port/system_bar_icon_color_with_selection.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color/system_bar_icon_color_with_selection.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color-port/system_bar_icon_color_with_selection.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/color/system_bar_icon_color_with_selection.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/alert_dialog_bg.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/alert_dialog_bg.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/alert_dialog_bg.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/alert_dialog_bg.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_dialog_button1_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_dialog_button1_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_dialog_button1_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_dialog_button1_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_dialog_button_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_dialog_button_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_dialog_button_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_dialog_button_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_ic_apps.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_ic_apps.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_ic_apps.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_ic_apps.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_ic_hvac.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_ic_hvac.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_ic_hvac.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_ic_hvac.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_ic_mic.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_ic_mic.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_ic_mic.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_ic_mic.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_ic_notification.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_ic_notification.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_ic_notification.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_ic_notification.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_ic_status.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_ic_status.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_ic_status.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_ic_status.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_ic_user_icon.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_ic_user_icon.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/car_ic_user_icon.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/car_ic_user_icon.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_1.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_1.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_1.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_1.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_2.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_2.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_2.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_2.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_3.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_3.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_3.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_3.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_4.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_4.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_4.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_4.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_5.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_5.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_5.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_5.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_6.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_6.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_6.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_6.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_7.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_7.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_7.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_7.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_8.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_8.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/fan_speed_seek_bar_thumb_8.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/fan_speed_seek_bar_thumb_8.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_button_cool_on_bg.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_button_cool_on_bg.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_button_cool_on_bg.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_button_cool_on_bg.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_button_heat_on_bg.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_button_heat_on_bg.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_button_heat_on_bg.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_button_heat_on_bg.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_button_off_bg.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_button_off_bg.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_button_off_bg.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_button_off_bg.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_button_on_bg.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_button_on_bg.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_button_on_bg.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_button_on_bg.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_cool_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_cool_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_cool_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_cool_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_decrease_button.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_decrease_button.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_decrease_button.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_decrease_button.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_default_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_default_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_default_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_default_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_heat_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_heat_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_heat_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_heat_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_increase_button.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_increase_button.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_increase_button.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_increase_button.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_panel_bg.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_panel_bg.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/hvac_panel_bg.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/hvac_panel_bg.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_ac_off.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_ac_off.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_ac_off.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_ac_off.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_ac_on.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_ac_on.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_ac_on.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_ac_on.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_airflow_feet_off.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_airflow_feet_off.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_airflow_feet_off.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_airflow_feet_off.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_airflow_feet_on.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_airflow_feet_on.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_airflow_feet_on.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_airflow_feet_on.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_airflow_head_off.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_airflow_head_off.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_airflow_head_off.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_airflow_head_off.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_airflow_head_on.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_airflow_head_on.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_airflow_head_on.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_airflow_head_on.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_airflow_windshield_off.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_airflow_windshield_off.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_airflow_windshield_off.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_airflow_windshield_off.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_airflow_windshield_on.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_airflow_windshield_on.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_airflow_windshield_on.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_airflow_windshield_on.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_auto_off.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_auto_off.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_auto_off.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_auto_off.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_auto_on.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_auto_on.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_auto_on.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_auto_on.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_baseline_expand_more_24.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_baseline_expand_more_24.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_baseline_expand_more_24.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_baseline_expand_more_24.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_chevron_down.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_chevron_down.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_chevron_down.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_chevron_down.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_chevron_up.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_chevron_up.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_chevron_up.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_chevron_up.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_defroster_rear_off.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_defroster_rear_off.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_defroster_rear_off.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_defroster_rear_off.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_defroster_rear_on.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_defroster_rear_on.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_defroster_rear_on.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_defroster_rear_on.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_defroster_windshield_off.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_defroster_windshield_off.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_defroster_windshield_off.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_defroster_windshield_off.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_defroster_windshield_on.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_defroster_windshield_on.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_defroster_windshield_on.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_defroster_windshield_on.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_driver_seat_heat_high.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_driver_seat_heat_high.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_driver_seat_heat_high.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_driver_seat_heat_high.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_driver_seat_heat_low.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_driver_seat_heat_low.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_driver_seat_heat_low.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_driver_seat_heat_low.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_driver_seat_heat_off.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_driver_seat_heat_off.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_driver_seat_heat_off.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_driver_seat_heat_off.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_fan_off.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_fan_off.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_fan_off.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_fan_off.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_fan_on.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_fan_on.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_fan_on.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_fan_on.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_heated_steering_off.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_heated_steering_off.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_heated_steering_off.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_heated_steering_off.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_heated_steering_on.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_heated_steering_on.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_heated_steering_on.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_heated_steering_on.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_minimize.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_minimize.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_minimize.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_minimize.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_1.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_1.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_1.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_1.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_2.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_2.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_2.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_2.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_3.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_3.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_3.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_3.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_4.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_4.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_4.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_4.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_5.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_5.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_5.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_5.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_6.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_6.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_6.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_6.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_7.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_7.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_7.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_7.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_8.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_8.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_mode_fan_8.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_mode_fan_8.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_passenger_seat_heat_high.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_passenger_seat_heat_high.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_passenger_seat_heat_high.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_passenger_seat_heat_high.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_passenger_seat_heat_low.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_passenger_seat_heat_low.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_passenger_seat_heat_low.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_passenger_seat_heat_low.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_passenger_seat_heat_off.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_passenger_seat_heat_off.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_passenger_seat_heat_off.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_passenger_seat_heat_off.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_power_off.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_power_off.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_power_off.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_power_off.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_power_on.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_power_on.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_power_on.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_power_on.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_recirculate_off.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_recirculate_off.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_recirculate_off.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_recirculate_off.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_recirculate_on.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_recirculate_on.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_recirculate_on.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_recirculate_on.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_sync_off.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_sync_off.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_sync_off.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_sync_off.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_sync_on.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_sync_on.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/ic_sync_on.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/ic_sync_on.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/nav_bar_button_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/nav_bar_button_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/nav_bar_button_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/nav_bar_button_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/nav_bar_button_background_selected.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/nav_bar_button_background_selected.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/nav_bar_button_background_selected.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/nav_bar_button_background_selected.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/nav_bar_button_background_selected_to_unselected_anim.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/nav_bar_button_background_selected_to_unselected_anim.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/nav_bar_button_background_selected_to_unselected_anim.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/nav_bar_button_background_selected_to_unselected_anim.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/nav_bar_button_background_unselected.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/nav_bar_button_background_unselected.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/nav_bar_button_background_unselected.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/nav_bar_button_background_unselected.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/nav_bar_button_background_unselected_to_selected_anim.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/nav_bar_button_background_unselected_to_selected_anim.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/nav_bar_button_background_unselected_to_selected_anim.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/nav_bar_button_background_unselected_to_selected_anim.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/progress_drawable.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/progress_drawable.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/progress_drawable.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/progress_drawable.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/qc_dialog_button_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/qc_dialog_button_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/qc_dialog_button_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/qc_dialog_button_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/qc_toggle_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/qc_toggle_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/qc_toggle_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/qc_toggle_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/qc_toggle_button_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/qc_toggle_button_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/qc_toggle_button_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/qc_toggle_button_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/qc_toggle_unavailable_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/qc_toggle_unavailable_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/qc_toggle_unavailable_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/qc_toggle_unavailable_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/status_icon_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/status_icon_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/status_icon_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/status_icon_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/status_icon_panel_bg.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/status_icon_panel_bg.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/status_icon_panel_bg.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/status_icon_panel_bg.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/system_bar_background_pill.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/system_bar_background_pill.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/system_bar_background_pill.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/system_bar_background_pill.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/system_bar_background_square.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/system_bar_background_square.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/system_bar_background_square.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/system_bar_background_square.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/user_avatar_background.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/user_avatar_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable-port/user_avatar_background.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/drawable/user_avatar_background.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/adjustable_temperature_view.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/adjustable_temperature_view.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/adjustable_temperature_view.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/adjustable_temperature_view.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/alert_dialog_systemui.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/alert_dialog_systemui.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/alert_dialog_systemui.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/alert_dialog_systemui.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/camera_privacy_chip.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/camera_privacy_chip.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/camera_privacy_chip.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/camera_privacy_chip.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/car_bottom_system_bar.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/car_bottom_system_bar.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/car_bottom_system_bar.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/car_bottom_system_bar.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/car_qc_entry_points_button.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/car_qc_entry_points_button.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/car_qc_entry_points_button.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/car_qc_entry_points_button.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/car_top_system_bar.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/car_top_system_bar.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/car_top_system_bar.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/car_top_system_bar.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/car_top_system_bar_unprovisioned.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/car_top_system_bar_unprovisioned.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/car_top_system_bar_unprovisioned.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/car_top_system_bar_unprovisioned.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/default_status_icon.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/default_status_icon.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/default_status_icon.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/default_status_icon.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/fan_direction.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/fan_direction.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/fan_direction.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/fan_direction.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/hvac_panel.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/hvac_panel.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/hvac_panel.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/hvac_panel.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/hvac_panel_handle_bar.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/hvac_panel_handle_bar.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/hvac_panel_handle_bar.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/hvac_panel_handle_bar.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/keyguard_container.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/keyguard_container.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/keyguard_container.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/keyguard_container.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/loading_screen.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/loading_screen.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/loading_screen.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/loading_screen.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/mic_privacy_chip.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/mic_privacy_chip.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/mic_privacy_chip.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/mic_privacy_chip.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/qc_profile_switcher.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/qc_profile_switcher.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/qc_profile_switcher.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/qc_profile_switcher.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/sysui_overlay_window.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/sysui_overlay_window.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/sysui_overlay_window.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/sysui_overlay_window.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/text_toast.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/text_toast.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout-port/text_toast.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/layout/text_toast.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port-night/colors.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-night/colors.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port-night/colors.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-night/colors.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/config.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/config.xml
deleted file mode 100644
index e5f2e41..0000000
--- a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/config.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2023 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<resources>
- <!-- Car System UI's OverlayViewsMediator.
- Whenever a new class is added, make sure to also add that class to OverlayWindowModule. -->
- <string-array name="config_carSystemUIOverlayViewsMediators" translatable="false">
- <item>com.android.systemui.car.hvac.AutoDismissHvacPanelOverlayViewMediator</item>
- <item>com.android.systemui.car.keyguard.CarKeyguardOverlayViewMediator</item>
- <item>com.android.systemui.car.userswitcher.FullscreenUserSwitcherViewMediator</item>
- <item>com.android.systemui.car.userswitcher.UserSwitchTransitionViewMediator</item>
- <!-- add the below line to display welcome screen -->
- <item>com.android.systemui.car.loading.LoadingViewMediator</item>
- </string-array>
-
- <integer name="hvac_num_fan_speeds">8</integer>
-
- <integer name="config_hvacAutoDismissDurationMs">15000</integer>
-
- <!-- Allow foreground DA to have rounded corner -->
- <bool name="config_enableRoundedCornerForForegroundDisplayArea">false</bool>
-
- <string-array name="config_systemUIServiceComponentsInclude" translatable="false">
- <item>com.android.systemui.car.systembar.CarSystemBar</item>
- <item>com.android.systemui.car.voicerecognition.ConnectedDeviceVoiceRecognitionNotifier
- </item>
- <item>com.android.systemui.car.window.SystemUIOverlayWindowManager</item>
- <item>com.android.systemui.car.toast.CarToastUI</item>
- <item>com.android.systemui.car.volume.VolumeUI</item>
- <item>com.android.systemui.car.cluster.ClusterDisplayController</item>
- <item>com.android.systemui.car.displayarea.DisplayAreaComponent</item>
- </string-array>
-
- <string name="config_notificationCenterActivity" translatable="false">
- com.android.car.notification/.CarNotificationCenterActivity
- </string>
-
- <string-array name="config_readOnlyIconControllers" translatable="false">
- <item>com.android.systemui.car.statusicon.ui.StatusBarSensorInfoController</item>
- </string-array>
-
- <string name="config_VoiceAssistantActivity" translatable="false">
- com.google.android.carassistant/com.google.android.apps.gsa.binaries.auto.app.voiceplate.VoicePlateActivity
- </string>
-</resources>
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/dimens.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/dimens.xml
deleted file mode 100644
index beea0ed..0000000
--- a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/dimens.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2023 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<resources>
-
- <dimen name="car_quick_controls_footer_button_vertical_margin">10dp</dimen>
- <dimen name="car_quick_controls_footer_button_horizontal_margin">24dp</dimen>
- <dimen name="car_quick_controls_footer_button_min_height">56dp</dimen>
- <dimen name="car_quick_controls_footer_button_radius">@dimen/car_portrait_ui_button_radius</dimen>
- <dimen name="car_quick_controls_entry_points_start_margin">24dp</dimen>
- <dimen name="car_profile_switcher_padding_top">16dp</dimen>
- <dimen name="car_profile_quick_controls_panel_width">700dp</dimen>
-
- <dimen name="clock_elevation">5dp</dimen>
-
- <dimen name="hvac_container_padding">32dp</dimen>
- <dimen name="hvac_panel_handle_bar_container_height">16dp</dimen>
- <dimen name="hvac_panel_handle_bar_container_width">728dp</dimen>
- <dimen name="hvac_panel_handle_bar_height">6dp</dimen>
- <dimen name="hvac_panel_handle_bar_margin_top">17dp</dimen>
- <dimen name="hvac_panel_handle_bar_width">120dp</dimen>
- <dimen name="hvac_panel_bg_radius">@dimen/car_portrait_ui_window_rounded_corner_radius</dimen>
- <dimen name="hvac_panel_stroke_width">2dp</dimen>
- <dimen name="hvac_panel_off_button_radius">24dp</dimen>
- <dimen name="hvac_panel_on_button_radius">24dp</dimen>
- <dimen name="hvac_panel_seek_bar_radius">44dp</dimen>
- <dimen name="hvac_panel_full_expanded_height">392dp</dimen>
- <dimen name="hvac_panel_title_margin">36dp</dimen>
- <dimen name="hvac_panel_buttons_guideline">@dimen/hvac_panel_handle_bar_container_height</dimen>
- <dimen name="hvac_panel_icon_dimen">48dp</dimen>
- <dimen name="hvac_panel_tall_icon_dimen">108dp</dimen>
- <dimen name="hvac_panel_wide_icon_dimen">96dp</dimen>
- <dimen name="hvac_panel_button_dimen">88dp</dimen>
- <dimen name="hvac_panel_long_button_dimen">208dp</dimen>
- <dimen name="hvac_panel_airflow_button_width_1">210dp</dimen>
- <dimen name="hvac_panel_airflow_button_width_2">332dp</dimen>
- <dimen name="hvac_panel_slider_width">696dp</dimen>
- <dimen name="hvac_panel_button_external_margin">24dp</dimen>
- <dimen name="hvac_panel_button_external_top_margin">16dp</dimen>
- <dimen name="hvac_panel_button_external_bottom_margin">32dp</dimen>
- <dimen name="hvac_panel_button_internal_margin">32dp</dimen>
- <dimen name="hvac_temperature_text_size">56sp</dimen>
- <dimen name="hvac_temperature_text_padding">12dp</dimen>
- <dimen name="hvac_temperature_text_width">108dp</dimen>
- <dimen name="hvac_temperature_button_size">64dp</dimen>
-
- <item name="hvac_heat_or_cool_off_alpha" format="float" type="dimen">0.3</item>
-
- <dimen name="system_bar_icon_drawing_size">56dp</dimen>
- <dimen name="system_bar_button_size">88dp</dimen>
- <!-- Margin between the system bar buttons -->
- <dimen name="system_bar_button_margin">16dp</dimen>
- <!-- Padding between the system bar button and the icon within it -->
- <dimen name="system_bar_button_padding">16dp</dimen>
- <dimen name="system_bar_button_corner_radius">44dp</dimen>
- <dimen name="system_bar_button_corner_radius_selected">24dp</dimen>
- <dimen name="status_bar_system_icon_spacing">32dp</dimen>
- <dimen name="system_bar_background_pill_size">64dp</dimen>
- <dimen name="system_bar_minimize_icon_height">17dp</dimen>
- <dimen name="system_bar_minimize_icon_width">28dp</dimen>
-
-
- <dimen name="user_avatar_background_radius">13dp</dimen>
-
- <dimen name="privacy_chip_horizontal_padding">0dp</dimen>
- <dimen name="privacy_chip_width">@dimen/top_system_bar_icon_size</dimen>
- <!-- TODO(b/264936974): combine top_system_bar_qc_icon_drawing_size and top_system_bar_icon_drawing_size-->
- <dimen name="top_system_bar_qc_icon_drawing_size">30dp</dimen>
- <dimen name="top_system_bar_icon_drawing_size">42dp</dimen>
- <dimen name="top_system_bar_icon_size">64dp</dimen>
- <dimen name="top_system_bar_icon_horizontal_margin">20dp</dimen>
- <dimen name="top_system_bar_icon_selected_corner">13dp</dimen>
-
- <dimen name="car_status_icon_panel_border_radius">@dimen/car_portrait_ui_window_rounded_corner_radius</dimen>
- <dimen name="car_status_icon_panel_padding_bottom">18dp</dimen>
-
- <dimen name="dialog_button_bar_top_padding">0dp</dimen>
-
- <dimen name="pin_view_container_maxHeight">380dp</dimen>
- <dimen name="pattern_view_container_maxHeight">800dp</dimen>
-
- <!-- ****** Alert dialog dimens ***** -->
-
- <!-- Dialog corner radius -->
- <dimen name="alert_dialog_corner_radius">32dp</dimen>
- <!-- Dialog button corner radius -->
- <dimen name="alert_dialog_button_corner_radius">24dp</dimen>
- <!-- Dialog header size -->
- <dimen name="car_card_header_height">88dp</dimen>
- <!-- Dialog image size -->
- <dimen name="car_alert_dialog_title_image_size">@dimen/car_card_header_height</dimen>
- <!-- Dialog button layout height -->
- <dimen name="button_layout_height">88dp</dimen>
- <!-- Default dialog button margin -->
- <dimen name="car_alert_dialog_button_margin">16dp</dimen>
-</resources>
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/strings.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/strings.xml
deleted file mode 100644
index 7a55c7c..0000000
--- a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/strings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- ~ Copyright (C) 2023 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Format for temperature in the temperature control view (No decimal) -->
- <string name="hvac_temperature_format_fahrenheit" translatable="false">%.0f</string>
-
- <!-- HVAC panel header [CHAR LIMIT=40]-->
- <string name="hvac_panel_header">Comfort controls</string>
-
- <!-- Format for temperature in the temperature control view (No decimal) in fahrenheit -->
- <string name="statusbar_temperature_format_fahrenheit" translatable="false">%.0f\u00B0 F
- </string>
- <!-- Format for temperature in the temperature control view (No decimal) in celsius -->
- <string name="statusbar_temperature_format_celsius" translatable="false">%.0f\u00B0 C</string>
-</resources>
\ No newline at end of file
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/arrays.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/arrays.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/arrays.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/arrays.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/attrs.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/attrs.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/attrs.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/attrs.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/colors.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/colors.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/colors.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/colors.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/config.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/config.xml
index 29ae91f..4b1e043 100644
--- a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/config.xml
+++ b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/config.xml
@@ -16,10 +16,6 @@
-->
<resources>
- <string name="config_notificationCenterActivity" translatable="false">
- com.android.car.notification/.CarNotificationCenterActivity
- </string>
-
<!-- App drawer system bar button intent -->
<string name="system_bar_app_drawer_intent" translatable="false">intent:#Intent;action=com.android.car.carlauncher.ACTION_APP_GRID;package=com.android.car.portraitlauncher;launchFlags=0x24000000;end</string>
@@ -29,4 +25,45 @@
<bool name="config_registerCarSystemUIProxy">false</bool>
<!-- Determines whether Recents entry point should be shown / should trigger to open Recents -->
<bool name="config_enableRecentsEntryPoint">true</bool>
+
+ <!-- Car System UI's OverlayViewsMediator.
+ Whenever a new class is added, make sure to also add that class to OverlayWindowModule. -->
+ <string-array name="config_carSystemUIOverlayViewsMediators" translatable="false">
+ <item>com.android.systemui.car.hvac.AutoDismissHvacPanelOverlayViewMediator</item>
+ <item>com.android.systemui.car.keyguard.CarKeyguardOverlayViewMediator</item>
+ <item>com.android.systemui.car.userswitcher.FullscreenUserSwitcherViewMediator</item>
+ <item>com.android.systemui.car.userswitcher.UserSwitchTransitionViewMediator</item>
+ <!-- add the below line to display welcome screen -->
+ <item>com.android.systemui.car.loading.LoadingViewMediator</item>
+ </string-array>
+
+ <integer name="hvac_num_fan_speeds">8</integer>
+
+ <integer name="config_hvacAutoDismissDurationMs">15000</integer>
+
+ <!-- Allow foreground DA to have rounded corner -->
+ <bool name="config_enableRoundedCornerForForegroundDisplayArea">false</bool>
+
+ <string-array name="config_systemUIServiceComponentsInclude" translatable="false">
+ <item>com.android.systemui.car.systembar.CarSystemBar</item>
+ <item>com.android.systemui.car.voicerecognition.ConnectedDeviceVoiceRecognitionNotifier
+ </item>
+ <item>com.android.systemui.car.window.SystemUIOverlayWindowManager</item>
+ <item>com.android.systemui.car.toast.CarToastUI</item>
+ <item>com.android.systemui.car.volume.VolumeUI</item>
+ <item>com.android.systemui.car.cluster.ClusterDisplayController</item>
+ <item>com.android.systemui.car.displayarea.DisplayAreaComponent</item>
+ </string-array>
+
+ <string name="config_notificationCenterActivity" translatable="false">
+ com.android.car.notification/.CarNotificationCenterActivity
+ </string>
+
+ <string-array name="config_readOnlyIconControllers" translatable="false">
+ <item>com.android.systemui.car.statusicon.ui.StatusBarSensorInfoController</item>
+ </string-array>
+
+ <string name="config_VoiceAssistantActivity" translatable="false">
+ com.google.android.carassistant/com.google.android.apps.gsa.binaries.auto.app.voiceplate.VoicePlateActivity
+ </string>
</resources>
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/dimens.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/dimens.xml
index 5ad5fc1..2a5b9e1 100644
--- a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/dimens.xml
+++ b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/dimens.xml
@@ -17,4 +17,95 @@
<resources>
<dimen name="statusbar_sensor_text_width">88dp</dimen>
+
+ <dimen name="car_quick_controls_footer_button_vertical_margin">10dp</dimen>
+ <dimen name="car_quick_controls_footer_button_horizontal_margin">24dp</dimen>
+ <dimen name="car_quick_controls_footer_button_min_height">56dp</dimen>
+ <dimen name="car_quick_controls_footer_button_radius">@dimen/car_portrait_ui_button_radius</dimen>
+ <dimen name="car_quick_controls_entry_points_start_margin">24dp</dimen>
+ <dimen name="car_profile_switcher_padding_top">16dp</dimen>
+ <dimen name="car_profile_quick_controls_panel_width">700dp</dimen>
+
+ <dimen name="clock_elevation">5dp</dimen>
+
+ <dimen name="hvac_container_padding">32dp</dimen>
+ <dimen name="hvac_panel_handle_bar_container_height">16dp</dimen>
+ <dimen name="hvac_panel_handle_bar_container_width">728dp</dimen>
+ <dimen name="hvac_panel_handle_bar_height">6dp</dimen>
+ <dimen name="hvac_panel_handle_bar_margin_top">17dp</dimen>
+ <dimen name="hvac_panel_handle_bar_width">120dp</dimen>
+ <dimen name="hvac_panel_bg_radius">@dimen/car_portrait_ui_window_rounded_corner_radius</dimen>
+ <dimen name="hvac_panel_stroke_width">2dp</dimen>
+ <dimen name="hvac_panel_off_button_radius">24dp</dimen>
+ <dimen name="hvac_panel_on_button_radius">24dp</dimen>
+ <dimen name="hvac_panel_seek_bar_radius">44dp</dimen>
+ <dimen name="hvac_panel_full_expanded_height">392dp</dimen>
+ <dimen name="hvac_panel_title_margin">36dp</dimen>
+ <dimen name="hvac_panel_buttons_guideline">@dimen/hvac_panel_handle_bar_container_height</dimen>
+ <dimen name="hvac_panel_icon_dimen">48dp</dimen>
+ <dimen name="hvac_panel_tall_icon_dimen">108dp</dimen>
+ <dimen name="hvac_panel_wide_icon_dimen">96dp</dimen>
+ <dimen name="hvac_panel_button_dimen">88dp</dimen>
+ <dimen name="hvac_panel_long_button_dimen">208dp</dimen>
+ <dimen name="hvac_panel_airflow_button_width_1">210dp</dimen>
+ <dimen name="hvac_panel_airflow_button_width_2">332dp</dimen>
+ <dimen name="hvac_panel_slider_width">696dp</dimen>
+ <dimen name="hvac_panel_button_external_margin">24dp</dimen>
+ <dimen name="hvac_panel_button_external_top_margin">16dp</dimen>
+ <dimen name="hvac_panel_button_external_bottom_margin">32dp</dimen>
+ <dimen name="hvac_panel_button_internal_margin">32dp</dimen>
+ <dimen name="hvac_temperature_text_size">56sp</dimen>
+ <dimen name="hvac_temperature_text_padding">12dp</dimen>
+ <dimen name="hvac_temperature_text_width">108dp</dimen>
+ <dimen name="hvac_temperature_button_size">64dp</dimen>
+
+ <item name="hvac_heat_or_cool_off_alpha" format="float" type="dimen">0.3</item>
+
+ <dimen name="system_bar_icon_drawing_size">56dp</dimen>
+ <dimen name="system_bar_button_size">88dp</dimen>
+ <!-- Margin between the system bar buttons -->
+ <dimen name="system_bar_button_margin">16dp</dimen>
+ <!-- Padding between the system bar button and the icon within it -->
+ <dimen name="system_bar_button_padding">16dp</dimen>
+ <dimen name="system_bar_button_corner_radius">44dp</dimen>
+ <dimen name="system_bar_button_corner_radius_selected">24dp</dimen>
+ <dimen name="status_bar_system_icon_spacing">32dp</dimen>
+ <dimen name="system_bar_background_pill_size">64dp</dimen>
+ <dimen name="system_bar_minimize_icon_height">17dp</dimen>
+ <dimen name="system_bar_minimize_icon_width">28dp</dimen>
+
+
+ <dimen name="user_avatar_background_radius">13dp</dimen>
+
+ <dimen name="privacy_chip_horizontal_padding">0dp</dimen>
+ <dimen name="privacy_chip_width">@dimen/top_system_bar_icon_size</dimen>
+ <!-- TODO(b/264936974): combine top_system_bar_qc_icon_drawing_size and top_system_bar_icon_drawing_size-->
+ <dimen name="top_system_bar_qc_icon_drawing_size">30dp</dimen>
+ <dimen name="top_system_bar_icon_drawing_size">42dp</dimen>
+ <dimen name="top_system_bar_icon_size">64dp</dimen>
+ <dimen name="top_system_bar_icon_horizontal_margin">20dp</dimen>
+ <dimen name="top_system_bar_icon_selected_corner">13dp</dimen>
+
+ <dimen name="car_status_icon_panel_border_radius">@dimen/car_portrait_ui_window_rounded_corner_radius</dimen>
+ <dimen name="car_status_icon_panel_padding_bottom">18dp</dimen>
+
+ <dimen name="dialog_button_bar_top_padding">0dp</dimen>
+
+ <dimen name="pin_view_container_maxHeight">380dp</dimen>
+ <dimen name="pattern_view_container_maxHeight">800dp</dimen>
+
+ <!-- ****** Alert dialog dimens ***** -->
+
+ <!-- Dialog corner radius -->
+ <dimen name="alert_dialog_corner_radius">32dp</dimen>
+ <!-- Dialog button corner radius -->
+ <dimen name="alert_dialog_button_corner_radius">24dp</dimen>
+ <!-- Dialog header size -->
+ <dimen name="car_card_header_height">88dp</dimen>
+ <!-- Dialog image size -->
+ <dimen name="car_alert_dialog_title_image_size">@dimen/car_card_header_height</dimen>
+ <!-- Dialog button layout height -->
+ <dimen name="button_layout_height">88dp</dimen>
+ <!-- Default dialog button margin -->
+ <dimen name="car_alert_dialog_button_margin">16dp</dimen>
</resources>
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/ids.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/ids.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/ids.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/ids.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/integers.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/integers.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/integers.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/integers.xml
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/strings.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/strings.xml
index 2c0cb55..a2572ed 100644
--- a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/strings.xml
+++ b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/strings.xml
@@ -26,4 +26,16 @@
<string name="current_profile_subtitle">Current profile</string>
<string name="loading_welcome_message">AAOS</string>
<string name="loading_action_button_text">Continue</string>
+
+ <!-- Format for temperature in the temperature control view (No decimal) -->
+ <string name="hvac_temperature_format_fahrenheit" translatable="false">%.0f</string>
+
+ <!-- HVAC panel header [CHAR LIMIT=40]-->
+ <string name="hvac_panel_header">Comfort controls</string>
+
+ <!-- Format for temperature in the temperature control view (No decimal) in fahrenheit -->
+ <string name="statusbar_temperature_format_fahrenheit" translatable="false">%.0f\u00B0 F
+ </string>
+ <!-- Format for temperature in the temperature control view (No decimal) in celsius -->
+ <string name="statusbar_temperature_format_celsius" translatable="false">%.0f\u00B0 C</string>
</resources>
\ No newline at end of file
diff --git a/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/styles.xml b/car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/styles.xml
similarity index 100%
rename from car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values-port/styles.xml
rename to car_product/car_ui_portrait/apps/CarUiPortraitSystemUI/res/values/styles.xml
