summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzijur Rahman Sheatu <azijur.r@samsung.com>2024-10-01 10:47:11 +0600
committerAzijur Rahman Sheatu <azijur.r@samsung.com>2024-10-01 05:13:19 +0000
commit4ea50a25fa89cd82a8de99ea7e25fb8559577458 (patch)
tree7cbdbb6e0b9dc5c19e8b7c133dfa6d8511fa35f5
parentdfb5af6206aa8db335b9ecbc2d904506d8b4b8ce (diff)
downloadsetting-wifi-accepted/tizen_unified.tar.gz
setting-wifi-accepted/tizen_unified.tar.bz2
setting-wifi-accepted/tizen_unified.zip
[Problem] 1. TNINE-4667: Wi-Fi item is missing in Settings main menu. 2. TNINE-4715: Wi-Fi and Bluetooth item texts are not showing properly. [Cause & Measure] Cause: Resource package destination have been changed from 'res/allowed' to 'res/allowed/<res-type>' from FW side. Measure: Modified postbuild script accordingly and been built rpk with latest build tools. Change-Id: I6a316e60c874f121629a7487e752c18065fa5412 Signed-off-by: Azijur Rahman Sheatu <azijur.r@samsung.com>
-rw-r--r--.gitignore2
-rwxr-xr-xSettingWiFi/SettingWiFi/SettingWiFi.csproj6
-rw-r--r--packaging/org.tizen.cssetting-wifi-1.1.6.rpkbin233128 -> 233183 bytes
3 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 8991002..f7f9647 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,6 @@
**/[Dd]ebug/
**/[Bb]uild/
**/.gn
-**/res/allowed/*.dll
+**/res/allowed/org.*
tags
msbuild.log
diff --git a/SettingWiFi/SettingWiFi/SettingWiFi.csproj b/SettingWiFi/SettingWiFi/SettingWiFi.csproj
index ff99b32..3b53781 100755
--- a/SettingWiFi/SettingWiFi/SettingWiFi.csproj
+++ b/SettingWiFi/SettingWiFi/SettingWiFi.csproj
@@ -38,8 +38,12 @@
</EmbeddedResource>
</ItemGroup>
+ <PropertyGroup>
+ <GadgetResourceType>org.tizen.appfw.gadget.setting-wifi</GadgetResourceType>
+ </PropertyGroup>
+
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
- <Exec Command=":: Copy resource dll&#xD;&#xA;rmdir /S /Q res\allowed\locale&#xD;&#xA;mkdir res\allowed\locale&#xD;&#xA;dir $(OutDir)\&#xD;&#xA;xcopy /S /K /D /H /Y $(OutDir)\ res\allowed\locale&#xD;&#xA;del /q res\allowed\locale\*.*&#xD;&#xA;xcopy /S /K /D /H /Y res\allowed\locale\* res\allowed&#xD;&#xA;rmdir /S /Q res\allowed\locale&#xD;&#xA;" />
+ <Exec Command=":: Copy resource dll&#xD;&#xA;rmdir /S /Q res\allowed\$(GadgetResourceType)&#xD;&#xA;mkdir res\allowed\$(GadgetResourceType)&#xD;&#xA;rmdir /S /Q res\allowed\locale&#xD;&#xA;mkdir res\allowed\locale&#xD;&#xA;dir $(OutDir)\&#xD;&#xA;xcopy /S /K /D /H /Y $(OutDir)\ res\allowed\locale&#xD;&#xA;del /Q res\allowed\locale\*.*&#xD;&#xA;xcopy /S /K /D /H /Y res\allowed\locale\* res\allowed\$(GadgetResourceType)&#xD;&#xA;rmdir /S /Q res\allowed\locale&#xD;&#xA;" />
</Target>
</Project>
diff --git a/packaging/org.tizen.cssetting-wifi-1.1.6.rpk b/packaging/org.tizen.cssetting-wifi-1.1.6.rpk
index 7d1adaf..550ca5b 100644
--- a/packaging/org.tizen.cssetting-wifi-1.1.6.rpk
+++ b/packaging/org.tizen.cssetting-wifi-1.1.6.rpk
Binary files differ