Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8e2943ab
authored
Jan 07, 2017
by
Fernando Martínez Santiago
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
issue #763, #767 closed
parent
b7efc5d7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/PictogramActivity.java
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/SerialActivity.java
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/PictogramActivity.java
View file @
8e2943ab
...
...
@@ -1131,7 +1131,8 @@ public class PictogramActivity extends Activity implements VocabularyTalk.iVocab
Intent
nextActivity
=
null
;
Intent
intent
=
getIntent
();
boolean
student_view
=
intent
.
getBooleanExtra
(
"student_view"
,
false
);
if
(
PCBcontext
.
getPcbdb
().
getCurrentUser
().
is_supervisor
()
||
student_view
)
{
if
(
PCBcontext
.
getPcbdb
()!=
null
&&
(
PCBcontext
.
getPcbdb
().
getCurrentUser
().
is_supervisor
()
||
student_view
))
{
switch
(
event
.
getAction
())
{
case
MotionEvent
.
ACTION_DOWN
:
firstTouchX
=
event
.
getX
();
...
...
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/SerialActivity.java
View file @
8e2943ab
...
...
@@ -119,7 +119,7 @@ public class SerialActivity extends Activity {
public
void
onItemClick
(
AdapterView
<?>
parent
,
View
view
,
int
position
,
long
id
)
{
SharedPreferences
settings
=
getSharedPreferences
(
PREFS_NAME
,
0
);
SharedPreferences
.
Editor
editor
=
settings
.
edit
();
editor
.
putString
(
"username"
,
stuUsers
.
elementAt
(
position
).
get_name_stu
());
editor
.
putString
(
"username"
,
stuUsers
.
elementAt
(
position
).
get_n
ickn
ame_stu
());
editor
.
putString
(
"password"
,
stuUsers
.
elementAt
(
position
).
get_pwd_stu
());
editor
.
commit
();
new
UserLogin
().
login
(
stuUsers
.
elementAt
(
position
).
get_nickname_stu
(),
...
...
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