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

Commit 279aa67

Browse files
jmatsushitajmatsushita
committed
Merged dev
2 parents 6606cb2 + 83ac306 commit 279aa67

Some content is hidden

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

48 files changed

+678
-788
lines changed

‎AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
1616
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
1717
<uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
18+
<uses-permission android:name="android.permission.WAKE_LOCK" />
1819
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
1920
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
2021
<uses-permission android:name="android.permission.GET_TASKS" />

‎assets/help_es.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"data":[
55
{
66
"id" : "help",
7-
"lang" : "en",
7+
"lang" : "es",
88
"type" : "simple",
99
"title" : "Help",
1010
"items" : [
@@ -22,7 +22,7 @@
2222
},
2323
{
2424
"id" : "help_reading",
25-
"lang" : "en",
25+
"lang" : "es",
2626
"type" : "simple",
2727
"title" : "Reading List",
2828
"section_order" : "3",
@@ -33,7 +33,7 @@
3333
},
3434
{
3535
"id" : "help_risk",
36-
"lang" : "en",
36+
"lang" : "es",
3737
"type" : "simple",
3838
"title" : "Managing Your Risks",
3939
"heading" : "Managing Your Risks",
@@ -51,7 +51,7 @@
5151
},
5252
{
5353
"id" : "help_risk_assessing",
54-
"lang" : "en",
54+
"lang" : "es",
5555
"type" : "simple",
5656
"title" : "Assessing your risk",
5757
"heading" : "Assessing your risk",
@@ -69,7 +69,7 @@
6969
},
7070
{
7171
"id" : "help_risk_assessing_threat",
72-
"lang" : "en",
72+
"lang" : "es",
7373
"type" : "simple",
7474
"title" : "Assessing the threat",
7575
"heading" : "First step: assessing the threat",
@@ -78,7 +78,7 @@
7878
},
7979
{
8080
"id" : "help_risk_assessing_vulnerability",
81-
"lang" : "en",
81+
"lang" : "es",
8282
"type" : "simple",
8383
"title" : "Reducing your vulnerability",
8484
"heading" : "Second step: reducing your vulnerability to a threat",
@@ -87,7 +87,7 @@
8787
},
8888
{
8989
"id" : "help_risk_mobile",
90-
"lang" : "en",
90+
"lang" : "es",
9191
"type" : "simple",
9292
"title" : "Safer mobile",
9393
"heading" : "Safer mobile",
@@ -99,7 +99,7 @@
9999
},
100100
{
101101
"id" : "help_using",
102-
"lang" : "en",
102+
"lang" : "es",
103103
"type" : "simple",
104104
"title" : "Using Panic Button",
105105
"section_order" : "2",
@@ -121,7 +121,7 @@
121121
},
122122
{
123123
"id" : "help_using_installation",
124-
"lang" : "en",
124+
"lang" : "es",
125125
"type" : "simple",
126126
"title" : "Installation",
127127
"heading" : "Installation",
@@ -133,7 +133,7 @@
133133
},
134134
{
135135
"id" : "help_using_configuration",
136-
"lang" : "en",
136+
"lang" : "es",
137137
"type" : "simple",
138138
"title" : "Configuration",
139139
"heading" : "Configuration",
@@ -159,7 +159,7 @@
159159
},
160160
{
161161
"id" : "help_using_configuration_contacts",
162-
"lang" : "en",
162+
"lang" : "es",
163163
"type" : "simple",
164164
"title" : "Setting Up Contacts",
165165
"heading" : "Setting Up Contacts",
@@ -169,7 +169,7 @@
169169
},
170170
{
171171
"id" : "help_using_configuration_alert_messages",
172-
"lang" : "en",
172+
"lang" : "es",
173173
"type" : "simple",
174174
"title" : "Create your alert message",
175175
"heading" : "Create your alert message",
@@ -178,7 +178,7 @@
178178
},
179179
{
180180
"id" : "help_using_configuration_code",
181-
"lang" : "en",
181+
"lang" : "es",
182182
"type" : "simple",
183183
"title" : "Create pin code",
184184
"heading" : "Create pin code",
@@ -187,7 +187,7 @@
187187
},
188188
{
189189
"id" : "help_using_configuration_alert",
190-
"lang" : "en",
190+
"lang" : "es",
191191
"type" : "simple",
192192
"title" : "Learn how to alert",
193193
"heading" : "Learn how to alert",
@@ -196,7 +196,7 @@
196196
},
197197
{
198198
"id" : "help_using_configuration_disguise",
199-
"lang" : "en",
199+
"lang" : "es",
200200
"type" : "simple",
201201
"title" : "Activate disguise",
202202
"heading" : "Activate disguise",
@@ -205,7 +205,7 @@
205205
},
206206
{
207207
"id" : "help_using_tips",
208-
"lang" : "en",
208+
"lang" : "es",
209209
"type" : "simple",
210210
"title" : "Preparing for Panic",
211211
"heading" : "Tips for testing",
@@ -217,7 +217,7 @@
217217
},
218218
{
219219
"id" : "help_using_faq",
220-
"lang" : "en",
220+
"lang" : "es",
221221
"type" : "simple",
222222
"title" : "Frequently Ask Questions",
223223
"heading" : "Frequently Ask Questions",

‎assets/help_fr.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"data":[
55
{
66
"id" : "help",
7-
"lang" : "en",
7+
"lang" : "fr",
88
"type" : "simple",
99
"title" : "Help",
1010
"items" : [
@@ -22,7 +22,7 @@
2222
},
2323
{
2424
"id" : "help_reading",
25-
"lang" : "en",
25+
"lang" : "fr",
2626
"type" : "simple",
2727
"title" : "Reading List",
2828
"section_order" : "3",
@@ -33,7 +33,7 @@
3333
},
3434
{
3535
"id" : "help_risk",
36-
"lang" : "en",
36+
"lang" : "fr",
3737
"type" : "simple",
3838
"title" : "Managing Your Risks",
3939
"heading" : "Managing Your Risks",
@@ -51,7 +51,7 @@
5151
},
5252
{
5353
"id" : "help_risk_assessing",
54-
"lang" : "en",
54+
"lang" : "fr",
5555
"type" : "simple",
5656
"title" : "Assessing your risk",
5757
"heading" : "Assessing your risk",
@@ -69,7 +69,7 @@
6969
},
7070
{
7171
"id" : "help_risk_assessing_threat",
72-
"lang" : "en",
72+
"lang" : "fr",
7373
"type" : "simple",
7474
"title" : "Assessing the threat",
7575
"heading" : "First step: assessing the threat",
@@ -78,7 +78,7 @@
7878
},
7979
{
8080
"id" : "help_risk_assessing_vulnerability",
81-
"lang" : "en",
81+
"lang" : "fr",
8282
"type" : "simple",
8383
"title" : "Reducing your vulnerability",
8484
"heading" : "Second step: reducing your vulnerability to a threat",
@@ -87,7 +87,7 @@
8787
},
8888
{
8989
"id" : "help_risk_mobile",
90-
"lang" : "en",
90+
"lang" : "fr",
9191
"type" : "simple",
9292
"title" : "Safer mobile",
9393
"heading" : "Safer mobile",
@@ -99,7 +99,7 @@
9999
},
100100
{
101101
"id" : "help_using",
102-
"lang" : "en",
102+
"lang" : "fr",
103103
"type" : "simple",
104104
"title" : "Using Panic Button",
105105
"section_order" : "2",
@@ -121,7 +121,7 @@
121121
},
122122
{
123123
"id" : "help_using_installation",
124-
"lang" : "en",
124+
"lang" : "fr",
125125
"type" : "simple",
126126
"title" : "Installation",
127127
"heading" : "Installation",
@@ -133,7 +133,7 @@
133133
},
134134
{
135135
"id" : "help_using_configuration",
136-
"lang" : "en",
136+
"lang" : "fr",
137137
"type" : "simple",
138138
"title" : "Configuration",
139139
"heading" : "Configuration",
@@ -159,7 +159,7 @@
159159
},
160160
{
161161
"id" : "help_using_configuration_contacts",
162-
"lang" : "en",
162+
"lang" : "fr",
163163
"type" : "simple",
164164
"title" : "Setting Up Contacts",
165165
"heading" : "Setting Up Contacts",
@@ -169,7 +169,7 @@
169169
},
170170
{
171171
"id" : "help_using_configuration_alert_messages",
172-
"lang" : "en",
172+
"lang" : "fr",
173173
"type" : "simple",
174174
"title" : "Create your alert message",
175175
"heading" : "Create your alert message",
@@ -178,7 +178,7 @@
178178
},
179179
{
180180
"id" : "help_using_configuration_code",
181-
"lang" : "en",
181+
"lang" : "fr",
182182
"type" : "simple",
183183
"title" : "Create pin code",
184184
"heading" : "Create pin code",
@@ -187,7 +187,7 @@
187187
},
188188
{
189189
"id" : "help_using_configuration_alert",
190-
"lang" : "en",
190+
"lang" : "fr",
191191
"type" : "simple",
192192
"title" : "Learn how to alert",
193193
"heading" : "Learn how to alert",
@@ -196,7 +196,7 @@
196196
},
197197
{
198198
"id" : "help_using_configuration_disguise",
199-
"lang" : "en",
199+
"lang" : "fr",
200200
"type" : "simple",
201201
"title" : "Activate disguise",
202202
"heading" : "Activate disguise",
@@ -205,7 +205,7 @@
205205
},
206206
{
207207
"id" : "help_using_tips",
208-
"lang" : "en",
208+
"lang" : "fr",
209209
"type" : "simple",
210210
"title" : "Preparing for Panic",
211211
"heading" : "Tips for testing",
@@ -217,7 +217,7 @@
217217
},
218218
{
219219
"id" : "help_using_faq",
220-
"lang" : "en",
220+
"lang" : "fr",
221221
"type" : "simple",
222222
"title" : "Frequently Ask Questions",
223223
"heading" : "Frequently Ask Questions",

0 commit comments

Comments
 (0)