Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
43a5620e
Commit
43a5620e
authored
Jan 24, 2020
by
Lee Jaebin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
文言の%1$sに値セットするように対応
parent
b6ccdb4a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/BlePairingSettingActivity.java
+1
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/SppBluetoothPairingSettingActivity.java
+1
-1
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/BlePairingSettingActivity.java
View file @
43a5620e
...
@@ -203,7 +203,7 @@ public class BlePairingSettingActivity extends ABVUIActivity {
...
@@ -203,7 +203,7 @@ public class BlePairingSettingActivity extends ABVUIActivity {
switch
(
requestCode
)
{
switch
(
requestCode
)
{
case
REQUEST_ENABLEBLUETOOTH:
// Bluetooth有効化要求
case
REQUEST_ENABLEBLUETOOTH:
// Bluetooth有効化要求
if
(
Activity
.
RESULT_CANCELED
==
resultCode
)
{
// 有効にされなかった
if
(
Activity
.
RESULT_CANCELED
==
resultCode
)
{
// 有効にされなかった
ABVToastUtil
.
showMakeText
(
getApplicationContext
(),
getString
(
R
.
string
.
msg_scan_bluetooth_no_allow
),
Toast
.
LENGTH_SHORT
);
ABVToastUtil
.
showMakeText
(
getApplicationContext
(),
String
.
format
(
getString
(
R
.
string
.
msg_scan_bluetooth_no_allow
),
getString
(
R
.
string
.
chino_machine
)
),
Toast
.
LENGTH_SHORT
);
return
;
return
;
}
}
break
;
break
;
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/SppBluetoothPairingSettingActivity.java
View file @
43a5620e
...
@@ -162,7 +162,7 @@ public class SppBluetoothPairingSettingActivity extends ABVUIActivity {
...
@@ -162,7 +162,7 @@ public class SppBluetoothPairingSettingActivity extends ABVUIActivity {
switch
(
requestCode
)
{
switch
(
requestCode
)
{
case
REQUEST_ENABLEBLUETOOTH:
// Bluetooth有効化要求
case
REQUEST_ENABLEBLUETOOTH:
// Bluetooth有効化要求
if
(
Activity
.
RESULT_CANCELED
==
resultCode
)
{
// 有効にされなかった
if
(
Activity
.
RESULT_CANCELED
==
resultCode
)
{
// 有効にされなかった
ABVToastUtil
.
showMakeText
(
getApplicationContext
(),
getString
(
R
.
string
.
msg_scan_bluetooth_no_allow
),
Toast
.
LENGTH_SHORT
);
ABVToastUtil
.
showMakeText
(
getApplicationContext
(),
String
.
format
(
getString
(
R
.
string
.
msg_scan_bluetooth_no_allow
),
getString
(
R
.
string
.
spp_machine
)
),
Toast
.
LENGTH_SHORT
);
return
;
return
;
}
}
break
;
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment