Skip to content
This repository was archived by the owner on Mar 27, 2020. It is now read-only.

Commit 236f9e1

Browse files
jmatsushitajmatsushita
committed
Merge branch 'dev'
2 parents 4a79c95 + 32ebe40 commit 236f9e1

File tree

135 files changed

+1108
-810
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+1108
-810
lines changed

‎.settings/org.eclipse.core.resources.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
eclipse.preferences.version=1
2+
encoding//src/main/java=UTF-8
3+
encoding//src/test/java=UTF-8
4+
encoding/<project>=UTF-8

‎AndroidManifest.xml‎

Lines changed: 34 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.apb.beacon"
4-
android:versionCode="1"
5-
android:versionName="${app.version.name}">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="123" android:versionName="1.2.7" package="org.iilab.pb">
63

74
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/>
5+
86
<uses-permission android:name="android.permission.READ_CONTACTS"/>
97
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
108
<uses-permission android:name="android.permission.INTERNET"/>
@@ -13,96 +11,66 @@
1311
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
1412
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
1513
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
16-
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
17-
<uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
18-
<uses-permission android:name="android.permission.WAKE_LOCK" />
19-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
20-
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
21-
<uses-permission android:name="android.permission.GET_TASKS" />
14+
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
15+
<uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"/>
16+
<uses-permission android:name="android.permission.WAKE_LOCK"/>
17+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
18+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
19+
<uses-permission android:name="android.permission.GET_TASKS"/>
2220

23-
<application android:icon="@drawable/icon_calculator"
24-
android:theme="@android:style/Theme.Light.NoTitleBar"
25-
android:label="@string/app_name"
26-
android:allowBackup="true">
21+
<application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/icon_calculator" android:label="@string/app_name" android:name=".common.ApplicationSettings" android:theme="@android:style/Theme.Light.NoTitleBar">
2722

28-
<activity android:name=".HomeActivity"
29-
android:screenOrientation="portrait"
30-
android:label="@string/app_name_setup"
31-
android:excludeFromRecents="true"
32-
android:noHistory="true">
23+
<activity android:excludeFromRecents="true" android:label="@string/app_name_setup" android:name=".HomeActivity" android:noHistory="true" android:screenOrientation="portrait">
3324
<intent-filter>
3425
<action android:name="android.intent.action.MAIN"/>
3526
<!--<category android:name="android.intent.category.LAUNCHER"/>-->
3627
</intent-filter>
3728
</activity>
3829

39-
<activity-alias android:label="@string/app_name_setup"
40-
android:icon="@drawable/icon_setup"
41-
android:name=".HomeActivity-setup"
42-
android:enabled="true"
43-
android:targetActivity=".HomeActivity">
30+
<activity-alias android:enabled="true" android:icon="@drawable/icon_setup" android:label="@string/app_name_setup" android:name=".HomeActivity-setup" android:targetActivity=".HomeActivity">
4431
<intent-filter>
45-
<action android:name="android.intent.action.MAIN" />
46-
<category android:name="android.intent.category.LAUNCHER" />
32+
<action android:name="android.intent.action.MAIN"/>
33+
<category android:name="android.intent.category.LAUNCHER"/>
4734
</intent-filter>
4835
</activity-alias>
4936

50-
<activity-alias android:label="@string/app_name"
51-
android:icon="@drawable/icon_calculator"
52-
android:name=".HomeActivity-calculator"
53-
android:enabled="false"
54-
android:targetActivity=".HomeActivity">
37+
<activity-alias android:enabled="false" android:icon="@drawable/icon_calculator" android:label="@string/app_name" android:name=".HomeActivity-calculator" android:targetActivity=".HomeActivity">
5538
<intent-filter>
56-
<action android:name="android.intent.action.MAIN" />
57-
<category android:name="android.intent.category.LAUNCHER" />
39+
<action android:name="android.intent.action.MAIN"/>
40+
<category android:name="android.intent.category.LAUNCHER"/>
5841
</intent-filter>
5942
</activity-alias>
6043

61-
<activity android:name=".WizardActivity"
62-
android:screenOrientation="portrait"
63-
android:excludeFromRecents="true"/>
64-
<activity android:name=".WizardModalActivity"
65-
android:theme="@style/Theme.Transparent"
66-
android:screenOrientation="portrait"
67-
android:excludeFromRecents="true"/>
68-
<activity android:name=".CalculatorActivity"
69-
android:launchMode="singleTask"
70-
android:screenOrientation="portrait"
71-
android:excludeFromRecents="true"/>
72-
<activity android:name=".LoginActivity"
73-
android:noHistory="true"
74-
android:screenOrientation="portrait"
75-
android:excludeFromRecents="true"/>
76-
<activity android:name=".MainActivity"
77-
android:screenOrientation="portrait"
78-
android:excludeFromRecents="true"/>
79-
<activity android:name=".MainModalActivity"
80-
android:theme="@style/Theme.Transparent"
81-
android:screenOrientation="portrait"
82-
android:excludeFromRecents="true"/>
83-
44+
<activity android:excludeFromRecents="true" android:name=".WizardActivity" android:screenOrientation="portrait"/>
45+
<activity android:excludeFromRecents="true" android:name=".WizardModalActivity" android:screenOrientation="portrait" android:theme="@style/Theme.Transparent"/>
46+
<activity android:excludeFromRecents="true" android:launchMode="singleTask" android:name=".CalculatorActivity" android:screenOrientation="portrait"/>
47+
<activity android:excludeFromRecents="true" android:name=".LoginActivity" android:noHistory="true" android:screenOrientation="portrait"/>
48+
<activity android:excludeFromRecents="true" android:name=".MainActivity" android:screenOrientation="portrait"/>
49+
<activity android:excludeFromRecents="true" android:name=".MainModalActivity" android:screenOrientation="portrait" android:theme="@style/Theme.Transparent"/>
50+
8451
<service android:name=".trigger.HardwareTriggerService"/>
8552

86-
<receiver android:name=".trigger.BootReceiver" android:enabled="true" android:exported="false">
53+
<receiver android:enabled="true" android:exported="false" android:name=".trigger.BootReceiver">
8754
<intent-filter>
8855
<action android:name="android.intent.action.BOOT_COMPLETED"/>
8956
</intent-filter>
9057
</receiver>
9158

92-
<receiver android:name=".location.LocationUpdateReceiver" android:enabled="true" android:exported="false">
59+
<receiver android:enabled="true" android:exported="false" android:name=".location.LocationUpdateReceiver">
9360
<intent-filter>
94-
<action android:name="com.apb.beacon.LOCATION_UPDATE_ACTION"/>
61+
<action android:name="org.iilab.pb.LOCATION_UPDATE_ACTION"/>
9562
</intent-filter>
9663
</receiver>
9764

98-
<receiver android:name=".alert.AlarmReceiver" android:enabled="true" android:exported="false">
65+
<receiver android:enabled="true" android:exported="false" android:name=".alert.AlarmReceiver">
9966
<intent-filter>
100-
<action android:name="com.apb.beacon.SEND_ALERT_ACTION"/>
67+
<action android:name="org.iilab.pb.SEND_ALERT_ACTION"/>
68+
</intent-filter>
69+
<intent-filter>
70+
<action android:name="org.iilab.pb.SEND_ALERT_ACTION_SINGLE"/>
10171
</intent-filter>
10272
</receiver>
103-
104-
105-
106-
</application>
107-
</manifest>
10873

74+
75+
</application>
76+
</manifest>

‎assets/help_en.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"title" : "Managing Your Risks",
3939
"heading" : "Managing Your Risks",
4040
"section_order" : "1",
41-
"content" : "<h1>Managing Your <strong>Risks</strong></h1><h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
41+
"content" : "<h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
4242
"items" : [
4343
{
4444
"title" : "Assessing your risk",

‎assets/help_es.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"title" : "Managing Your Risks",
3939
"heading" : "Managing Your Risks",
4040
"section_order" : "1",
41-
"content" : "<h1>Managing Your <strong>Risks</strong></h1><h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
41+
"content" : "<h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
4242
"items" : [
4343
{
4444
"title" : "Assessing your risk",

‎assets/help_fr.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"title" : "Managing Your Risks",
3939
"heading" : "Managing Your Risks",
4040
"section_order" : "1",
41-
"content" : "<h1>Managing Your <strong>Risks</strong></h1><h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
41+
"content" : "<h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
4242
"items" : [
4343
{
4444
"title" : "Assessing your risk",

‎assets/help_ph.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"title" : "Managing Your Risks",
3939
"heading" : "Managing Your Risks",
4040
"section_order" : "1",
41-
"content" : "<h1>Managing Your <strong>Risks</strong></h1><h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
41+
"content" : "<h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
4242
"items" : [
4343
{
4444
"title" : "Assessing your risk",

‎assets/help_pt.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"title" : "Managing Your Risks",
3939
"heading" : "Managing Your Risks",
4040
"section_order" : "1",
41-
"content" : "<h1>Managing Your <strong>Risks</strong></h1><h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
41+
"content" : "<h2>How to assess your risks, the basics about mobile phone security and other risks.</h2>",
4242
"items" : [
4343
{
4444
"title" : "Assessing your risk",

‎assets/mobile_en.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@
333333
"title" : "Checklist",
334334
"action" : [{"title":"Disguise Now","link":"close"},{"title":"Cancel","link":"home-ready","status":"disabled"}],
335335
"checklist" : [{"title":"Review security plan and update contacts regularly"},{"title":"Test the alert to ensure it is working"},{"title":"Ensure sufficient credit on the phone"},{"title":"Activate GPS (if you want to enable location tracking)"},{"title":"Charge phone battery to full"}],
336-
"content" : "<p>More <a href=\"#help-charge\">security tips...</a></p>"
336+
"content" : "<p>More <a href=\"help_risk\">security tips...</a></p>"
337337
}]
338338
}
339339
}

‎assets/mobile_es.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
"title" : "Lista de verificación",
333333
"action" : [{"title":"Aceptar","link":"close"},{"title":"Cancelar","link":"home-ready","status":"disabled"}],
334334
"checklist" : [{"title":"Revisar plan de seguridad y actualizar contactos regularmente"},{"title":"Prueba la alerta para asegurarte que funcione"},{"title":"Asegurate de tener suficiente crédito en tu teléfono móvil"},{"title":"Activa el GPS (si deseas que tu ubicación se incluya en el mensaje)"},{"title":"Carga la batería de tu teléfono completamente"}],
335-
"content" : "<p><a href=\"#help-charge\">Consejos sobre seguridad...</a></p>"
335+
"content" : "<p><a href=\"help_risk\">Consejos sobre seguridad...</a></p>"
336336
}]
337337
}
338338
}

‎assets/mobile_fr.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
"title" : "Check-list",
333333
"action" : [{"title":"OK","link":"close"},{"title":"Annuler ","link":"home-ready","status":"disabled"}],
334334
"checklist" : [{"title":"Revoir la stratégie de sécurité et mettre à jour les contacts régulièrement"},{"title":"Tester l'alerte pour vérifier qu'elle fonctionne"},{"title":"Vérifier qu'il y a assez de crédit sur le téléphone"},{"title":"Activer le GPS (si vous souhaitez signaler votre position géographique"},{"title":"Recharger complètement la batterie"}],
335-
"content" : "<p>More <a href=\"#help-charge\">conseils de sécurité...</a></p>"
335+
"content" : "<p>More <a href=\"help_risk\">conseils de sécurité...</a></p>"
336336
}]
337337
}
338338
}

0 commit comments

Comments
 (0)