birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The default android platform settings refer to lumberyard #3881 (#7073)

Browse Source 
* WIP

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Commit before merging

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Added new pngs

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Fixed CRC errors

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
This commit is contained in:
John Jones-Steele
2022-01-25 11:49:05 +00:00
committed by GitHub
parent d346d45848
commit 601858978f
41 changed files with 124 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/MainWindow.h
+5 -5
View File
@@ -64,11 +64,11 @@ namespace AzToolsFramework
//! @name Reverse URLs.
//! Used to identify common actions and override them when necessary.
//@{
constexpr inline AZ::Crc32 EditModeMove = AZ_CRC_CE("com.o3de.action.editor.editmode.move");
constexpr inline AZ::Crc32 EditModeRotate = AZ_CRC_CE("com.o3de.action.editor.editmode.rotate");
constexpr inline AZ::Crc32 EditModeScale = AZ_CRC_CE("com.o3de.action.editor.editmode.scale");
constexpr inline AZ::Crc32 SnapToGrid = AZ_CRC_CE("com.o3de.action.editor.snaptogrid");
constexpr inline AZ::Crc32 SnapAngle = AZ_CRC_CE("com.o3de.action.editor.snapangle");
constexpr inline AZ::Crc32 EditModeMove = AZ_CRC_CE("org.o3de.action.editor.editmode.move");
constexpr inline AZ::Crc32 EditModeRotate = AZ_CRC_CE("org.o3de.action.editor.editmode.rotate");
constexpr inline AZ::Crc32 EditModeScale = AZ_CRC_CE("org.o3de.action.editor.editmode.scale");
constexpr inline AZ::Crc32 SnapToGrid = AZ_CRC_CE("org.o3de.action.editor.snaptogrid");
constexpr inline AZ::Crc32 SnapAngle = AZ_CRC_CE("org.o3de.action.editor.snapangle");
//@}
}
Code/Framework/AzAndroid/java/com/amazon/lumberyard/LumberyardActivity.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class LumberyardActivity extends NativeActivity
////////////////////////////////////////////////////////////////
// called from the native to get the application package name
// e.g. com.lumberyard.samples for SamplesProject
// e.g. org.o3de.samples for SamplesProject
public String GetPackageName()
{
return getApplicationContext().getPackageName();
Code/Framework/AzCore/AzCore/Android/AndroidEnv.h
+1 -1
View File
@@ -116,7 +116,7 @@ namespace AZ
const char* GetObbStoragePath() const { return m_obbStoragePath.c_str(); }
//! Get the dot separated package name for the current application.
//! e.g. com.lumberyard.samples for SamplesProject
//! e.g. org.o3de.samples for SamplesProject
const char* GetPackageName() const { return m_packageName.c_str(); }
//! Get the app version code (android:versionCode in the manifest).
Code/Framework/AzCore/AzCore/Android/Utils.h
+1 -1
View File
@@ -52,7 +52,7 @@ namespace AZ
const char* GetObbStoragePath();
//! Get the dot separated package name for the current application.
//! e.g. com.o3de.samples for SamplesProject
//! e.g. org.o3de.samples for SamplesProject
const char* GetPackageName();
//! Get the app version code (android:versionCode in the manifest).
Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h
+1 -1
View File
@@ -86,7 +86,7 @@
#define AZ_TRAIT_SYSTEMFILE_INVALID_HANDLE nullptr
#define AZ_TRAIT_SYSTEMFILE_FSYNC_IS_DEFINED 1
#define AZ_TRAIT_SYSTEMFILE_UNIX_LIKE_PLATFORM_IS_WRITEABLE_DEFINED_ELSEWHERE 0
#define AZ_TRAIT_TEST_ROOT_FOLDER "/sdcard/Android/data/com.lumberyard.tests/files"
#define AZ_TRAIT_TEST_ROOT_FOLDER "/sdcard/Android/data/org.o3de.tests/files"
#define AZ_TRAIT_TEST_SUPPORT_DLOPEN 0
#define AZ_TRAIT_TEST_SUPPORT_LOADLIBRARY 0
#define AZ_TRAIT_TEST_SUPPORT_MODULE_LOADING 0
Code/Framework/AzTest/AzTest/Platform/Android/ScopedAutoTempDirectory_Android.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ namespace AZ
{
ScopedAutoTempDirectory::ScopedAutoTempDirectory()
{
char tempDirectoryTemplate[] = "/sdcard/Android/data/com.lumberyard.tests/files/UnitTest-XXXXXX";
char tempDirectoryTemplate[] = "/sdcard/Android/data/org.o3de.tests/files/UnitTest-XXXXXX";
const char* tempDir = mkdtemp(tempDirectoryTemplate);
AZ_Error("AzTest", tempDir, "Unable to create temp directory %s", tempDirectoryTemplate);
memset(m_tempDirectory, '\0', sizeof(m_tempDirectory));
Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp
+2 -2
View File
@@ -217,7 +217,7 @@ namespace AzToolsFramework
});
EditorActionRequestBus::Broadcast(
&EditorActionRequests::AddActionViaBusCrc, AZ_CRC_CE("com.o3de.action.editortransform.prefabopen"),
&EditorActionRequests::AddActionViaBusCrc, AZ_CRC_CE("org.o3de.action.editortransform.prefabopen"),
m_actions.back().get());
}
@@ -237,7 +237,7 @@ namespace AzToolsFramework
});
EditorActionRequestBus::Broadcast(
&EditorActionRequests::AddActionViaBusCrc, AZ_CRC_CE("com.o3de.action.editortransform.prefabclose"),
&EditorActionRequests::AddActionViaBusCrc, AZ_CRC_CE("org.o3de.action.editortransform.prefabclose"),
m_actions.back().get());
}
}
Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h
+5 -5
View File
@@ -23,11 +23,11 @@ namespace AzToolsFramework
/// @name Reverse URLs.
/// Used to identify common actions and override them when necessary.
//@{
static const AZ::Crc32 s_backAction = AZ_CRC("com.o3de.action.common.back", 0x80c3030f);
static const AZ::Crc32 s_deleteAction = AZ_CRC("com.o3de.action.common.delete", 0x58e78eed);
static const AZ::Crc32 s_duplicateAction = AZ_CRC("com.o3de.action.common.duplicate", 0xbc5a4a23);
static const AZ::Crc32 s_nextComponentMode = AZ_CRC("com.o3de.action.common.nextComponentMode", 0xf9aca3a8);
static const AZ::Crc32 s_previousComponentMode = AZ_CRC("com.o3de.action.common.previousComponentMode", 0x0580eaec);
static const AZ::Crc32 s_backAction = AZ_CRC_CE("org.o3de.action.common.back");
static const AZ::Crc32 s_deleteAction = AZ_CRC_CE("org.o3de.action.common.delete");
static const AZ::Crc32 s_duplicateAction = AZ_CRC_CE("org.o3de.action.common.duplicate");
static const AZ::Crc32 s_nextComponentMode = AZ_CRC_CE("org.o3de.action.common.nextComponentMode");
static const AZ::Crc32 s_previousComponentMode = AZ_CRC_CE("org.o3de.action.common.previousComponentMode");
//@}
/// Specific Action properties to be sent to a type implementing
Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h
+1 -1
View File
@@ -101,7 +101,7 @@ namespace AzToolsFramework
{
}
AZ::Crc32 m_uri; //!< Unique identifier for the Action. (In the form 'com.o3de.action.---").
AZ::Crc32 m_uri; //!< Unique identifier for the Action. (In the form 'org.o3de.action.---").
AZStd::vector<AZStd::function<void()>> m_callbacks; //!< Callbacks associated with this Action (note: with multi-selections
//!< there will be a callback per Entity/Component).
AZStd::unique_ptr<QAction> m_action; //!< The QAction associated with the overrideWidget for all ComponentMode actions.
Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h
+17 -17
View File
@@ -17,23 +17,23 @@ namespace AzToolsFramework
//! @name Reverse URLs.
//! Used to identify common actions and override them when necessary.
//@{
constexpr inline AZ::Crc32 LockSelection = AZ_CRC_CE("com.o3de.action.editortransform.lockselect");
constexpr inline AZ::Crc32 UnlockSelection = AZ_CRC_CE("com.o3de.action.editortransform.unlockselect");
constexpr inline AZ::Crc32 HideSelection = AZ_CRC_CE("com.o3de.action.editortransform.hideselect");
constexpr inline AZ::Crc32 ShowSelection = AZ_CRC_CE("com.o3de.action.editortransform.showselect");
constexpr inline AZ::Crc32 UnlockAll = AZ_CRC_CE("com.o3de.action.editortransform.unlockall");
constexpr inline AZ::Crc32 ShowAll = AZ_CRC_CE("com.o3de.action.editortransform.unhideall");
constexpr inline AZ::Crc32 SelectAll = AZ_CRC_CE("com.o3de.action.editortransform.selectall");
constexpr inline AZ::Crc32 InvertSelect = AZ_CRC_CE("com.o3de.action.editortransform.invertselect");
constexpr inline AZ::Crc32 DuplicateSelect = AZ_CRC_CE("com.o3de.action.editortransform.duplicateselect");
constexpr inline AZ::Crc32 DeleteSelect = AZ_CRC_CE("com.o3de.action.editortransform.deleteselect");
constexpr inline AZ::Crc32 EditEscaspe = AZ_CRC_CE("com.o3de.action.editortransform.editescape");
constexpr inline AZ::Crc32 EditPivot = AZ_CRC_CE("com.o3de.action.editortransform.editpivot");
constexpr inline AZ::Crc32 EditReset = AZ_CRC_CE("com.o3de.action.editortransform.editreset");
constexpr inline AZ::Crc32 EditResetManipulator = AZ_CRC_CE("com.o3de.action.editortransform.editresetmanipulator");
constexpr inline AZ::Crc32 ViewportUiVisible = AZ_CRC_CE("com.o3de.action.editortransform.viewportuivisible");
constexpr inline AZ::Crc32 Helpers = AZ_CRC_CE("com.o3de.action.editor.helpers");
constexpr inline AZ::Crc32 Icons = AZ_CRC_CE("com.o3de.action.editor.icons");
constexpr inline AZ::Crc32 LockSelection = AZ_CRC_CE("org.o3de.action.editortransform.lockselect");
constexpr inline AZ::Crc32 UnlockSelection = AZ_CRC_CE("org.o3de.action.editortransform.unlockselect");
constexpr inline AZ::Crc32 HideSelection = AZ_CRC_CE("org.o3de.action.editortransform.hideselect");
constexpr inline AZ::Crc32 ShowSelection = AZ_CRC_CE("org.o3de.action.editortransform.showselect");
constexpr inline AZ::Crc32 UnlockAll = AZ_CRC_CE("org.o3de.action.editortransform.unlockall");
constexpr inline AZ::Crc32 ShowAll = AZ_CRC_CE("org.o3de.action.editortransform.unhideall");
constexpr inline AZ::Crc32 SelectAll = AZ_CRC_CE("org.o3de.action.editortransform.selectall");
constexpr inline AZ::Crc32 InvertSelect = AZ_CRC_CE("org.o3de.action.editortransform.invertselect");
constexpr inline AZ::Crc32 DuplicateSelect = AZ_CRC_CE("org.o3de.action.editortransform.duplicateselect");
constexpr inline AZ::Crc32 DeleteSelect = AZ_CRC_CE("org.o3de.action.editortransform.deleteselect");
constexpr inline AZ::Crc32 EditEscaspe = AZ_CRC_CE("org.o3de.action.editortransform.editescape");
constexpr inline AZ::Crc32 EditPivot = AZ_CRC_CE("org.o3de.action.editortransform.editpivot");
constexpr inline AZ::Crc32 EditReset = AZ_CRC_CE("org.o3de.action.editortransform.editreset");
constexpr inline AZ::Crc32 EditResetManipulator = AZ_CRC_CE("org.o3de.action.editortransform.editresetmanipulator");
constexpr inline AZ::Crc32 ViewportUiVisible = AZ_CRC_CE("org.o3de.action.editortransform.viewportuivisible");
constexpr inline AZ::Crc32 Helpers = AZ_CRC_CE("org.o3de.action.editor.helpers");
constexpr inline AZ::Crc32 Icons = AZ_CRC_CE("org.o3de.action.editor.icons");
//@}
//! Provide interface for EditorTransformComponentSelection requests.
Code/Framework/AzToolsFramework/Tests/AssetUtils.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ namespace //anonymous
"project_id": "{91FB81A1-072C-4A80-8FCC-7E2C4C767B4D}",
"android_settings" : {
"package_name" : "com.lumberyard.yourgame",
"package_name" : "org.o3de.yourgame",
"version_number" : 1,
"version_name" : "1.0.0.0",
"orientation" : "landscape"
Code/Framework/AzToolsFramework/Tests/ComponentModeTestDoubles.cpp
+1 -1
View File
@@ -197,7 +197,7 @@ namespace AzToolsFramework
AZStd::vector<AzToolsFramework::ActionOverride> PlaceHolderComponentMode::PopulateActionsImpl()
{
const AZ::Crc32 placeHolderComponentModeAction = AZ_CRC_CE("com.o3de.action.placeholder.test");
const AZ::Crc32 placeHolderComponentModeAction = AZ_CRC_CE("org.o3de.action.placeholder.test");
return AZStd::vector<AzToolsFramework::ActionOverride>
{
Code/Tools/Android/ProjectBuilder/app_icon-hdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2505ee83c0e435700601d38c7c4b08b601478c5194a088ff6577e1017731b3ae
size 2368
oid sha256:2323fb234c075a6d18eed7575338fcb2c3aef119c19d5aedb2b45c18b3c8d69e
size 2275
Code/Tools/Android/ProjectBuilder/app_icon-mdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:32d4da537649036b18aa116c1337b8b23d1a4536b907034a1262cc6764e65627
size 1615
oid sha256:4f8b3aeeecb6baad0ba0be4c1f7b128fc609af82fea88019d322d85de693519c
size 1969
Code/Tools/Android/ProjectBuilder/app_icon-xhdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6a7f38fe03aba465b65189fdf183281c0d7397962f93168379ebca25f9581a30
size 3362
oid sha256:d6cb3e1b2d44927f300877c63c4181dabe08861bcc085ecfa9dee40e145af2cf
size 2504
Code/Tools/Android/ProjectBuilder/app_icon-xxhdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:02392ac01615ce21710b8566085941fea67926cab062ac2a4c7cdfc594aff428
size 5482
oid sha256:746bc5803e8d5dd84b5c255211d167f61beac1c4f9a5a206edff340610fffe7d
size 3247
Code/Tools/Android/ProjectBuilder/app_icon-xxxhdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3636ef346cf87d2382ed67ef0a7396bfe3b4df13f9ef223b1911e96ef42ae2ec
size 8238
oid sha256:1f93be4cff524be96f0fdd2f2bc5c233b8c1391bb8c47abacd028026ed7ce672
size 3887
Code/Tools/Android/ProjectBuilder/app_splash-land-hdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:df22836ffc2ab5cca07c6e0d152ed8ef01d56d66cdc56435d6b48304753c4990
size 196450
oid sha256:c40fdabfe1391421cef0c1d7fb3e5b2173aac29d6aaf664ed54b9c39aee5e077
size 17714
Code/Tools/Android/ProjectBuilder/app_splash-land-mdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:70250143d6b53978c7a164330c38cf34777688b92e0def691b68777be111ac75
size 156821
oid sha256:22c800b9b1ea513c93162e5549492b2841bc9c8bf94b1a9273f26be1dd4e4517
size 16494
Code/Tools/Android/ProjectBuilder/app_splash-land-xhdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:80752114b225ad43028278ac8372cbf4543f493a55e5fe05c24ff1e20f9b24b5
size 324436
oid sha256:264aff020a8bc1665aaddaec10e4e453b1a551b4c84c08fddbb315c5aa7202c1
size 33469
Code/Tools/Android/ProjectBuilder/app_splash-land-xxhdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:44de927141f19e10672012a8e0675d03fd06e6b20d5a7c759cdc233a1262ef55
size 441038
oid sha256:6dded39dd078168e92f1fd47e4728f99f06a6a988a57d5e56ddc0eeb3d4985ef
size 50380
Code/Tools/Android/ProjectBuilder/app_splash-port-hdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d3fb185179d26442087087401dd96443ed094122b8b7a1b7985aae299764bcf6
size 271782
oid sha256:de82dd62268697af0a02dbfad1cd37f153cc0dc08a2d40cec0bbf4fe582fcb50
size 16257
Code/Tools/Android/ProjectBuilder/app_splash-port-mdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:04c9bc74b51d3bd7cf85e178b15c631fd78c6251ef014a41506f36852ec4a500
size 209127
oid sha256:70a234b518d00b6be6459f2731d84c23271683d72b775909683ea3b5738d3313
size 13053
Code/Tools/Android/ProjectBuilder/app_splash-port-xhdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:913fdddb651ff6d74fb0583b06c6f32f6c87bf9eabe4b861d662c9c409cff733
size 461061
oid sha256:0cc200156f762ee8101b8b9eb3d6640c130a889b4507f95eb160524109bfde1d
size 27508
Code/Tools/Android/ProjectBuilder/app_splash-port-xxhdpi.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cb9fd81fb4ad83132db7401fe412cce61bf0577e1822653115930f31f3db6241
size 570118
oid sha256:c6b01162660664b097ce26ffef1c4171b33565b380f58064c78980335617ca5e
size 42415
Code/Tools/AssetBundler/tests/DummyProject/project.json
+1 -1
View File
@@ -6,7 +6,7 @@
"project_id": "{91FB81A1-072C-4A80-8FCC-7E2C4C767B4D}",
"android_settings" : {
"package_name" : "com.lumberyard.yourgame",
"package_name" : "org.o3de.yourgame",
"version_number" : 1,
"version_name" : "1.0.0.0",
"orientation" : "landscape"
Code/Tools/AzTestRunner/Platform/Android/android_project.json
+1 -1
View File
@@ -2,7 +2,7 @@
"project_name" : "AzTestRunner",
"product_name" : "AzTestRunner Project",
"android_settings": {
"package_name" : "com.lumberyard.tests",
"package_name" : "org.o3de.tests",
"version_number": 1,
"version_name" : "1.0.0",
"orientation" : "landscape",
Code/Tools/AzTestRunner/Platform/iOS/Resources/Info.plist
+1 -1
View File
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>AzTestRunner</string>
<key>CFBundleIdentifier</key>
<string>com.lumberyard.tests</string>
<string>org.o3de.tests</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>