diff options
author | Doris Liu <tianliu@google.com> | 2013-10-12 00:14:13 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-12 00:14:13 -0700 |
commit | 193da1b0cd3079dcfe9dbc6f4162190377272e84 (patch) | |
tree | a8b7ac69d7d9751b3d0a3f1ae22feef051023dcc /res | |
parent | 25d6a81eaa4260e792381f4eb035ea1d4674b81c (diff) | |
parent | a500241084f9e267e5f154b55e7a76a09623e6d8 (diff) | |
download | android_packages_apps_Snap-193da1b0cd3079dcfe9dbc6f4162190377272e84.tar.gz android_packages_apps_Snap-193da1b0cd3079dcfe9dbc6f4162190377272e84.tar.bz2 android_packages_apps_Snap-193da1b0cd3079dcfe9dbc6f4162190377272e84.zip |
am a5002410: Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad
* commit 'a500241084f9e267e5f154b55e7a76a09623e6d8':
Correct initial orientation of camera controls
Diffstat (limited to 'res')
-rw-r--r-- | res/values-sw600dp/booleans.xml | 18 | ||||
-rw-r--r-- | res/values/bool.xml | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/res/values-sw600dp/booleans.xml b/res/values-sw600dp/booleans.xml new file mode 100644 index 000000000..c7522cfa9 --- /dev/null +++ b/res/values-sw600dp/booleans.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<resources> + <bool name="is_tablet">true</bool> +</resources>
\ No newline at end of file diff --git a/res/values/bool.xml b/res/values/bool.xml index 464842ab4..067e3d9a9 100644 --- a/res/values/bool.xml +++ b/res/values/bool.xml @@ -15,4 +15,5 @@ --> <resources> <bool name="show_action_bar_title">false</bool> + <bool name="is_tablet">false</bool> </resources>
\ No newline at end of file |