Merge branch 'devel' of https://github.com/henrichg/PhoneProfilesPlus

# Conflicts: # RootShell/build.gradle # RootTools/build.gradle # noobcameraflash/build.gradle # phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PreferenceAllowed.java
henrichg · Nov 1, 2024 · 76e0fe9 · 76e0fe9
2 parents 1d70a32 + 2620f58
commit 76e0fe9
Show file tree

Hide file tree

Showing 1,073 changed files with 26,612 additions and 12,254 deletions.
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.androidTest.iml b/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.androidTest.iml
diff --git a/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.iml b/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.iml
diff --git a/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.main.iml b/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.main.iml
diff --git a/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.unitTest.iml b/.idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.unitTest.iml
diff --git a/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.androidTest.iml b/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.androidTest.iml
diff --git a/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.iml b/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.iml
diff --git a/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.main.iml b/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.main.iml
diff --git a/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.unitTest.iml b/.idea/modules/RootShell/PhoneProfilesPlus.RootShell.unitTest.iml