summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorzafir <zafir@google.com>2015-03-09 18:13:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-09 18:13:43 +0000
commit20d1014b73d467531d2e5a6c53164ad2955d515c (patch)
tree84a933925aec66844d2a18e16637628031227b74 /res
parent80d68da457199b4c528a4900afc1deec1db3f3c5 (diff)
parentdf682a2d9cd88c31e84b8e69d6bdc3dbb5c894bb (diff)
downloadandroid_packages_apps_Camera2-20d1014b73d467531d2e5a6c53164ad2955d515c.tar.gz
android_packages_apps_Camera2-20d1014b73d467531d2e5a6c53164ad2955d515c.tar.bz2
android_packages_apps_Camera2-20d1014b73d467531d2e5a6c53164ad2955d515c.zip
Merge "Hide "Advanced" settings screen on N6." into ub-camera-haleakala
Diffstat (limited to 'res')
-rw-r--r--res/xml/camera_preferences.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 3266caeb9..771396742 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -15,7 +15,8 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="prefscreen_top">
<!-- Resolutions and Quality -->
<PreferenceScreen