Author: kmorin Date: 2014-03-11 13:59:38 +0100 (Tue, 11 Mar 2014) New Revision: 73 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/73 Log: fixes #4683 [EDITION] Mettre en sou-titre le contexte dans lequel on est Modified: trunk/src/fr/ifremer/wlo/WloBaseListActivity.java trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java Modified: trunk/src/fr/ifremer/wlo/WloBaseListActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloBaseListActivity.java 2014-03-11 11:04:05 UTC (rev 72) +++ trunk/src/fr/ifremer/wlo/WloBaseListActivity.java 2014-03-11 12:59:38 UTC (rev 73) @@ -406,6 +406,7 @@ case R.id.add_item: Intent intent = new Intent(this, getEditionActivity()); intent.putExtra(WloModelEditionActivity.INTENT_EXTRA_PARENT_MODEL, parentModel); + intent.putExtra(WloModelEditionActivity.INTENT_EXTRA_SUBTITLE, getSupportActionBar().getSubtitle()); startActivity(intent); return true; } @@ -491,6 +492,7 @@ case 0: Intent intent = new Intent(this, getEditionActivity()); intent.putExtra(WloModelEditionActivity.INTENT_EXTRA_MODEL, model); + intent.putExtra(WloModelEditionActivity.INTENT_EXTRA_SUBTITLE, getSupportActionBar().getSubtitle()); startActivity(intent); break; Modified: trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java 2014-03-11 11:04:05 UTC (rev 72) +++ trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java 2014-03-11 12:59:38 UTC (rev 73) @@ -66,6 +66,7 @@ public static final String INTENT_EXTRA_PARENT_MODEL = "parentModel"; public static final String INTENT_EXTRA_MODEL = "model"; + public static final String INTENT_EXTRA_SUBTITLE = "subtitle"; protected M model; @@ -93,6 +94,10 @@ } else { setTitle(model.toString(this)); } + + String subtitle = getIntent().getStringExtra(INTENT_EXTRA_SUBTITLE); + getSupportActionBar().setSubtitle(subtitle); + model.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent event) {