Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
fc9b4e78
Commit
fc9b4e78
authored
11 years ago
by
Alexandre Lision
Browse files
Options
Downloads
Patches
Plain Diff
* #36914: highlight correct navigation section
parent
658999c1
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/org/sflphone/client/HomeActivity.java
+5
-8
5 additions, 8 deletions
src/org/sflphone/client/HomeActivity.java
src/org/sflphone/fragments/MenuFragment.java
+10
-2
10 additions, 2 deletions
src/org/sflphone/fragments/MenuFragment.java
with
15 additions
and
10 deletions
src/org/sflphone/client/HomeActivity.java
+
5
−
8
View file @
fc9b4e78
...
@@ -328,12 +328,9 @@ public class HomeActivity extends FragmentActivity implements DialingFragment.Ca
...
@@ -328,12 +328,9 @@ public class HomeActivity extends FragmentActivity implements DialingFragment.Ca
if
(
getSupportFragmentManager
().
getBackStackEntryCount
()
>
0
)
{
if
(
getSupportFragmentManager
().
getBackStackEntryCount
()
>
0
)
{
BackStackEntry
entry
=
getSupportFragmentManager
().
getBackStackEntryAt
(
getSupportFragmentManager
().
getBackStackEntryCount
()
-
1
);
BackStackEntry
entry
=
getSupportFragmentManager
().
getBackStackEntryAt
(
getSupportFragmentManager
().
getBackStackEntryCount
()
-
1
);
Log
.
i
(
TAG
,
"Popping:"
+
getSupportFragmentManager
().
getBackStackEntryCount
());
Log
.
i
(
TAG
,
"Name:"
+
entry
.
getName
());
fContent
=
getSupportFragmentManager
().
findFragmentByTag
(
entry
.
getName
());
fContent
=
getSupportFragmentManager
().
findFragmentByTag
(
entry
.
getName
());
if
(
fContent
==
null
)
Log
.
i
(
TAG
,
"Null frag"
);
getSupportFragmentManager
().
popBackStack
(
null
,
FragmentManager
.
POP_BACK_STACK_INCLUSIVE
);
getSupportFragmentManager
().
popBackStack
(
null
,
FragmentManager
.
POP_BACK_STACK_INCLUSIVE
);
fMenu
.
backToHome
();
return
;
return
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/org/sflphone/fragments/MenuFragment.java
+
10
−
2
View file @
fc9b4e78
...
@@ -75,6 +75,8 @@ public class MenuFragment extends Fragment implements LoaderCallbacks<Bundle>, A
...
@@ -75,6 +75,8 @@ public class MenuFragment extends Fragment implements LoaderCallbacks<Bundle>, A
AccountsReceiver
accountReceiver
;
AccountsReceiver
accountReceiver
;
private
Callbacks
mCallbacks
=
sDummyCallbacks
;
private
Callbacks
mCallbacks
=
sDummyCallbacks
;
private
ListView
sections
;
private
static
Callbacks
sDummyCallbacks
=
new
Callbacks
()
{
private
static
Callbacks
sDummyCallbacks
=
new
Callbacks
()
{
@Override
@Override
...
@@ -149,8 +151,10 @@ public class MenuFragment extends Fragment implements LoaderCallbacks<Bundle>, A
...
@@ -149,8 +151,10 @@ public class MenuFragment extends Fragment implements LoaderCallbacks<Bundle>, A
ArrayAdapter
<
String
>
paramAdapter
=
new
ArrayAdapter
<
String
>(
getActivity
(),
R
.
layout
.
item_menu
,
getResources
().
getStringArray
(
ArrayAdapter
<
String
>
paramAdapter
=
new
ArrayAdapter
<
String
>(
getActivity
(),
R
.
layout
.
item_menu
,
getResources
().
getStringArray
(
R
.
array
.
menu_items_param
));
R
.
array
.
menu_items_param
));
((
ListView
)
inflatedView
.
findViewById
(
R
.
id
.
listView
)).
setAdapter
(
paramAdapter
);
sections
=
(
ListView
)
inflatedView
.
findViewById
(
R
.
id
.
listView
);
((
ListView
)
inflatedView
.
findViewById
(
R
.
id
.
listView
)).
setOnItemClickListener
(
new
OnItemClickListener
()
{
sections
.
setAdapter
(
paramAdapter
);
backToHome
();
sections
.
setOnItemClickListener
(
new
OnItemClickListener
()
{
@Override
@Override
public
void
onItemClick
(
AdapterView
<?>
arg0
,
View
selected
,
int
pos
,
long
arg3
)
{
public
void
onItemClick
(
AdapterView
<?>
arg0
,
View
selected
,
int
pos
,
long
arg3
)
{
...
@@ -240,4 +244,8 @@ public class MenuFragment extends Fragment implements LoaderCallbacks<Bundle>, A
...
@@ -240,4 +244,8 @@ public class MenuFragment extends Fragment implements LoaderCallbacks<Bundle>, A
}
}
public
void
backToHome
()
{
sections
.
setItemChecked
(
0
,
true
);
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment