From 4c091fffcc426d38ac7b0d5454f3787c7e4b710a Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Tue, 6 Dec 2022 20:28:21 +0800 Subject: [PATCH] Add back resources exported for external usage These resources are not used by Settings, but is exported for external usage by other apps. Put them into res-export folder and add a README to prevent from accidentally clean ups. Bug: 234570979 Test: make Settings Change-Id: Ia46e94f4ece6a40edf95b47188f45659650d443c --- Android.bp | 6 ++++- res-export/.README.md | 4 +++ .../drawable/ic_ota_update_available.xml | 25 +++++++++++++++++ res-export/drawable/ic_ota_update_current.xml | 25 +++++++++++++++++ res-export/drawable/ic_ota_update_none.xml | 25 +++++++++++++++++ res-export/drawable/ic_ota_update_stale.xml | 25 +++++++++++++++++ .../ic_partial_system_update_current.xml | 27 +++++++++++++++++++ .../ic_partial_system_update_stale.xml | 27 +++++++++++++++++++ 8 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 res-export/.README.md create mode 100644 res-export/drawable/ic_ota_update_available.xml create mode 100644 res-export/drawable/ic_ota_update_current.xml create mode 100644 res-export/drawable/ic_ota_update_none.xml create mode 100644 res-export/drawable/ic_ota_update_stale.xml create mode 100644 res-export/drawable/ic_partial_system_update_current.xml create mode 100644 res-export/drawable/ic_partial_system_update_stale.xml diff --git a/Android.bp b/Android.bp index 37ddf93abc6..b5dfe7911c9 100644 --- a/Android.bp +++ b/Android.bp @@ -55,7 +55,11 @@ android_library { ], srcs: ["src/**/*.java", "src/**/*.kt"], - resource_dirs: ["res", "res-product"], + resource_dirs: [ + "res", + "res-export", // for external usage + "res-product", + ], static_libs: [ "androidx-constraintlayout_constraintlayout", "androidx.slice_slice-builders", diff --git a/res-export/.README.md b/res-export/.README.md new file mode 100644 index 00000000000..42b788e9077 --- /dev/null +++ b/res-export/.README.md @@ -0,0 +1,4 @@ +### Resources exported for external usage + +This folder contains the resources which is **not** used by Settings, but is +exported for external usage by other apps. diff --git a/res-export/drawable/ic_ota_update_available.xml b/res-export/drawable/ic_ota_update_available.xml new file mode 100644 index 00000000000..58412a20305 --- /dev/null +++ b/res-export/drawable/ic_ota_update_available.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res-export/drawable/ic_ota_update_current.xml b/res-export/drawable/ic_ota_update_current.xml new file mode 100644 index 00000000000..7b80a2359c8 --- /dev/null +++ b/res-export/drawable/ic_ota_update_current.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res-export/drawable/ic_ota_update_none.xml b/res-export/drawable/ic_ota_update_none.xml new file mode 100644 index 00000000000..0838ad3b447 --- /dev/null +++ b/res-export/drawable/ic_ota_update_none.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res-export/drawable/ic_ota_update_stale.xml b/res-export/drawable/ic_ota_update_stale.xml new file mode 100644 index 00000000000..0838ad3b447 --- /dev/null +++ b/res-export/drawable/ic_ota_update_stale.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res-export/drawable/ic_partial_system_update_current.xml b/res-export/drawable/ic_partial_system_update_current.xml new file mode 100644 index 00000000000..6e16592a4f1 --- /dev/null +++ b/res-export/drawable/ic_partial_system_update_current.xml @@ -0,0 +1,27 @@ + + + + + diff --git a/res-export/drawable/ic_partial_system_update_stale.xml b/res-export/drawable/ic_partial_system_update_stale.xml new file mode 100644 index 00000000000..905187c1058 --- /dev/null +++ b/res-export/drawable/ic_partial_system_update_stale.xml @@ -0,0 +1,27 @@ + + + + +