From ec05005cfec103a4c8862e5bed186e10572f6e17 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 14 Feb 2024 20:35:43 +0200 Subject: [PATCH] SetupWizard: Make it REUSE compliant * Ignored all the strings.xml since they are auto-synced Change-Id: I5d9e7aa5ae7b0079f792450f7e6dbf83216ebac4 --- .gitignore | 1 - .reuse/dep5 | 10 +++ Android.bp | 15 +--- AndroidManifest.xml | 17 +---- LICENSES/Apache-2.0.txt | 73 +++++++++++++++++++ exit_wizard.sh | 3 + ...pp_whitelist_org.lineageos.setupwizard.xml | 15 +--- proguard.flags | 4 + res/anim/translucent_enter.xml | 18 +---- res/anim/translucent_exit.xml | 18 +---- res/color/button_bar_text.xml | 16 +--- res/drawable/background.xml | 15 +--- res/drawable/divider.xml | 15 +--- res/drawable/ic_datetime.xml | 15 +--- res/drawable/ic_dialer.xml | 15 +--- res/drawable/ic_eye.xml | 15 +--- res/drawable/ic_features.xml | 15 +--- res/drawable/ic_launcher_background.xml | 1 + res/drawable/ic_launcher_foreground.xml | 1 + res/drawable/ic_locale.xml | 15 +--- res/drawable/ic_location.xml | 15 +--- res/drawable/ic_navigation.xml | 5 +- res/drawable/ic_restore.xml | 10 ++- res/drawable/ic_sim.xml | 15 +--- res/drawable/ic_system_update.xml | 16 +--- res/drawable/ic_theme.xml | 16 +--- res/drawable/logo.xml | 15 +--- res/layout-television/welcome_activity.xml | 17 +---- .../date_time_setup_custom_list_item_2.xml | 15 +--- res/layout/divider.xml | 15 +--- res/layout/finish_activity.xml | 17 +---- res/layout/intro_restore_activity.xml | 17 +---- res/layout/locale_picker.xml | 18 +---- res/layout/locale_picker_item.xml | 15 +--- res/layout/location_settings.xml | 17 +---- res/layout/navigation_layout.xml | 15 +--- res/layout/setup_datetime_page.xml | 17 +---- res/layout/setup_device_specific.xml | 16 +--- res/layout/setup_lineage_settings.xml | 17 +---- res/layout/setup_loading_page.xml | 17 +---- res/layout/setup_locale.xml | 17 +---- res/layout/setup_navigation.xml | 15 +--- res/layout/setup_theme.xml | 15 +--- res/layout/sim_missing_page.xml | 17 +---- res/layout/update_recovery_page.xml | 17 +---- res/layout/welcome_activity.xml | 17 +---- res/raw-television/lineage_wizard_script.xml | 19 +---- res/raw/lineage_wizard_script.xml | 19 +---- .../lineage_wizard_script_managed_profile.xml | 20 +---- res/raw/lineage_wizard_script_user.xml | 18 +---- res/raw/wizard_script.xml | 19 +---- res/raw/wizard_script_user.xml | 18 +---- res/values-night/colors.xml | 2 +- res/values-night/styles.xml | 2 +- res/values-television/config.xml | 15 +--- res/values-television/dimens.xml | 15 +--- res/values-television/styles.xml | 15 +--- res/values-v31/colors.xml | 15 +--- res/values/attrs.xml | 18 +---- res/values/colors.xml | 17 +---- res/values/config.xml | 17 +---- res/values/dimens.xml | 17 +---- res/values/ids.xml | 6 +- res/values/strings.xml | 17 +---- res/values/styles.xml | 17 +---- .../setupwizard/BaseSetupWizardActivity.java | 17 +---- .../setupwizard/BiometricActivity.java | 17 +---- .../setupwizard/BluetoothSetupActivity.java | 17 +---- .../setupwizard/DateTimeActivity.java | 17 +---- .../setupwizard/DeviceSpecificActivity.java | 15 +--- .../lineageos/setupwizard/FinishActivity.java | 17 +---- .../setupwizard/LineageSettingsActivity.java | 17 +---- .../lineageos/setupwizard/LocaleActivity.java | 17 +---- .../setupwizard/LocationSettingsActivity.java | 17 +---- .../setupwizard/NavigationLayout.java | 15 +--- .../NavigationSettingsActivity.java | 15 +--- .../setupwizard/NetworkSetupActivity.java | 17 +---- .../setupwizard/PartnerReceiver.java | 15 +--- .../setupwizard/ScreenLockActivity.java | 17 +---- .../setupwizard/SetupWizardActivity.java | 17 +---- .../lineageos/setupwizard/SetupWizardApp.java | 17 +---- .../setupwizard/SetupWizardExitWorker.java | 15 +--- .../setupwizard/SimMissingActivity.java | 17 +---- .../setupwizard/SubBaseActivity.java | 15 +--- .../setupwizard/ThemeSettingsActivity.java | 15 +--- .../setupwizard/UpdateRecoveryActivity.java | 15 +--- .../setupwizard/WelcomeActivity.java | 17 +---- .../backup/RestoreIntroActivity.java | 17 +---- .../setupwizard/util/SetupWizardUtils.java | 17 +---- .../setupwizard/widget/LocalePicker.java | 17 +---- .../wizardmanager/WizardAction.java | 17 +---- .../wizardmanager/WizardManager.java | 17 +---- .../wizardmanager/WizardScript.java | 17 +---- .../wizardmanager/WizardTransitions.java | 17 +---- start_lineage_wizard.sh | 3 + start_lineage_wizard_with_gms.sh | 3 + 96 files changed, 329 insertions(+), 1140 deletions(-) delete mode 100644 .gitignore create mode 100644 .reuse/dep5 create mode 100644 LICENSES/Apache-2.0.txt diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1736165d..00000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -values-v1 diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 00000000..5a6b204e --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,10 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: SetupWizard +Upstream-Contact: The LineageOS Project +Source: https://github.com/LineageOS/android_packages_apps_SetupWizard + +Files: res/raw/lottie_system_nav_2_button.json + res/raw/lottie_system_nav_3_button.json + res/raw/lottie_system_nav_fully_gestural.json +Copyright: 2019 The Android Open Source Project +License: Apache-2.0 diff --git a/Android.bp b/Android.bp index aa4226ba..51ca78b7 100644 --- a/Android.bp +++ b/Android.bp @@ -1,17 +1,6 @@ // -// Copyright (C) 2021-2024 The LineageOS 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. +// SPDX-FileCopyrightText: 2021-2024 The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 // android_app { diff --git a/AndroidManifest.xml b/AndroidManifest.xml index cce6703d..69a15f3d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,19 +1,8 @@ diff --git a/proguard.flags b/proguard.flags index 482010ee..1bf1f0a8 100644 --- a/proguard.flags +++ b/proguard.flags @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2015 The CyanogenMod Project +# SPDX-FileCopyrightText: 2017-2019 The LineageOS Project +# SPDX-License-Identifier: Apache-2.0 + -keep class * extends java.util.ListResourceBundle { protected Object[][] getContents(); } diff --git a/res/anim/translucent_enter.xml b/res/anim/translucent_enter.xml index 58568e61..5423be47 100644 --- a/res/anim/translucent_enter.xml +++ b/res/anim/translucent_enter.xml @@ -1,22 +1,8 @@ - - - diff --git a/res/drawable/background.xml b/res/drawable/background.xml index 18523e0f..2155bd49 100644 --- a/res/drawable/background.xml +++ b/res/drawable/background.xml @@ -1,18 +1,7 @@ diff --git a/res/drawable/divider.xml b/res/drawable/divider.xml index 69d6de65..9ccc88a1 100644 --- a/res/drawable/divider.xml +++ b/res/drawable/divider.xml @@ -1,18 +1,7 @@ diff --git a/res/drawable/ic_datetime.xml b/res/drawable/ic_datetime.xml index 82f94555..ff918ace 100644 --- a/res/drawable/ic_datetime.xml +++ b/res/drawable/ic_datetime.xml @@ -1,18 +1,7 @@ + diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml index 683ce465..073434e0 100644 --- a/res/drawable/ic_launcher_foreground.xml +++ b/res/drawable/ic_launcher_foreground.xml @@ -9,6 +9,7 @@ android:height="108dp" android:viewportWidth="108" android:viewportHeight="108"> + + - diff --git a/res/drawable/ic_restore.xml b/res/drawable/ic_restore.xml index c6ae3026..f552e5d2 100644 --- a/res/drawable/ic_restore.xml +++ b/res/drawable/ic_restore.xml @@ -1,9 +1,15 @@ + + + diff --git a/res/drawable/ic_sim.xml b/res/drawable/ic_sim.xml index d4519d54..f635a3fe 100644 --- a/res/drawable/ic_sim.xml +++ b/res/drawable/ic_sim.xml @@ -1,18 +1,7 @@ + diff --git a/res/drawable/ic_theme.xml b/res/drawable/ic_theme.xml index 488a8686..15ab416e 100644 --- a/res/drawable/ic_theme.xml +++ b/res/drawable/ic_theme.xml @@ -1,24 +1,14 @@ + diff --git a/res/drawable/logo.xml b/res/drawable/logo.xml index b3793e45..1828e873 100644 --- a/res/drawable/logo.xml +++ b/res/drawable/logo.xml @@ -1,18 +1,7 @@ - - - - diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml index 1ba5067e..0befc2b9 100644 --- a/res/raw/lineage_wizard_script.xml +++ b/res/raw/lineage_wizard_script.xml @@ -1,22 +1,9 @@ - - diff --git a/res/raw/lineage_wizard_script_managed_profile.xml b/res/raw/lineage_wizard_script_managed_profile.xml index 37c974a3..6a4d1e55 100644 --- a/res/raw/lineage_wizard_script_managed_profile.xml +++ b/res/raw/lineage_wizard_script_managed_profile.xml @@ -1,22 +1,10 @@ - - diff --git a/res/raw/lineage_wizard_script_user.xml b/res/raw/lineage_wizard_script_user.xml index f39fa0ea..aef7f2e4 100644 --- a/res/raw/lineage_wizard_script_user.xml +++ b/res/raw/lineage_wizard_script_user.xml @@ -1,21 +1,9 @@ - - diff --git a/res/raw/wizard_script.xml b/res/raw/wizard_script.xml index 138abc7f..38ec2671 100644 --- a/res/raw/wizard_script.xml +++ b/res/raw/wizard_script.xml @@ -1,20 +1,8 @@ - - diff --git a/res/raw/wizard_script_user.xml b/res/raw/wizard_script_user.xml index 40c695e6..709b75f5 100644 --- a/res/raw/wizard_script_user.xml +++ b/res/raw/wizard_script_user.xml @@ -1,20 +1,8 @@ - diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml index 2c385a1b..9b028e83 100644 --- a/res/values-night/styles.xml +++ b/res/values-night/styles.xml @@ -1,6 +1,6 @@ diff --git a/res/values-television/config.xml b/res/values-television/config.xml index 24f6a1de..f5f827eb 100644 --- a/res/values-television/config.xml +++ b/res/values-television/config.xml @@ -1,18 +1,7 @@ true diff --git a/res/values-television/dimens.xml b/res/values-television/dimens.xml index 1642403a..1fe104f1 100644 --- a/res/values-television/dimens.xml +++ b/res/values-television/dimens.xml @@ -1,18 +1,7 @@ 56dp diff --git a/res/values-television/styles.xml b/res/values-television/styles.xml index 8d16f340..d323b529 100644 --- a/res/values-television/styles.xml +++ b/res/values-television/styles.xml @@ -1,18 +1,7 @@