In adding link handling for bug 879558, I broke back behavior for nested settings. Attaching a patch to create a new result code and not overload use of Activity.RESULT_CANCELED. inbound try build: https://tbpl.mozilla.org/?tree=Try&rev=389c706b3327

Aurora try build: https://tbpl.mozilla.org/?tree=Try&rev=7e17d66a8cc8

Beta try build: https://tbpl.mozilla.org/?tree=Try&rev=88551a15686a

Comment on attachment 767345 [details] [diff] [review] Aurora patch: add new result code [Approval Request Comment] Bug caused by (feature/regressing bug #): bug 879558 User impact if declined: users manually navigating through Settings > Data Choices will be returned to browser screen on hitting back, instead of one level up the menu Testing completed (on m-c, etc.): manual confirm of regression and fix of m-a Risk to taking this patch (and alternatives if risky): very low, replaces a constant in an existing code path String or IDL/UUID changes made by this patch: none

Comment on attachment 767348 [details] [diff] [review] Beta patch: Add new result code for GeckoPreferences [Approval Request Comment] Bug caused by (feature/regressing bug #): bug 879558 User impact if declined: users manually navigating through Settings > Data Choices will be returned to browser screen on hitting back, instead of one level up the menu Testing completed (on m-c, etc.): manual confirm of regression and fix of m-b Risk to taking this patch (and alternatives if risky): very low, replaces a constant in an existing code path String or IDL/UUID changes made by this patch: none

Comment on attachment 767343 [details] [diff] [review] Inbound patch: add new result Review of attachment 767343 [details] [diff] [review]: ----------------------------------------------------------------- ::: mobile/android/base/GeckoPreferences.java @@ +75,5 @@ > private static String PREFS_GEO_REPORTING = "app.geo.reportdata"; > private static String PREFS_HEALTHREPORT_LINK = NON_PREF_PREFIX + "healthreport.link"; > > private static int REQUEST_CODE_PREF_SCREEN = 5; > + private static int RESULT_CODE_EXIT_SETTINGS = 6; Nit: Add a comment about why you chose these values. @@ +208,5 @@ > > @Override > public void onActivityResult(int requestCode, int resultCode, Intent data) { > + if (REQUEST_CODE_PREF_SCREEN == requestCode && RESULT_CODE_EXIT_SETTINGS == resultCode) { > + setResult(RESULT_CODE_EXIT_SETTINGS); Nit: I know this is already in the current code, but it would be nice to add a comment here about why we're setting the result with what already appears to be the resultCode.

[Approval Request Comment] Bug caused by (feature/regressing bug #): bug 879558 User impact if declined: users manually navigating through Settings > Data Choices will be returned to browser screen on hitting back, instead of one level up the menu Testing completed (on m-c, etc.): manual confirm of regression and fix of m-b Risk to taking this patch (and alternatives if risky): very low, replaces a constant in an existing code path String or IDL/UUID changes made by this patch: none

[Approval Request Comment] Bug caused by (feature/regressing bug #): bug 879558 User impact if declined: users manually navigating through Settings > Data Choices will be returned to browser screen on hitting back, instead of one level up the menu Testing completed (on m-c, etc.): manual confirm of regression and fix of m-a Risk to taking this patch (and alternatives if risky): very low, replaces a constant in an existing code path String or IDL/UUID changes made by this patch: none

Aurora: https://hg.mozilla.org/releases/mozilla-aurora/rev/67b0221cbd69 Beta: https://hg.mozilla.org/releases/mozilla-beta/rev/eaa8c8b1731b

Verified as fixed in build: Firefox 23; Device: Asus Transformer Tab (Android 4.0.3).