Skip to content
Snippets Groups Projects
Commit fc9b4e78 authored by Alexandre Lision's avatar Alexandre Lision
Browse files

* #36914: highlight correct navigation section

parent 658999c1
No related branches found
No related tags found
No related merge requests found
...@@ -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;
} }
......
...@@ -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);
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment