diff options
77 files changed, 1231 insertions, 186 deletions
diff --git a/background/JobScheduler/README.md b/background/JobScheduler/README.md index d5c7cb05..84862c05 100644 --- a/background/JobScheduler/README.md +++ b/background/JobScheduler/README.md @@ -8,8 +8,8 @@ background tasks when certain tasks apply. Pre-requisites -------------- -- Android SDK v21 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Getting Started @@ -33,7 +33,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/background/alarms/RepeatingAlarm/Application/build.gradle b/background/alarms/RepeatingAlarm/Application/build.gradle new file mode 100644 index 00000000..906d12f3 --- /dev/null +++ b/background/alarms/RepeatingAlarm/Application/build.gradle @@ -0,0 +1,59 @@ + +buildscript { + repositories { + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:2.1.2' + } +} + +apply plugin: 'com.android.application' + +repositories { + jcenter() +} + +dependencies { + compile "com.android.support:support-v4:24.1.1" + compile "com.android.support:gridlayout-v7:24.1.1" + compile "com.android.support:cardview-v7:24.1.1" + compile "com.android.support:appcompat-v7:24.1.1" +} + +// The sample build uses multiple directories to +// keep boilerplate and common code separate from +// the main sample code. +List<String> dirs = [ + 'main', // main sample code; look here for the interesting stuff. + 'common', // components that are reused by multiple samples + 'template'] // boilerplate code that is generated by the sample template process + +android { + compileSdkVersion 24 + buildToolsVersion "24.0.1" + + defaultConfig { + minSdkVersion 11 + targetSdkVersion 24 + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + sourceSets { + main { + dirs.each { dir -> + java.srcDirs "src/${dir}/java" + res.srcDirs "src/${dir}/res" + } + } + androidTest.setRoot('tests') + androidTest.java.srcDirs = ['tests/src'] + + } + +} diff --git a/background/alarms/RepeatingAlarm/README.md b/background/alarms/RepeatingAlarm/README.md index af4826ec..752f8dd9 100644 --- a/background/alarms/RepeatingAlarm/README.md +++ b/background/alarms/RepeatingAlarm/README.md @@ -8,8 +8,8 @@ in template-params.xml. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Getting Started @@ -33,7 +33,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/connectivity/bluetooth/BluetoothLeGatt/README.md b/connectivity/bluetooth/BluetoothLeGatt/README.md index 27276d02..2519fec7 100644 --- a/connectivity/bluetooth/BluetoothLeGatt/README.md +++ b/connectivity/bluetooth/BluetoothLeGatt/README.md @@ -23,8 +23,8 @@ The Activities communicate with the Service, which in turn interacts with the [B Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -53,7 +53,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/connectivity/network/BasicNetworking/README.md b/connectivity/network/BasicNetworking/README.md index 3c4a6f93..5618f2ad 100644 --- a/connectivity/network/BasicNetworking/README.md +++ b/connectivity/network/BasicNetworking/README.md @@ -22,8 +22,8 @@ in actual production code. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -52,7 +52,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/connectivity/network/NetworkConnect/README.md b/connectivity/network/NetworkConnect/README.md index ac155b50..bd6d9920 100644 --- a/connectivity/network/NetworkConnect/README.md +++ b/connectivity/network/NetworkConnect/README.md @@ -17,8 +17,8 @@ network connection, the sample uses HttpURLConnection. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -47,7 +47,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/connectivity/nfc/BeamLargeFiles/Application/README-simpleview.txt b/connectivity/nfc/BeamLargeFiles/Application/README-simpleview.txt new file mode 100644 index 00000000..4ac7cdb8 --- /dev/null +++ b/connectivity/nfc/BeamLargeFiles/Application/README-simpleview.txt @@ -0,0 +1,29 @@ +<#-- + 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 + + 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. +--> + +Steps to implement SimpleView template: +-in template-params.xml.ftl: + -add the following line to common imports + <common src="activities"/> + +-Add a Fragment to handle behavior. In your MainActivity.java class, it will reference a Fragment + called (yourProjectName)Fragment.java. Create that file in your project, using the "main" source + folder instead of "common" or "templates". + For instance, if your package name is com.example.foo, create the file + src/main/java/com/example/foo/FooFragment.java + +-refer to sampleSamples/simpleViewSample for a reference implementation of a +project built on this template. diff --git a/connectivity/nfc/CardEmulation/README.md b/connectivity/nfc/CardEmulation/README.md index c96ab5e5..c3f49b9e 100644 --- a/connectivity/nfc/CardEmulation/README.md +++ b/connectivity/nfc/CardEmulation/README.md @@ -12,8 +12,8 @@ The "CardReader" sample can be used to read the loyalty card implemented in this Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Getting Started @@ -37,7 +37,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/connectivity/nfc/CardReader/README.md b/connectivity/nfc/CardReader/README.md index 88bddeff..2338f8a8 100644 --- a/connectivity/nfc/CardReader/README.md +++ b/connectivity/nfc/CardReader/README.md @@ -13,8 +13,8 @@ reader is interested, and establish communication with the card Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Getting Started @@ -38,7 +38,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/connectivity/sync/BasicSyncAdapter/README.md b/connectivity/sync/BasicSyncAdapter/README.md index d5c39c79..78969f61 100644 --- a/connectivity/sync/BasicSyncAdapter/README.md +++ b/connectivity/sync/BasicSyncAdapter/README.md @@ -28,8 +28,8 @@ For more on SyncAdapters refer to [Transferring Data Using Sync Adapters][1] Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -58,7 +58,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/content/contacts/BasicContactables/README.md b/content/contacts/BasicContactables/README.md index 56af3b7a..9e69f2c4 100644 --- a/content/contacts/BasicContactables/README.md +++ b/content/contacts/BasicContactables/README.md @@ -25,8 +25,8 @@ For details on how to query the contacts provider, refer to the [Contacts Provid Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -55,7 +55,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/content/documentsUi/StorageClient/README.md b/content/documentsUi/StorageClient/README.md index 8315528a..ffe5f2ff 100644 --- a/content/documentsUi/StorageClient/README.md +++ b/content/documentsUi/StorageClient/README.md @@ -23,8 +23,8 @@ interface, and choose an image on your device. It will be displayed in this app Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -53,7 +53,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/content/documentsUi/StorageProvider/README.md b/content/documentsUi/StorageProvider/README.md index bc343bcd..0b91b25f 100644 --- a/content/documentsUi/StorageProvider/README.md +++ b/content/documentsUi/StorageProvider/README.md @@ -20,8 +20,8 @@ See [Writing A Custom Document Provider guide][3] for all the details on how to Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -50,7 +50,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/content/multiuser/AppRestrictions/README.md b/content/multiuser/AppRestrictions/README.md index b0765a76..e47dc779 100644 --- a/content/multiuser/AppRestrictions/README.md +++ b/content/multiuser/AppRestrictions/README.md @@ -12,8 +12,8 @@ restriction settings, if available. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Getting Started @@ -37,7 +37,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/input/gestures/BasicGestureDetect/README.md b/input/gestures/BasicGestureDetect/README.md index fbaba315..64bfbda1 100644 --- a/input/gestures/BasicGestureDetect/README.md +++ b/input/gestures/BasicGestureDetect/README.md @@ -24,8 +24,8 @@ that sends all motion events to the gesture detector. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -54,7 +54,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/input/multitouch/BasicMultitouch/README.md b/input/multitouch/BasicMultitouch/README.md index 91a1af79..6f99af45 100644 --- a/input/multitouch/BasicMultitouch/README.md +++ b/input/multitouch/BasicMultitouch/README.md @@ -29,8 +29,8 @@ touch. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -59,7 +59,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/media/BasicMediaDecoder/README.md b/media/BasicMediaDecoder/README.md index 6ed78920..ac4125e7 100644 --- a/media/BasicMediaDecoder/README.md +++ b/media/BasicMediaDecoder/README.md @@ -54,8 +54,8 @@ MediaExtractor instance. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -84,7 +84,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/media/BasicMediaRouter/README.md b/media/BasicMediaRouter/README.md index 1a1efed7..b4d711d4 100644 --- a/media/BasicMediaRouter/README.md +++ b/media/BasicMediaRouter/README.md @@ -14,8 +14,8 @@ Once connected, use the "Change Color" button to change the background color of Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Getting Started @@ -39,7 +39,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/media/Camera2Basic/README.md b/media/Camera2Basic/README.md index cee71783..858228ad 100644 --- a/media/Camera2Basic/README.md +++ b/media/Camera2Basic/README.md @@ -42,8 +42,8 @@ when you are done. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.1 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -72,7 +72,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/media/Camera2Video/README.md b/media/Camera2Video/README.md index 69c0c890..191fad84 100644 --- a/media/Camera2Video/README.md +++ b/media/Camera2Video/README.md @@ -44,7 +44,7 @@ Pre-requisites -------------- - Android SDK 24 -- Android Build Tools v24.0.0 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots diff --git a/media/HdrViewfinder/README.md b/media/HdrViewfinder/README.md index c373fb18..0e8d0a9d 100644 --- a/media/HdrViewfinder/README.md +++ b/media/HdrViewfinder/README.md @@ -44,7 +44,7 @@ Pre-requisites -------------- - Android SDK 24 -- Android Build Tools v24.0.0 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots diff --git a/media/MediaBrowserService/README.md b/media/MediaBrowserService/README.md index 84be64eb..3835a23d 100644 --- a/media/MediaBrowserService/README.md +++ b/media/MediaBrowserService/README.md @@ -72,8 +72,8 @@ To make it compatible with Android Auto, you also need to: Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -102,7 +102,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/media/MediaRecorder/README.md b/media/MediaRecorder/README.md index ed234cd8..cb13b4ae 100644 --- a/media/MediaRecorder/README.md +++ b/media/MediaRecorder/README.md @@ -25,8 +25,8 @@ and basic error handling. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.2 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -55,7 +55,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/media/MediaRouter/README.md b/media/MediaRouter/README.md index beb5570e..ad0103f3 100644 --- a/media/MediaRouter/README.md +++ b/media/MediaRouter/README.md @@ -7,8 +7,8 @@ Demonstrates how to create a custom media route provider. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Getting Started @@ -32,7 +32,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/notification/BasicNotifications/README.md b/notification/BasicNotifications/README.md index aaa9d448..8de79c68 100644 --- a/notification/BasicNotifications/README.md +++ b/notification/BasicNotifications/README.md @@ -53,8 +53,8 @@ notificationManager.notify(NOTIFICATION_ID, builder.build()); Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -83,7 +83,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/notification/CustomNotifications/README.md b/notification/CustomNotifications/README.md index 225bfe3c..a29823ec 100644 --- a/notification/CustomNotifications/README.md +++ b/notification/CustomNotifications/README.md @@ -25,8 +25,8 @@ and expand the notification. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -55,7 +55,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/notification/LNotifications/README.md b/notification/LNotifications/README.md index 5d2437f2..d5a34faa 100644 --- a/notification/LNotifications/README.md +++ b/notification/LNotifications/README.md @@ -26,8 +26,8 @@ for a notification (`OtherMetadataFragment`). Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -56,7 +56,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/notification/MessagingService/README.md b/notification/MessagingService/README.md index e844437f..19fb65d7 100644 --- a/notification/MessagingService/README.md +++ b/notification/MessagingService/README.md @@ -3,9 +3,13 @@ Android MessagingService Sample =================================== This sample shows a simple service that sends notifications using -NotificationCompat. In addition to sending a notification, it also extends -the notification with a CarExtender to make it compatible with Android Auto. -Each unread conversation from a user is sent as a distinct notification. +NotificationCompat. It also extends the notification with Remote +Input to allow Android N devices to reply via text directly from +the notification without having to open an App. The same Remote +Input object also allows Android Auto users to respond by voice +when the notification is presented there. +Note: Each unread conversation from a user is sent as a distinct +notification. Introduction ------------ @@ -46,8 +50,8 @@ TextView in MessagingFragment for correlation. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -76,7 +80,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/renderScript/BasicRenderScript/README.md b/renderScript/BasicRenderScript/README.md index 2d440840..b12e9486 100644 --- a/renderScript/BasicRenderScript/README.md +++ b/renderScript/BasicRenderScript/README.md @@ -29,7 +29,7 @@ Pre-requisites -------------- - Android SDK 24 -- Android Build Tools v24.0.0 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots diff --git a/renderScript/RenderScriptIntrinsic/README.md b/renderScript/RenderScriptIntrinsic/README.md index 05e1207a..f5ff558d 100644 --- a/renderScript/RenderScriptIntrinsic/README.md +++ b/renderScript/RenderScriptIntrinsic/README.md @@ -38,7 +38,7 @@ Pre-requisites -------------- - Android SDK 24 -- Android Build Tools v24.0.0 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots diff --git a/security/keystore/BasicAndroidKeyStore/README.md b/security/keystore/BasicAndroidKeyStore/README.md index 6902dd9c..37b27876 100644 --- a/security/keystore/BasicAndroidKeyStore/README.md +++ b/security/keystore/BasicAndroidKeyStore/README.md @@ -23,8 +23,8 @@ Next to that appropriate exception handling for potential errors is being displa Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -53,7 +53,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/sensors/BatchStepSensor/README.md b/sensors/BatchStepSensor/README.md index 861f5043..3bded3d9 100644 --- a/sensors/BatchStepSensor/README.md +++ b/sensors/BatchStepSensor/README.md @@ -31,8 +31,8 @@ covered in this sample. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -61,7 +61,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/testing/ActivityInstrumentation/README.md b/testing/ActivityInstrumentation/README.md index dd9a1bb1..09ec4e16 100644 --- a/testing/ActivityInstrumentation/README.md +++ b/testing/ActivityInstrumentation/README.md @@ -8,8 +8,8 @@ internal state of an Activity. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Getting Started @@ -33,7 +33,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/DrawableTinting/README.md b/ui/DrawableTinting/README.md index 8b5c10bd..bfc7f933 100644 --- a/ui/DrawableTinting/README.md +++ b/ui/DrawableTinting/README.md @@ -16,8 +16,8 @@ changed from the UI to see the effect of different options. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Getting Started @@ -41,7 +41,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/Interpolator/Application/README-fragmentview.txt b/ui/Interpolator/Application/README-fragmentview.txt new file mode 100644 index 00000000..38d903f0 --- /dev/null +++ b/ui/Interpolator/Application/README-fragmentview.txt @@ -0,0 +1,37 @@ +<!-- + 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 + + 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. +--> + +Steps to implement FragmentView template: +-in template-params.xml.ftl: + -add the following line to common imports + <common src="activities"/> + +-Add a Fragment to show behavior. In your MainActivity.java class, it will reference a Fragment + called (yourProjectName)Fragment.java. Create that file in your project, using the "main" source + folder instead of "common" or "templates". + For instance, if your package name is com.example.foo, create the file + src/main/java/com/example/foo/FooFragment.java + + +-Within this fragment, make sure that the onCreate method has the line + "setHasOptionsMenu(true);", to enable the fragment to handle menu events. + +-In order to override menu events, override onOptionsItemSelected. + +-refer to sampleSamples/fragmentViewSample for a reference implementation of a +project built on this template. + + diff --git a/ui/Interpolator/README.md b/ui/Interpolator/README.md index 27234490..8fcb709c 100644 --- a/ui/Interpolator/README.md +++ b/ui/Interpolator/README.md @@ -24,7 +24,7 @@ Pre-requisites -------------- - Android SDK 24 -- Android Build Tools v24.0.0 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots diff --git a/ui/accessibility/BasicAccessibility/README.md b/ui/accessibility/BasicAccessibility/README.md index 5f470afe..ce6a3399 100644 --- a/ui/accessibility/BasicAccessibility/README.md +++ b/ui/accessibility/BasicAccessibility/README.md @@ -20,8 +20,8 @@ description of the in-focus widget. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -50,7 +50,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/actionbar/DoneBar/README.md b/ui/actionbar/DoneBar/README.md index 7344e711..da3b2f8e 100644 --- a/ui/actionbar/DoneBar/README.md +++ b/ui/actionbar/DoneBar/README.md @@ -31,8 +31,8 @@ ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.MATCH_PARENT))` on th Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -61,7 +61,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/README.md b/ui/actionbarcompat/ActionBarCompat-Basic/README.md index bfa27c0e..95b573ce 100644 --- a/ui/actionbarcompat/ActionBarCompat-Basic/README.md +++ b/ui/actionbarcompat/ActionBarCompat-Basic/README.md @@ -35,8 +35,8 @@ would otherwise be created during when `[onCreateOptionsMenu()][3]` is called. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -65,7 +65,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/README.md b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/README.md index 35058430..0b1b1d87 100644 --- a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/README.md +++ b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/README.md @@ -17,8 +17,8 @@ The sample uses [ListFragment][2] from the v4 support library to display the lis Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -47,7 +47,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/README.md b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/README.md index 664cef21..d43849ed 100644 --- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/README.md +++ b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/README.md @@ -22,14 +22,14 @@ necessary to display a compatible Action Bar on devices running Android v2.1+. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots ------------- -<img src="screenshots/1-gridview.png" height="400" alt="Screenshot"/> <img src="screenshots/2-detail.png" height="400" alt="Screenshot"/> +<img src="screenshots/1-image.png" height="400" alt="Screenshot"/> <img src="screenshots/2-text.png" height="400" alt="Screenshot"/> Getting Started --------------- @@ -52,7 +52,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/README.md b/ui/actionbarcompat/ActionBarCompat-Styled/README.md index bf2a0e50..88355b2c 100644 --- a/ui/actionbarcompat/ActionBarCompat-Styled/README.md +++ b/ui/actionbarcompat/ActionBarCompat-Styled/README.md @@ -2,16 +2,16 @@ Android ActionBarCompat-Styled Sample =================================== -This sample shows you how to use ActionBarCompat with a customized theme. It utilizes a +This sample shows you how to use ActionBarCompat with a customized theme. It utilizes a split action bar when running on a device with a narrow display, and shows three tabs. Introduction ------------ -This sample shows how to style an ActionBar using the [support library][1] on devices running +This sample shows how to style an ActionBar using the [support library][1] on devices running Android v2.1+ using a custom theme. -This Activity extends from ActionBarActivity, which provides all of the function +This Activity extends from ActionBarActivity, which provides all of the function necessary to display a compatible Action Bar on devices running Android v2.1+. A custom application theme and styles are defined in XML. @@ -23,8 +23,8 @@ Assets have been generated using the ['Android Action Bar Style Generator'][2]. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -53,7 +53,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/README.md b/ui/activityscenetransition/ActivitySceneTransitionBasic/README.md index 0e930377..bc6e6313 100644 --- a/ui/activityscenetransition/ActivitySceneTransitionBasic/README.md +++ b/ui/activityscenetransition/ActivitySceneTransitionBasic/README.md @@ -19,8 +19,8 @@ See [Defining Custom Animations][1] for all the details on how to do this. Pre-requisites -------------- -- Android SDK v21 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -49,7 +49,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/graphics/DisplayingBitmaps/README.md b/ui/graphics/DisplayingBitmaps/README.md index e47b105d..83e70a5c 100644 --- a/ui/graphics/DisplayingBitmaps/README.md +++ b/ui/graphics/DisplayingBitmaps/README.md @@ -20,8 +20,8 @@ in UI elements such as ViewPager and ListView/GridView. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.2 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -50,7 +50,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/holo/BorderlessButtons/README.md b/ui/holo/BorderlessButtons/README.md index 274a00f7..18581919 100644 --- a/ui/holo/BorderlessButtons/README.md +++ b/ui/holo/BorderlessButtons/README.md @@ -24,8 +24,8 @@ Styles are directly applied to widgets in their XML layout definitions. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -54,7 +54,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/transition/BasicTransition/README.md b/ui/transition/BasicTransition/README.md index 250c4de7..cd9895c6 100644 --- a/ui/transition/BasicTransition/README.md +++ b/ui/transition/BasicTransition/README.md @@ -33,8 +33,8 @@ take place. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -63,7 +63,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/transition/CustomTransition/README.md b/ui/transition/CustomTransition/README.md index fd706e58..323ee365 100644 --- a/ui/transition/CustomTransition/README.md +++ b/ui/transition/CustomTransition/README.md @@ -32,8 +32,8 @@ TransitionManager.go(mScenes[mCurrentScene], mTransition); Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -62,7 +62,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/views/Elevation/ElevationBasic/Application/README-fragmentview.txt b/ui/views/Elevation/ElevationBasic/Application/README-fragmentview.txt new file mode 100644 index 00000000..38d903f0 --- /dev/null +++ b/ui/views/Elevation/ElevationBasic/Application/README-fragmentview.txt @@ -0,0 +1,37 @@ +<!-- + 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 + + 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. +--> + +Steps to implement FragmentView template: +-in template-params.xml.ftl: + -add the following line to common imports + <common src="activities"/> + +-Add a Fragment to show behavior. In your MainActivity.java class, it will reference a Fragment + called (yourProjectName)Fragment.java. Create that file in your project, using the "main" source + folder instead of "common" or "templates". + For instance, if your package name is com.example.foo, create the file + src/main/java/com/example/foo/FooFragment.java + + +-Within this fragment, make sure that the onCreate method has the line + "setHasOptionsMenu(true);", to enable the fragment to handle menu events. + +-In order to override menu events, override onOptionsItemSelected. + +-refer to sampleSamples/fragmentViewSample for a reference implementation of a +project built on this template. + + diff --git a/ui/views/Elevation/ElevationBasic/README.md b/ui/views/Elevation/ElevationBasic/README.md index 22e4df62..b6981432 100644 --- a/ui/views/Elevation/ElevationBasic/README.md +++ b/ui/views/Elevation/ElevationBasic/README.md @@ -41,8 +41,8 @@ The elevation reverts back once the touch is removed. Pre-requisites -------------- -- Android SDK v21 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -71,7 +71,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/views/HorizontalPaging/README.md b/ui/views/HorizontalPaging/README.md index 66a746ea..c03ba9a9 100644 --- a/ui/views/HorizontalPaging/README.md +++ b/ui/views/HorizontalPaging/README.md @@ -30,8 +30,8 @@ know the selected tab, so you can update your ActionBar with `setSelectedNavigat Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -60,7 +60,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/views/NavigationDrawer/README.md b/ui/views/NavigationDrawer/README.md index ce9cfe2c..59bd29e7 100644 --- a/ui/views/NavigationDrawer/README.md +++ b/ui/views/NavigationDrawer/README.md @@ -8,8 +8,8 @@ support library. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.2 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Getting Started @@ -33,7 +33,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/views/RecyclerView/Application/README-fragmentview.txt b/ui/views/RecyclerView/Application/README-fragmentview.txt new file mode 100644 index 00000000..38d903f0 --- /dev/null +++ b/ui/views/RecyclerView/Application/README-fragmentview.txt @@ -0,0 +1,37 @@ +<!-- + 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 + + 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. +--> + +Steps to implement FragmentView template: +-in template-params.xml.ftl: + -add the following line to common imports + <common src="activities"/> + +-Add a Fragment to show behavior. In your MainActivity.java class, it will reference a Fragment + called (yourProjectName)Fragment.java. Create that file in your project, using the "main" source + folder instead of "common" or "templates". + For instance, if your package name is com.example.foo, create the file + src/main/java/com/example/foo/FooFragment.java + + +-Within this fragment, make sure that the onCreate method has the line + "setHasOptionsMenu(true);", to enable the fragment to handle menu events. + +-In order to override menu events, override onOptionsItemSelected. + +-refer to sampleSamples/fragmentViewSample for a reference implementation of a +project built on this template. + + diff --git a/ui/views/RecyclerView/README.md b/ui/views/RecyclerView/README.md index 1230c313..0b8dd9da 100644 --- a/ui/views/RecyclerView/README.md +++ b/ui/views/RecyclerView/README.md @@ -29,8 +29,8 @@ tapped. Use radio buttons to toggle between [LinearLayoutManager][2] and Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -59,7 +59,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/views/SlidingTabs/SlidingTabsBasic/README.md b/ui/views/SlidingTabs/SlidingTabsBasic/README.md index 20831d18..644233fc 100644 --- a/ui/views/SlidingTabs/SlidingTabsBasic/README.md +++ b/ui/views/SlidingTabs/SlidingTabsBasic/README.md @@ -8,8 +8,8 @@ ViewPager title strip which gives continuous feedback to the user when scrolling Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Getting Started @@ -33,7 +33,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/views/SlidingTabs/SlidingTabsColors/README.md b/ui/views/SlidingTabs/SlidingTabsColors/README.md index 6d5f4452..b8059c84 100644 --- a/ui/views/SlidingTabs/SlidingTabsColors/README.md +++ b/ui/views/SlidingTabs/SlidingTabsColors/README.md @@ -25,8 +25,8 @@ layout ID of the custom layout. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -55,7 +55,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/README.md b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/README.md index f38760c8..9dab7842 100644 --- a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/README.md +++ b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/README.md @@ -9,8 +9,8 @@ In this sample the View which can be refreshed is a ListView. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Getting Started @@ -34,7 +34,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/README.md b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/README.md index 4104a907..fadc7f5b 100644 --- a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/README.md +++ b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/README.md @@ -23,8 +23,8 @@ action from the action bar also refreshes the list. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -53,7 +53,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/README.md b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/README.md index 6fe1f1b1..8630de3b 100644 --- a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/README.md +++ b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/README.md @@ -10,8 +10,8 @@ contains a scrollable GridView, along with a TextView empty view. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Getting Started @@ -35,7 +35,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/views/TextSwitcher/README.md b/ui/views/TextSwitcher/README.md index 4c4b8532..e2d239a4 100644 --- a/ui/views/TextSwitcher/README.md +++ b/ui/views/TextSwitcher/README.md @@ -22,8 +22,8 @@ in and out fade animations. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -52,7 +52,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/window/AdvancedImmersiveMode/Application/build.gradle b/ui/window/AdvancedImmersiveMode/Application/build.gradle new file mode 100644 index 00000000..ebbee866 --- /dev/null +++ b/ui/window/AdvancedImmersiveMode/Application/build.gradle @@ -0,0 +1,59 @@ + +buildscript { + repositories { + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:2.1.2' + } +} + +apply plugin: 'com.android.application' + +repositories { + jcenter() +} + +dependencies { + compile "com.android.support:support-v4:24.1.1" + compile "com.android.support:support-v13:24.1.1" + compile "com.android.support:cardview-v7:24.1.1" + compile "com.android.support:appcompat-v7:24.1.1" +} + +// The sample build uses multiple directories to +// keep boilerplate and common code separate from +// the main sample code. +List<String> dirs = [ + 'main', // main sample code; look here for the interesting stuff. + 'common', // components that are reused by multiple samples + 'template'] // boilerplate code that is generated by the sample template process + +android { + compileSdkVersion 24 + buildToolsVersion "24.0.1" + + defaultConfig { + minSdkVersion 19 + targetSdkVersion 24 + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + sourceSets { + main { + dirs.each { dir -> + java.srcDirs "src/${dir}/java" + res.srcDirs "src/${dir}/res" + } + } + androidTest.setRoot('tests') + androidTest.java.srcDirs = ['tests/src'] + + } + +} diff --git a/ui/window/AdvancedImmersiveMode/README.md b/ui/window/AdvancedImmersiveMode/README.md index a00087de..1e1b7936 100644 --- a/ui/window/AdvancedImmersiveMode/README.md +++ b/ui/window/AdvancedImmersiveMode/README.md @@ -26,8 +26,8 @@ appear. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -56,7 +56,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/window/BasicImmersiveMode/README.md b/ui/window/BasicImmersiveMode/README.md index 613833c5..593e72ef 100644 --- a/ui/window/BasicImmersiveMode/README.md +++ b/ui/window/BasicImmersiveMode/README.md @@ -19,8 +19,8 @@ SYSTEM_UI_FLAG_IMMERSIVE system ui flag. When combined with the SYSTEM_UI_FLAG_H Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -49,7 +49,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/window/ImmersiveMode/README.md b/ui/window/ImmersiveMode/README.md index 4002eb4c..f9c0bd9a 100644 --- a/ui/window/ImmersiveMode/README.md +++ b/ui/window/ImmersiveMode/README.md @@ -9,8 +9,8 @@ click the "Toggle immersive mode" button, then try swiping the bar in and out! Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Getting Started @@ -34,7 +34,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/ui/window/MultiWindowPlayground/.google/packaging.yaml b/ui/window/MultiWindowPlayground/.google/packaging.yaml index a6ca69ec..a2ac75a8 100644 --- a/ui/window/MultiWindowPlayground/.google/packaging.yaml +++ b/ui/window/MultiWindowPlayground/.google/packaging.yaml @@ -4,7 +4,7 @@ # This file is used by Google as part of our samples packaging process. # End users may safely ignore this file. It has no relevance to other systems. --- -status: DRAFT +status: PUBLISHED technologies: [Android] categories: [Android N Preview] languages: [Java] diff --git a/ui/window/MultiWindowPlayground/Application/build.gradle b/ui/window/MultiWindowPlayground/Application/build.gradle index 9d6d0b8e..87039df3 100644 --- a/ui/window/MultiWindowPlayground/Application/build.gradle +++ b/ui/window/MultiWindowPlayground/Application/build.gradle @@ -33,13 +33,13 @@ allprojects { apply plugin: 'com.android.application' android { - compileSdkVersion '24' + compileSdkVersion 24 buildToolsVersion '23.0.3' defaultConfig { applicationId "com.android.multiwindowplayground" - minSdkVersion 'N' - targetSdkVersion 'N' + minSdkVersion 24 + targetSdkVersion 24 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/ui/window/MultiWindowPlayground/README.md b/ui/window/MultiWindowPlayground/README.md index ea73dc10..1dd616fe 100644 --- a/ui/window/MultiWindowPlayground/README.md +++ b/ui/window/MultiWindowPlayground/README.md @@ -47,8 +47,9 @@ Alternatively, the preferred and minimum sizes can be set in a new Pre-requisites -------------- -- Android SDK Preview N -- Android Build Tools v23.0.0 + +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots diff --git a/views/TextLinkify/README.md b/views/TextLinkify/README.md index 36862e22..0776c9ff 100644 --- a/views/TextLinkify/README.md +++ b/views/TextLinkify/README.md @@ -32,8 +32,8 @@ are contained within a [android.text.SpannableString][7]. Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -62,7 +62,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for diff --git a/wearable/wear/AlwaysOn/Wearable/build.gradle b/wearable/wear/AlwaysOn/Wearable/build.gradle new file mode 100644 index 00000000..180a1da3 --- /dev/null +++ b/wearable/wear/AlwaysOn/Wearable/build.gradle @@ -0,0 +1,67 @@ + +buildscript { + repositories { + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:2.1.2' + } +} + +apply plugin: 'com.android.application' + + + +dependencies { + + compile 'com.google.android.support:wearable:1.3.0' + + provided "com.google.android.wearable:wearable:1.0.0" + + compile 'com.google.android.gms:play-services-wearable:8.4.0' + compile 'com.android.support:support-v13:24.1.1' + + compile 'com.google.android.support:wearable:1.4.0' + +} + +// The sample build uses multiple directories to +// keep boilerplate and common code separate from +// the main sample code. +List<String> dirs = [ + 'main', // main sample code; look here for the interesting stuff. + 'common', // components that are reused by multiple samples + 'template'] // boilerplate code that is generated by the sample template process + +android { + compileSdkVersion 24 + + buildToolsVersion "24.0.1" + + defaultConfig { + versionCode 1 + versionName "1.0" + + minSdkVersion 24 + + targetSdkVersion 22 + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + sourceSets { + main { + dirs.each { dir -> + java.srcDirs "src/${dir}/java" + res.srcDirs "src/${dir}/res" + } + } + androidTest.setRoot('tests') + androidTest.java.srcDirs = ['tests/src'] + + } +} diff --git a/wearable/wear/AlwaysOn/settings.gradle b/wearable/wear/AlwaysOn/settings.gradle new file mode 100644 index 00000000..9c2651c7 --- /dev/null +++ b/wearable/wear/AlwaysOn/settings.gradle @@ -0,0 +1,2 @@ + +include ':Wearable' diff --git a/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/activities/SampleActivityBase.java b/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/activities/SampleActivityBase.java new file mode 100644 index 00000000..3228927b --- /dev/null +++ b/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/activities/SampleActivityBase.java @@ -0,0 +1,52 @@ +/* +* 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 +* +* 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. +*/ + +package com.example.android.common.activities; + +import android.os.Bundle; +import android.support.v4.app.FragmentActivity; + +import com.example.android.common.logger.Log; +import com.example.android.common.logger.LogWrapper; + +/** + * Base launcher activity, to handle most of the common plumbing for samples. + */ +public class SampleActivityBase extends FragmentActivity { + + public static final String TAG = "SampleActivityBase"; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + protected void onStart() { + super.onStart(); + initializeLogging(); + } + + /** Set up targets to receive log data */ + public void initializeLogging() { + // Using Log, front-end to the logging chain, emulates android.util.log method signatures. + // Wraps Android's native log framework + LogWrapper logWrapper = new LogWrapper(); + Log.setLogNode(logWrapper); + + Log.i(TAG, "Ready"); + } +} diff --git a/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/Log.java b/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/Log.java new file mode 100644 index 00000000..17503c56 --- /dev/null +++ b/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/Log.java @@ -0,0 +1,236 @@ +/* + * 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. + */ +package com.example.android.common.logger; + +/** + * Helper class for a list (or tree) of LoggerNodes. + * + * <p>When this is set as the head of the list, + * an instance of it can function as a drop-in replacement for {@link android.util.Log}. + * Most of the methods in this class server only to map a method call in Log to its equivalent + * in LogNode.</p> + */ +public class Log { + // Grabbing the native values from Android's native logging facilities, + // to make for easy migration and interop. + public static final int NONE = -1; + public static final int VERBOSE = android.util.Log.VERBOSE; + public static final int DEBUG = android.util.Log.DEBUG; + public static final int INFO = android.util.Log.INFO; + public static final int WARN = android.util.Log.WARN; + public static final int ERROR = android.util.Log.ERROR; + public static final int ASSERT = android.util.Log.ASSERT; + + // Stores the beginning of the LogNode topology. + private static LogNode mLogNode; + + /** + * Returns the next LogNode in the linked list. + */ + public static LogNode getLogNode() { + return mLogNode; + } + + /** + * Sets the LogNode data will be sent to. + */ + public static void setLogNode(LogNode node) { + mLogNode = node; + } + + /** + * Instructs the LogNode to print the log data provided. Other LogNodes can + * be chained to the end of the LogNode as desired. + * + * @param priority Log level of the data being logged. Verbose, Error, etc. + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void println(int priority, String tag, String msg, Throwable tr) { + if (mLogNode != null) { + mLogNode.println(priority, tag, msg, tr); + } + } + + /** + * Instructs the LogNode to print the log data provided. Other LogNodes can + * be chained to the end of the LogNode as desired. + * + * @param priority Log level of the data being logged. Verbose, Error, etc. + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. The actual message to be logged. + */ + public static void println(int priority, String tag, String msg) { + println(priority, tag, msg, null); + } + + /** + * Prints a message at VERBOSE priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void v(String tag, String msg, Throwable tr) { + println(VERBOSE, tag, msg, tr); + } + + /** + * Prints a message at VERBOSE priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void v(String tag, String msg) { + v(tag, msg, null); + } + + + /** + * Prints a message at DEBUG priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void d(String tag, String msg, Throwable tr) { + println(DEBUG, tag, msg, tr); + } + + /** + * Prints a message at DEBUG priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void d(String tag, String msg) { + d(tag, msg, null); + } + + /** + * Prints a message at INFO priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void i(String tag, String msg, Throwable tr) { + println(INFO, tag, msg, tr); + } + + /** + * Prints a message at INFO priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void i(String tag, String msg) { + i(tag, msg, null); + } + + /** + * Prints a message at WARN priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void w(String tag, String msg, Throwable tr) { + println(WARN, tag, msg, tr); + } + + /** + * Prints a message at WARN priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void w(String tag, String msg) { + w(tag, msg, null); + } + + /** + * Prints a message at WARN priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void w(String tag, Throwable tr) { + w(tag, null, tr); + } + + /** + * Prints a message at ERROR priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void e(String tag, String msg, Throwable tr) { + println(ERROR, tag, msg, tr); + } + + /** + * Prints a message at ERROR priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void e(String tag, String msg) { + e(tag, msg, null); + } + + /** + * Prints a message at ASSERT priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void wtf(String tag, String msg, Throwable tr) { + println(ASSERT, tag, msg, tr); + } + + /** + * Prints a message at ASSERT priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. + */ + public static void wtf(String tag, String msg) { + wtf(tag, msg, null); + } + + /** + * Prints a message at ASSERT priority. + * + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public static void wtf(String tag, Throwable tr) { + wtf(tag, null, tr); + } +} diff --git a/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/LogFragment.java b/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/LogFragment.java new file mode 100644 index 00000000..b302acd4 --- /dev/null +++ b/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/LogFragment.java @@ -0,0 +1,109 @@ +/* +* 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 +* +* 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. +*/ +/* + * 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 + * + * 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. + */ + +package com.example.android.common.logger; + +import android.graphics.Typeface; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.text.Editable; +import android.text.TextWatcher; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ScrollView; + +/** + * Simple fraggment which contains a LogView and uses is to output log data it receives + * through the LogNode interface. + */ +public class LogFragment extends Fragment { + + private LogView mLogView; + private ScrollView mScrollView; + + public LogFragment() {} + + public View inflateViews() { + mScrollView = new ScrollView(getActivity()); + ViewGroup.LayoutParams scrollParams = new ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT); + mScrollView.setLayoutParams(scrollParams); + + mLogView = new LogView(getActivity()); + ViewGroup.LayoutParams logParams = new ViewGroup.LayoutParams(scrollParams); + logParams.height = ViewGroup.LayoutParams.WRAP_CONTENT; + mLogView.setLayoutParams(logParams); + mLogView.setClickable(true); + mLogView.setFocusable(true); + mLogView.setTypeface(Typeface.MONOSPACE); + + // Want to set padding as 16 dips, setPadding takes pixels. Hooray math! + int paddingDips = 16; + double scale = getResources().getDisplayMetrics().density; + int paddingPixels = (int) ((paddingDips * (scale)) + .5); + mLogView.setPadding(paddingPixels, paddingPixels, paddingPixels, paddingPixels); + mLogView.setCompoundDrawablePadding(paddingPixels); + + mLogView.setGravity(Gravity.BOTTOM); + mLogView.setTextAppearance(getActivity(), android.R.style.TextAppearance_Holo_Medium); + + mScrollView.addView(mLogView); + return mScrollView; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + + View result = inflateViews(); + + mLogView.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) {} + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) {} + + @Override + public void afterTextChanged(Editable s) { + mScrollView.fullScroll(ScrollView.FOCUS_DOWN); + } + }); + return result; + } + + public LogView getLogView() { + return mLogView; + } +}
\ No newline at end of file diff --git a/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/LogNode.java b/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/LogNode.java new file mode 100644 index 00000000..bc37cabc --- /dev/null +++ b/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/LogNode.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2012 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. + */ +package com.example.android.common.logger; + +/** + * Basic interface for a logging system that can output to one or more targets. + * Note that in addition to classes that will output these logs in some format, + * one can also implement this interface over a filter and insert that in the chain, + * such that no targets further down see certain data, or see manipulated forms of the data. + * You could, for instance, write a "ToHtmlLoggerNode" that just converted all the log data + * it received to HTML and sent it along to the next node in the chain, without printing it + * anywhere. + */ +public interface LogNode { + + /** + * Instructs first LogNode in the list to print the log data provided. + * @param priority Log level of the data being logged. Verbose, Error, etc. + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + public void println(int priority, String tag, String msg, Throwable tr); + +} diff --git a/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/LogView.java b/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/LogView.java new file mode 100644 index 00000000..c01542b9 --- /dev/null +++ b/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/LogView.java @@ -0,0 +1,145 @@ +/* + * 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. + */ +package com.example.android.common.logger; + +import android.app.Activity; +import android.content.Context; +import android.util.*; +import android.widget.TextView; + +/** Simple TextView which is used to output log data received through the LogNode interface. +*/ +public class LogView extends TextView implements LogNode { + + public LogView(Context context) { + super(context); + } + + public LogView(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public LogView(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + } + + /** + * Formats the log data and prints it out to the LogView. + * @param priority Log level of the data being logged. Verbose, Error, etc. + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + @Override + public void println(int priority, String tag, String msg, Throwable tr) { + + + String priorityStr = null; + + // For the purposes of this View, we want to print the priority as readable text. + switch(priority) { + case android.util.Log.VERBOSE: + priorityStr = "VERBOSE"; + break; + case android.util.Log.DEBUG: + priorityStr = "DEBUG"; + break; + case android.util.Log.INFO: + priorityStr = "INFO"; + break; + case android.util.Log.WARN: + priorityStr = "WARN"; + break; + case android.util.Log.ERROR: + priorityStr = "ERROR"; + break; + case android.util.Log.ASSERT: + priorityStr = "ASSERT"; + break; + default: + break; + } + + // Handily, the Log class has a facility for converting a stack trace into a usable string. + String exceptionStr = null; + if (tr != null) { + exceptionStr = android.util.Log.getStackTraceString(tr); + } + + // Take the priority, tag, message, and exception, and concatenate as necessary + // into one usable line of text. + final StringBuilder outputBuilder = new StringBuilder(); + + String delimiter = "\t"; + appendIfNotNull(outputBuilder, priorityStr, delimiter); + appendIfNotNull(outputBuilder, tag, delimiter); + appendIfNotNull(outputBuilder, msg, delimiter); + appendIfNotNull(outputBuilder, exceptionStr, delimiter); + + // In case this was originally called from an AsyncTask or some other off-UI thread, + // make sure the update occurs within the UI thread. + ((Activity) getContext()).runOnUiThread( (new Thread(new Runnable() { + @Override + public void run() { + // Display the text we just generated within the LogView. + appendToLog(outputBuilder.toString()); + } + }))); + + if (mNext != null) { + mNext.println(priority, tag, msg, tr); + } + } + + public LogNode getNext() { + return mNext; + } + + public void setNext(LogNode node) { + mNext = node; + } + + /** Takes a string and adds to it, with a separator, if the bit to be added isn't null. Since + * the logger takes so many arguments that might be null, this method helps cut out some of the + * agonizing tedium of writing the same 3 lines over and over. + * @param source StringBuilder containing the text to append to. + * @param addStr The String to append + * @param delimiter The String to separate the source and appended strings. A tab or comma, + * for instance. + * @return The fully concatenated String as a StringBuilder + */ + private StringBuilder appendIfNotNull(StringBuilder source, String addStr, String delimiter) { + if (addStr != null) { + if (addStr.length() == 0) { + delimiter = ""; + } + + return source.append(addStr).append(delimiter); + } + return source; + } + + // The next LogNode in the chain. + LogNode mNext; + + /** Outputs the string as a new line of log data in the LogView. */ + public void appendToLog(String s) { + append("\n" + s); + } + + +} diff --git a/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/LogWrapper.java b/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/LogWrapper.java new file mode 100644 index 00000000..16a9e7ba --- /dev/null +++ b/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/LogWrapper.java @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2012 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. + */ +package com.example.android.common.logger; + +import android.util.Log; + +/** + * Helper class which wraps Android's native Log utility in the Logger interface. This way + * normal DDMS output can be one of the many targets receiving and outputting logs simultaneously. + */ +public class LogWrapper implements LogNode { + + // For piping: The next node to receive Log data after this one has done its work. + private LogNode mNext; + + /** + * Returns the next LogNode in the linked list. + */ + public LogNode getNext() { + return mNext; + } + + /** + * Sets the LogNode data will be sent to.. + */ + public void setNext(LogNode node) { + mNext = node; + } + + /** + * Prints data out to the console using Android's native log mechanism. + * @param priority Log level of the data being logged. Verbose, Error, etc. + * @param tag Tag for for the log data. Can be used to organize log statements. + * @param msg The actual message to be logged. The actual message to be logged. + * @param tr If an exception was thrown, this can be sent along for the logging facilities + * to extract and print useful information. + */ + @Override + public void println(int priority, String tag, String msg, Throwable tr) { + // There actually are log methods that don't take a msg parameter. For now, + // if that's the case, just convert null to the empty string and move on. + String useMsg = msg; + if (useMsg == null) { + useMsg = ""; + } + + // If an exeption was provided, convert that exception to a usable string and attach + // it to the end of the msg method. + if (tr != null) { + msg += "\n" + Log.getStackTraceString(tr); + } + + // This is functionally identical to Log.x(tag, useMsg); + // For instance, if priority were Log.VERBOSE, this would be the same as Log.v(tag, useMsg) + Log.println(priority, tag, useMsg); + + // If this isn't the last node in the chain, move things along. + if (mNext != null) { + mNext.println(priority, tag, msg, tr); + } + } +} diff --git a/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/MessageOnlyLogFilter.java new file mode 100644 index 00000000..19967dcd --- /dev/null +++ b/wearable/wear/JumpingJack/Application/src/common/java/com/example/android/common/logger/MessageOnlyLogFilter.java @@ -0,0 +1,60 @@ +/* + * 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. + */ +package com.example.android.common.logger; + +/** + * Simple {@link LogNode} filter, removes everything except the message. + * Useful for situations like on-screen log output where you don't want a lot of metadata displayed, + * just easy-to-read message updates as they're happening. + */ +public class MessageOnlyLogFilter implements LogNode { + + LogNode mNext; + + /** + * Takes the "next" LogNode as a parameter, to simplify chaining. + * + * @param next The next LogNode in the pipeline. + */ + public MessageOnlyLogFilter(LogNode next) { + mNext = next; + } + + public MessageOnlyLogFilter() { + } + + @Override + public void println(int priority, String tag, String msg, Throwable tr) { + if (mNext != null) { + getNext().println(Log.NONE, null, msg, null); + } + } + + /** + * Returns the next LogNode in the chain. + */ + public LogNode getNext() { + return mNext; + } + + /** + * Sets the LogNode data will be sent to.. + */ + public void setNext(LogNode node) { + mNext = node; + } + +} diff --git a/wearable/wear/WearDrawers/Wearable/build.gradle b/wearable/wear/WearDrawers/Wearable/build.gradle index 7006427e..394ab5d8 100644 --- a/wearable/wear/WearDrawers/Wearable/build.gradle +++ b/wearable/wear/WearDrawers/Wearable/build.gradle @@ -15,13 +15,14 @@ apply plugin: 'com.android.application' dependencies { - compile 'com.google.android.support:wearable:2.0.0-alpha1' provided "com.google.android.wearable:wearable:1.0.0" compile 'com.google.android.gms:play-services-wearable:8.4.0' - compile 'com.android.support:support-v13:23.3.0' - compile 'com.google.android.support:wearable:1.4.0' + compile 'com.android.support:support-v13:24.1.1' + + compile 'com.google.android.support:wearable:2.0.0-alpha1' + } // The sample build uses multiple directories to @@ -33,20 +34,16 @@ List<String> dirs = [ 'template'] // boilerplate code that is generated by the sample template process android { - compileSdkVersion 23 + compileSdkVersion 24 - buildToolsVersion "23.0.2" + buildToolsVersion "24.0.1" defaultConfig { versionCode 1 versionName "1.0" - minSdkVersion 23 - - - targetSdkVersion 23 } |