mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-27 02:20:05 +00:00
Code Activity

Introjucer: added some android manifest options, and fixed audio input permissions for the demo app.

Browse source
This commit is contained in:
jules 2012-02-21 10:02:10 +00:00
parent d3d391ae7f
commit 092a0166cc
6 changed files with 62 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

34
extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h
View file

@ -63,6 +63,9 @@ public:
if (getNDKPath().toString().isEmpty())
getNDKPath() = "${user.home}/SDKs/android-ndk-r7";
if (getMinimumSDKVersion().toString().isEmpty())
getMinimumSDKVersion() = 7;
if (getInternetNeeded().toString().isEmpty())
getInternetNeeded() = true;
}
@ -100,12 +103,21 @@ public:
props.add (new BooleanPropertyComponent (getInternetNeeded(), "Internet Access", "Specify internet access permission in the manifest"),
"If enabled, this will set the android.permission.INTERNET flag in the manifest.");
props.add (new BooleanPropertyComponent (getAudioRecordNeeded(), "Audio Input Required", "Specify audio record permission in the manifest"),
"If enabled, this will set the android.permission.RECORD_AUDIO flag in the manifest.");
props.add (new TextPropertyComponent (getOtherPermissions(), "Custom permissions", 2048, false),
"A space-separated list of other permission flags that should be added to the manifest.");
}
Value getActivityClassPath() const { return getSetting (Ids::androidActivityClass); }
Value getSDKPath() const { return getSetting (Ids::androidSDKPath); }
Value getNDKPath() const { return getSetting (Ids::androidNDKPath); }
Value getInternetNeeded() const { return getSetting (Ids::androidInternetNeeded); }
Value getAudioRecordNeeded() const { return getSetting (Ids::androidMicNeeded); }
Value getMinimumSDKVersion() const { return getSetting (Ids::androidMinimumSDK); }
Value getOtherPermissions() const { return getSetting (Ids::androidOtherPermissions); }
String createDefaultClassName() const
{
@ -224,10 +236,13 @@ private:
//screens->setAttribute ("android:xlargeScreens", "true");
screens->setAttribute ("android:anyDensity", "true");
if (getInternetNeeded().getValue())
manifest->createNewChildElement ("uses-sdk")->setAttribute ("android:minSdkVersion", getMinimumSDKVersion().toString());
{
XmlElement* permission = manifest->createNewChildElement ("uses-permission");
permission->setAttribute ("android:name", "android.permission.INTERNET");
const StringArray permissions (getPermissionsRequired());
for (int i = permissions.size(); --i >= 0;)
manifest->createNewChildElement ("uses-permission")->setAttribute ("android:name", permissions[i]);
}
XmlElement* app = manifest->createNewChildElement ("application");
@ -245,6 +260,19 @@ private:
return manifest;
}
StringArray getPermissionsRequired() const
{
StringArray s;
s.addTokens (getOtherPermissions().toString(), ", ", "");
if (getInternetNeeded().getValue()) s.add ("android.permission.INTERNET");
if (getAudioRecordNeeded().getValue()) s.add ("android.permission.RECORD_AUDIO");
s.trim();
s.removeDuplicates (false);
return s;
}
//==============================================================================
void findAllFilesToCompile (const Project::Item& projectItem, Array<RelativePath>& results)
{

3
extras/Introjucer/Source/Utility/jucer_PresetIDs.h
View file

@ -102,6 +102,9 @@ namespace Ids
DECLARE_ID (androidNDKPath);
DECLARE_ID (androidInternetNeeded);
DECLARE_ID (androidArchitectures);
DECLARE_ID (androidMicNeeded);
DECLARE_ID (androidMinimumSDK);
DECLARE_ID (androidOtherPermissions);
const Identifier class_ ("class");
#undef DECLARE_ID