OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6f1dfe6) | patch
Fix CameraSettingsActivityHelper
authorAlan Newberger <alann@google.com>
Wed, 17 Sep 2014 03:54:56 +0000 (20:54 -0700)
committerAlan Newberger <alann@google.com>
Wed, 17 Sep 2014 03:57:59 +0000 (20:57 -0700)
commit577e351abe784f3da8074ce3d83f0d2e532a2895
tree8c8ad4f54f7e8da5dbab3139614b5c664c845fd3tree | snapshot
parent6f1dfe69b93bfb42c11d456901e9d3ffee826ccecommit | 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
src/com/android/camera/settings/CameraSettingsActivity.java diff | blob | history
packages/apps/Camera2
About OSDN
Find Software
Develop Software
Help