diff options
Diffstat (limited to 'samples/browseable/AdvancedImmersiveMode/res/values')
3 files changed, 17 insertions, 32 deletions
diff --git a/samples/browseable/AdvancedImmersiveMode/res/values/base-strings.xml b/samples/browseable/AdvancedImmersiveMode/res/values/base-strings.xml index 305e12abf..8e4c710cf 100644 --- a/samples/browseable/AdvancedImmersiveMode/res/values/base-strings.xml +++ b/samples/browseable/AdvancedImmersiveMode/res/values/base-strings.xml @@ -23,13 +23,10 @@ <![CDATA[ - \"Immersive Mode\" is a new UI mode which improves \"hide full screen\" and + \n\n\n\"Immersive Mode\", added in Android 4.4, improves the \"hide full screen\" and \"hide nav bar\" modes, by letting users swipe the bars in and out. This sample - lets the user experiment with immersive mode by enabling it and seeing how it interacts + lets the user experiment with immersive mode by seeing how it interacts with some of the other UI flags related to full-screen apps. - \n\nThis sample also lets the user choose between normal immersive mode and "sticky" - immersive mode, which removes the status bar and nav bar - a few seconds after the user has swiped them back in. ]]> diff --git a/samples/browseable/AdvancedImmersiveMode/res/values/strings.xml b/samples/browseable/AdvancedImmersiveMode/res/values/strings.xml index a65b8916a..7b9d9ec4f 100755 --- a/samples/browseable/AdvancedImmersiveMode/res/values/strings.xml +++ b/samples/browseable/AdvancedImmersiveMode/res/values/strings.xml @@ -1,22 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2013 The Android Open Source Project + Copyright 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 + 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 + 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. + 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> - <string name="sample_action">Try these settings!</string> + <string name="sample_show_log">Show Log</string> + <string name="sample_hide_log">Hide Log</string> </resources> diff --git a/samples/browseable/AdvancedImmersiveMode/res/values/template-styles.xml b/samples/browseable/AdvancedImmersiveMode/res/values/template-styles.xml index d3f82ff64..404623e3d 100644 --- a/samples/browseable/AdvancedImmersiveMode/res/values/template-styles.xml +++ b/samples/browseable/AdvancedImmersiveMode/res/values/template-styles.xml @@ -20,7 +20,9 @@ <style name="Theme.Base" parent="android:Theme.Holo.Light" /> - <style name="AppTheme" parent="Theme.Base" /> + <style name="Theme.Sample" parent="Theme.Base" /> + + <style name="AppTheme" parent="Theme.Sample" /> <!-- Widget styling --> <style name="Widget" /> @@ -37,15 +39,4 @@ <item name="android:shadowRadius">2</item> </style> - - <style name="Widget.SampleOutput"> - <item name="android:padding">@dimen/margin_medium</item> - <item name="android:textAppearance">?android:textAppearanceMedium</item> - <item name="android:lineSpacingMultiplier">1.1</item> - </style> - - <style name="Log" parent="Widget.SampleOutput"> - <item name="android:typeface">monospace</item> - </style> - </resources> |