commit | 577e351abe784f3da8074ce3d83f0d2e532a2895 | [log] [tgz] |
---|---|---|
author | Alan Newberger <alann@google.com> | Tue Sep 16 20:54:56 2014 -0700 |
committer | Alan Newberger <alann@google.com> | Tue Sep 16 20:57:59 2014 -0700 |
tree | 8c8ad4f54f7e8da5dbab3139614b5c664c845fd3 | |
parent | 6f1dfe69b93bfb42c11d456901e9d3ffee826cce [diff] |
Fix CameraSettingsActivityHelper Previous hack to allow activity up button to work, interfered with custom preference merging we use to conditonally add items to Settings. Now fixed by allowing internal control of whether the full preference tree is returned by the fragment or just the desired subtree, so that the Helper can access the full tree. Bug: 17534830 Change-Id: I11510f365b9e212f07009b2233bb5d8036228774