summaryrefslogtreecommitdiffstats
path: root/samples/browseable/BasicNotifications
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2014-11-12 11:39:30 -0800
committerTrevor Johns <trevorjohns@google.com>2014-11-12 11:39:30 -0800
commit527a4f30a69aaa54fc9654539f0b6d839e37af3c (patch)
tree38f816a286e672e8f00caed6a0344c3c18632a78 /samples/browseable/BasicNotifications
parentfcd28181a15ebe95724fe096a8b5198c964b0d7f (diff)
downloadandroid_development-527a4f30a69aaa54fc9654539f0b6d839e37af3c.tar.gz
android_development-527a4f30a69aaa54fc9654539f0b6d839e37af3c.tar.bz2
android_development-527a4f30a69aaa54fc9654539f0b6d839e37af3c.zip
Update browseable samples for lmp-docs
Synced to commit df5e5013422b81b4fd05c0ac9fd964b13624847a. Includes new samples for Android Auto. Change-Id: I3fec46e2a6b3f196682a92f1afd91eb682dc2dc1
Diffstat (limited to 'samples/browseable/BasicNotifications')
-rw-r--r--samples/browseable/BasicNotifications/AndroidManifest.xml4
-rw-r--r--samples/browseable/BasicNotifications/_index.jd15
-rw-r--r--samples/browseable/BasicNotifications/res/values-v21/template-styles.xml22
-rw-r--r--samples/browseable/BasicNotifications/res/values/base-strings.xml3
4 files changed, 31 insertions, 13 deletions
diff --git a/samples/browseable/BasicNotifications/AndroidManifest.xml b/samples/browseable/BasicNotifications/AndroidManifest.xml
index 1e37d0bf6..01f8e3a7a 100644
--- a/samples/browseable/BasicNotifications/AndroidManifest.xml
+++ b/samples/browseable/BasicNotifications/AndroidManifest.xml
@@ -20,9 +20,7 @@
android:versionCode="1"
android:versionName="1.0">
- <uses-sdk
- android:minSdkVersion="8"
- android:targetSdkVersion="17"/>
+ <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
<application
android:allowBackup="true"
diff --git a/samples/browseable/BasicNotifications/_index.jd b/samples/browseable/BasicNotifications/_index.jd
index 02a9b5677..d34b8fbc0 100644
--- a/samples/browseable/BasicNotifications/_index.jd
+++ b/samples/browseable/BasicNotifications/_index.jd
@@ -1,10 +1,11 @@
-
-
-
page.tags="BasicNotifications"
-sample.group=UI
+sample.group=Notification
@jd:body
-<p>This sample demonstrates how to display events in the system's notification
-bar. The {@link android.support.v4.app.NotificationCompat} API is used for
-compatibility with devices running Android 2.2 or higher.</p>
+<p>
+
+ This sample demonstrates how to display events in the system\'s notification bar. The
+ NotificationCompat API is used for compatibility with older devices, running Android
+ 2.2 (Froyo) or newer.
+
+ </p>
diff --git a/samples/browseable/BasicNotifications/res/values-v21/template-styles.xml b/samples/browseable/BasicNotifications/res/values-v21/template-styles.xml
new file mode 100644
index 000000000..134fcd9d3
--- /dev/null
+++ b/samples/browseable/BasicNotifications/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/BasicNotifications/res/values/base-strings.xml b/samples/browseable/BasicNotifications/res/values/base-strings.xml
index 15dafec61..87f5bf0c9 100644
--- a/samples/browseable/BasicNotifications/res/values/base-strings.xml
+++ b/samples/browseable/BasicNotifications/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">BasicNotifications</string>
<string name="intro_message">