From f276536930080fad2e5d72ef413eb8293295cdc0 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Wed, 28 Oct 2020 11:12:20 +0530 Subject: [PATCH 1/3] Add Camera Icons Change-Id: I3910d81891336951fd211644503df92a712d7081 --- .../res/res/drawable/ic_camera_effects.xml | 16 ++++++++++ .../res/res/drawable/ic_camera_exposure.xml | 15 ++++++++++ .../drawable/ic_camera_exposure_locked.xml | 20 +++++++++++++ .../drawable/ic_camera_exposure_unlocked.xml | 20 +++++++++++++ .../res/res/drawable/ic_camera_flash_auto.xml | 29 +++++++++++++++++++ .../res/res/drawable/ic_camera_flash_off.xml | 29 +++++++++++++++++++ .../res/res/drawable/ic_camera_flash_on.xml | 25 ++++++++++++++++ .../res/res/drawable/ic_camera_settings.xml | 16 ++++++++++ .../res/res/drawable/ic_camera_shutter.xml | 19 ++++++++++++ lineage/res/res/drawable/ic_camera_toggle.xml | 16 ++++++++++ lineage/res/res/drawable/ic_camera_video.xml | 16 ++++++++++ lineage/res/res/values/public.xml | 12 ++++++++ 12 files changed, 233 insertions(+) create mode 100644 lineage/res/res/drawable/ic_camera_effects.xml create mode 100644 lineage/res/res/drawable/ic_camera_exposure.xml create mode 100644 lineage/res/res/drawable/ic_camera_exposure_locked.xml create mode 100644 lineage/res/res/drawable/ic_camera_exposure_unlocked.xml create mode 100644 lineage/res/res/drawable/ic_camera_flash_auto.xml create mode 100644 lineage/res/res/drawable/ic_camera_flash_off.xml create mode 100644 lineage/res/res/drawable/ic_camera_flash_on.xml create mode 100644 lineage/res/res/drawable/ic_camera_settings.xml create mode 100644 lineage/res/res/drawable/ic_camera_shutter.xml create mode 100644 lineage/res/res/drawable/ic_camera_toggle.xml create mode 100644 lineage/res/res/drawable/ic_camera_video.xml diff --git a/lineage/res/res/drawable/ic_camera_effects.xml b/lineage/res/res/drawable/ic_camera_effects.xml new file mode 100644 index 00000000..71abcc8e --- /dev/null +++ b/lineage/res/res/drawable/ic_camera_effects.xml @@ -0,0 +1,16 @@ + + + + diff --git a/lineage/res/res/drawable/ic_camera_exposure.xml b/lineage/res/res/drawable/ic_camera_exposure.xml new file mode 100644 index 00000000..3a7a1d75 --- /dev/null +++ b/lineage/res/res/drawable/ic_camera_exposure.xml @@ -0,0 +1,15 @@ + + + + diff --git a/lineage/res/res/drawable/ic_camera_exposure_locked.xml b/lineage/res/res/drawable/ic_camera_exposure_locked.xml new file mode 100644 index 00000000..65a4d840 --- /dev/null +++ b/lineage/res/res/drawable/ic_camera_exposure_locked.xml @@ -0,0 +1,20 @@ + + + + + diff --git a/lineage/res/res/drawable/ic_camera_exposure_unlocked.xml b/lineage/res/res/drawable/ic_camera_exposure_unlocked.xml new file mode 100644 index 00000000..49b7f825 --- /dev/null +++ b/lineage/res/res/drawable/ic_camera_exposure_unlocked.xml @@ -0,0 +1,20 @@ + + + + + diff --git a/lineage/res/res/drawable/ic_camera_flash_auto.xml b/lineage/res/res/drawable/ic_camera_flash_auto.xml new file mode 100644 index 00000000..e6dd1aae --- /dev/null +++ b/lineage/res/res/drawable/ic_camera_flash_auto.xml @@ -0,0 +1,29 @@ + + + + + + + diff --git a/lineage/res/res/drawable/ic_camera_flash_off.xml b/lineage/res/res/drawable/ic_camera_flash_off.xml new file mode 100644 index 00000000..490e6d59 --- /dev/null +++ b/lineage/res/res/drawable/ic_camera_flash_off.xml @@ -0,0 +1,29 @@ + + + + + + + diff --git a/lineage/res/res/drawable/ic_camera_flash_on.xml b/lineage/res/res/drawable/ic_camera_flash_on.xml new file mode 100644 index 00000000..f283e4fd --- /dev/null +++ b/lineage/res/res/drawable/ic_camera_flash_on.xml @@ -0,0 +1,25 @@ + + + + + + diff --git a/lineage/res/res/drawable/ic_camera_settings.xml b/lineage/res/res/drawable/ic_camera_settings.xml new file mode 100644 index 00000000..26246abe --- /dev/null +++ b/lineage/res/res/drawable/ic_camera_settings.xml @@ -0,0 +1,16 @@ + + + + diff --git a/lineage/res/res/drawable/ic_camera_shutter.xml b/lineage/res/res/drawable/ic_camera_shutter.xml new file mode 100644 index 00000000..9a065db7 --- /dev/null +++ b/lineage/res/res/drawable/ic_camera_shutter.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/lineage/res/res/drawable/ic_camera_toggle.xml b/lineage/res/res/drawable/ic_camera_toggle.xml new file mode 100644 index 00000000..7707cf99 --- /dev/null +++ b/lineage/res/res/drawable/ic_camera_toggle.xml @@ -0,0 +1,16 @@ + + + + diff --git a/lineage/res/res/drawable/ic_camera_video.xml b/lineage/res/res/drawable/ic_camera_video.xml new file mode 100644 index 00000000..110448a5 --- /dev/null +++ b/lineage/res/res/drawable/ic_camera_video.xml @@ -0,0 +1,16 @@ + + + + diff --git a/lineage/res/res/values/public.xml b/lineage/res/res/values/public.xml index 9d7745eb..6fd2b4f0 100644 --- a/lineage/res/res/values/public.xml +++ b/lineage/res/res/values/public.xml @@ -28,4 +28,16 @@ + + + + + + + + + + + + -- GitLab From 53ebf29c57e616155e29c32cf2861da742aa5ab7 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Wed, 28 Oct 2020 14:32:49 +0530 Subject: [PATCH 2/3] Modify sdk build script to use latest build tool Change-Id: Icbb5b35df9746b955554357cd6ec347ecda79bea --- buildSdk.sh | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/buildSdk.sh b/buildSdk.sh index ae264069..8a722ecc 100755 --- a/buildSdk.sh +++ b/buildSdk.sh @@ -8,10 +8,27 @@ if [[ -z "${ANDROID_HOME}" ]]; then echo "{ANDROID_HOME} path variable is not set. Set it to point Android SDK." exit 1 else - build_tools_dir=$ANDROID_HOME/build-tools/29.0.2/ + build_tools_dir=$ANDROID_HOME/build-tools/ + declare -a build_tools + for f in $build_tools_dir*; + do + if [ -d "$f" ]; then + build_tools+=($(basename $f)) + fi + done + if [ ${#build_tools[@]} -eq 0 ]; then + echo "No build-tools found at $build_tools_dir. Make sure you've atleast one build tools downloaded." + exit 1 + else + sorted_build_tools=($(for l in ${build_tools[@]}; do echo $l; done | sort)) + echo "Available build-tools are ${sorted_build_tools[@]}" + latest_build_tool=${sorted_build_tools[${#sorted_build_tools[@]}-1]} + echo "Using latest build tool available: $latest_build_tool" + fi fi -aapt2="${build_tools_dir}/aapt2" +latest_build_tool_dir="$build_tools_dir$latest_build_tool" +aapt2="${latest_build_tool_dir}/aapt2" echo "Compiling resources" $aapt2 compile --dir lineage/res/res -o intermediates/resources.zip -- GitLab From e397646f5ff37927f62c8f641ec325fbafd5a8ab Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 9 Nov 2020 11:51:49 +0530 Subject: [PATCH 3/3] Add camera photo icon Change-Id: I379a27d8f12a2e98af080d50d0c4cbb09ff45f66 --- lineage/res/res/drawable/ic_camera_photo.xml | 11 +++++++++++ lineage/res/res/values/public.xml | 1 + 2 files changed, 12 insertions(+) create mode 100644 lineage/res/res/drawable/ic_camera_photo.xml diff --git a/lineage/res/res/drawable/ic_camera_photo.xml b/lineage/res/res/drawable/ic_camera_photo.xml new file mode 100644 index 00000000..56501616 --- /dev/null +++ b/lineage/res/res/drawable/ic_camera_photo.xml @@ -0,0 +1,11 @@ + + + diff --git a/lineage/res/res/values/public.xml b/lineage/res/res/values/public.xml index 6fd2b4f0..068b1f1a 100644 --- a/lineage/res/res/values/public.xml +++ b/lineage/res/res/values/public.xml @@ -39,5 +39,6 @@ + -- GitLab