diff options
| author | Megha Joshi <mjoshi@google.com> | 2012-03-08 12:20:00 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-08 12:20:00 -0800 |
| commit | 27a6a0f0a5dc74886a7f0c42d6300a2cb92f6da2 (patch) | |
| tree | 0953159597a878fb3f8a07fa2c1a42029bcd2f92 | |
| parent | 88d972501ae16197ebabb2f053a69856bca410d9 (diff) | |
| parent | 52b557155bc1a34b2d900bf754a31160fd8b120d (diff) | |
| download | android_development-27a6a0f0a5dc74886a7f0c42d6300a2cb92f6da2.tar.gz android_development-27a6a0f0a5dc74886a7f0c42d6300a2cb92f6da2.tar.bz2 android_development-27a6a0f0a5dc74886a7f0c42d6300a2cb92f6da2.zip | |
Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1
| -rw-r--r-- | samples/training/multiscreen/newsreader/res/values-large-land/layouts.xml | 22 | ||||
| -rw-r--r-- | samples/training/multiscreen/newsreader/res/values-large-port/layouts.xml | 22 |
2 files changed, 44 insertions, 0 deletions
diff --git a/samples/training/multiscreen/newsreader/res/values-large-land/layouts.xml b/samples/training/multiscreen/newsreader/res/values-large-land/layouts.xml new file mode 100644 index 000000000..9a4dc8c23 --- /dev/null +++ b/samples/training/multiscreen/newsreader/res/values-large-land/layouts.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> + +<!-- BEGIN_INCLUDE(all) --> +<resources> + <item name="main_layout" type="layout">@layout/twopanes</item> + <bool name="has_two_panes">true</bool> +</resources> +<!-- END_INCLUDE(all) --> diff --git a/samples/training/multiscreen/newsreader/res/values-large-port/layouts.xml b/samples/training/multiscreen/newsreader/res/values-large-port/layouts.xml new file mode 100644 index 000000000..39c4645db --- /dev/null +++ b/samples/training/multiscreen/newsreader/res/values-large-port/layouts.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> + +<!-- BEGIN_INCLUDE(all) --> +<resources> + <item name="main_layout" type="layout">@layout/twopanes_narrow</item> + <bool name="has_two_panes">true</bool> +</resources> +<!-- END_INCLUDE(all) --> |