generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug with several "in use" labels fixed in OpenCV Manager UI.

Browse Source
This commit is contained in:
Alexander Smorkalov 2012-09-18 10:52:28 +04:00
parent 0105d0a241
commit b1d14f766d
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/service/engine/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.engine" package="org.opencv.engine"
android:versionCode="15" android:versionCode="16"
android:versionName="1.5" > android:versionName="1.6" >
<uses-sdk android:minSdkVersion="8" /> <uses-sdk android:minSdkVersion="8" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/> <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
@ -17,7 +17,7 @@
</intent-filter> </intent-filter>
</service> </service>
<activity <activity
android:name="org.opencv.engine.manager.ManagerActivity" android:name="org.opencv.engine.manager.ManagerActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:screenOrientation="portrait"> android:screenOrientation="portrait">

15
android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
View File

@ -308,10 +308,19 @@ public class ManagerActivity extends Activity
ActivePackagePath = mActivePackageMap.get(OpenCVersion); ActivePackagePath = mActivePackageMap.get(OpenCVersion);
Log.d(TAG, OpenCVersion + " -> " + ActivePackagePath); Log.d(TAG, OpenCVersion + " -> " + ActivePackagePath);
if (null != ActivePackagePath && ActivePackagePath.indexOf(mInstalledPackageInfo[i].packageName) >= 0) if (null != ActivePackagePath)
{ {
temp.put("Activity", "y"); int start = ActivePackagePath.indexOf(mInstalledPackageInfo[i].packageName);
PublicName += " (in use)"; int stop = start + mInstalledPackageInfo[i].packageName.length();
if (start >= 0 && ActivePackagePath.charAt(stop) == '/')
{
temp.put("Activity", "y");
PublicName += " (in use)";
}
else
{
temp.put("Activity", "n");
}
} }
else else
{ {