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
4a1fc69e
Commit
4a1fc69e
authored
May 11, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'features/abcomm_sp6_42722_android6対応' into 'features/abcomm_sp6'
Android6以下バージョンでのLocale取得対応 See merge request
!142
parents
bc84c3d7
37e0eb1e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletions
+6
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
+6
-1
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
View file @
4a1fc69e
...
...
@@ -1552,7 +1552,12 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
}
public
String
getLocaleFileName
()
{
Locale
primaryLocale
=
mContext
.
getResources
().
getConfiguration
().
getLocales
().
get
(
0
);
Locale
primaryLocale
;
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
N
)
{
primaryLocale
=
mContext
.
getResources
().
getConfiguration
().
getLocales
().
get
(
0
);
}
else
{
primaryLocale
=
mContext
.
getResources
().
getConfiguration
().
locale
;
}
String
locale
=
primaryLocale
.
getDisplayName
();
String
localeLanguage
=
"en"
;
if
(
primaryLocale
.
equals
(
Locale
.
JAPAN
)
||
primaryLocale
.
equals
(
Locale
.
JAPANESE
))
{
...
...
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