diff options
| author | Trevor Johns <trevorjohns@google.com> | 2014-11-12 19:44:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 19:44:03 +0000 |
| commit | 0c094f0ca7eadac67240fc541f27b8f902d76f4a (patch) | |
| tree | 0a46de02d6e93cf12182b0b1b11e6d85f1fd2741 /samples/browseable/SwipeRefreshLayoutBasic/res | |
| parent | 13ce376eea001a9942dc418323c3fd2980cbf299 (diff) | |
| parent | d8c7b24e696003e4fc4c848a3f2a86b302f90169 (diff) | |
| download | android_development-0c094f0ca7eadac67240fc541f27b8f902d76f4a.tar.gz android_development-0c094f0ca7eadac67240fc541f27b8f902d76f4a.tar.bz2 android_development-0c094f0ca7eadac67240fc541f27b8f902d76f4a.zip | |
am d8c7b24e: Merge "Update browseable samples for lmp-docs" into lmp-docs
* commit 'd8c7b24e696003e4fc4c848a3f2a86b302f90169':
Update browseable samples for lmp-docs
Diffstat (limited to 'samples/browseable/SwipeRefreshLayoutBasic/res')
3 files changed, 22 insertions, 3 deletions
diff --git a/samples/browseable/SwipeRefreshLayoutBasic/res/values-v21/template-styles.xml b/samples/browseable/SwipeRefreshLayoutBasic/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/SwipeRefreshLayoutBasic/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/SwipeRefreshLayoutBasic/res/values/base-strings.xml b/samples/browseable/SwipeRefreshLayoutBasic/res/values/base-strings.xml index 665d16fed..a9f797f56 100644 --- a/samples/browseable/SwipeRefreshLayoutBasic/res/values/base-strings.xml +++ b/samples/browseable/SwipeRefreshLayoutBasic/res/values/base-strings.xml @@ -14,9 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - <resources> <string name="app_name">SwipeRefreshLayoutBasic</string> <string name="intro_message"> diff --git a/samples/browseable/SwipeRefreshLayoutBasic/res/values/strings.xml b/samples/browseable/SwipeRefreshLayoutBasic/res/values/strings.xml index 6bdb32e3c..6bdb32e3c 100755..100644 --- a/samples/browseable/SwipeRefreshLayoutBasic/res/values/strings.xml +++ b/samples/browseable/SwipeRefreshLayoutBasic/res/values/strings.xml |