summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
* Extend DeviceAdminReceiver to receive provisioning complete broadcast.Jessica Hummel2014-03-061-0/+2
| | | | | | The managed profile provisioning app completes provisioning (creating the profile, installing the mdm on the secondary user, setting the mdm as the profile owner, removing unneeded apps from secondary user, removing mdm from the primary user). Then it sends a notification that the provisioning has completed across to the new profile. If the mdm, which is now installed on the profile wants to be notified that provisioning has completed it needs to implement this callback method. Change-Id: I75f2d6d19709fd39aa867f1254e0c37a0c936222
* am 6daf22ca: am 47826bfa: am c748341a: Merge "Add addExtras and getExtras to ↵Griff Hazen2014-03-061-0/+2
|\ | | | | | | | | | | | | Notification.Builder." into klp-modular-dev * commit '6daf22ca7680261e07dfd298a43d6e473e6c06f6': Add addExtras and getExtras to Notification.Builder.
| * am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." ↵Griff Hazen2014-03-061-0/+2
| |\ | | | | | | | | | | | | | | | | | | into klp-modular-dev * commit 'c748341af5616e183303dbe3267627a7f08aea37': Add addExtras and getExtras to Notification.Builder.
| | * Add addExtras and getExtras to Notification.Builder.Griff Hazen2014-03-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | addExtras allows merging with exiting set extras instead of replacing them. This matches the similar function putExtras in Intent. Both functions are useful for multi-stage notification building logic. Change-Id: Ice3e4a53ec05b7129ebdac14e2084163946273a4
* | | Revert "Revert "Fix the build.""Alan Viverette2014-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | WE MUST GO DEEPER This reverts commit 9e0c0a6e974c8f006596207cb5ec92c7bfe1fa44. Change-Id: Ia89f764648e15a60ce488d8a2b4bce97bdb37b20
* | | Revert "Fix the build."Alan Viverette2014-03-051-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 737629a346e953f5506672834e466acbb06caf39. Change-Id: If3775b57f343094d343991e964faa202748d0236
* | | Fix the build.Alan Viverette2014-03-041-1/+1
| | | | | | | | | | | | Change-Id: If6c301de541750ef76572879facc2c1f8f2c5855
* | | Manually merge commit '2faf28cf' into masterWill Haldean Brown2014-03-041-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original commit message: Add swipe-to-dismiss support to PhoneWindow. This adds a new window feature -- FEATURE_SWIPE_TO_DISMISS -- and a theme attribute to activate that feature. When the feature is activated, a SwipeDismissLayout is inflated as the DecorView layout. SwipeDismissLayout intercepts touch events and steals ones that are large swipes to the right if its children don't. PhoneWindow registers handlers that listen for these swipe events, translate the window when necessary, and finish the activity at the end of the gesture. Conflicts: core/java/android/view/Window.java core/res/res/values/attrs.xml Change-Id: I943290b436864ca4a1bd401b88d696e08c921cdd
| * | am bd79652a: Merge "Add swipe-to-dismiss support to PhoneWindow." into ↵Will Haldean Brown2014-03-041-0/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | klp-modular-dev * commit 'bd79652a9afeee1e81f0f51d11e5869091f58af9': Add swipe-to-dismiss support to PhoneWindow.
| | * Add swipe-to-dismiss support to PhoneWindow.Will Haldean Brown2014-03-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new window feature -- FEATURE_SWIPE_TO_DISMISS -- and a theme attribute to activate that feature. When the feature is activated, a SwipeDismissLayout is inflated as the DecorView layout. SwipeDismissLayout intercepts touch events and steals ones that are large swipes to the right if its children don't. PhoneWindow registers handlers that listen for these swipe events, translate the window when necessary, and finish the activity at the end of the gesture. Change-Id: I512e758f3c3ffd3b353dba3b911c0e80a88d6f5f
* | | Camera2: make shading.mode key publicZhijun He2014-03-041-0/+5
| | | | | | | | | Change-Id: I94f506be19940b1881e65a8de9fe8198194932a3
* | | Injected settings no longer include summariesTom O'Neill2014-03-031-1/+1
| | | | | | | | | | | | | | | | | | - Bug: 13279850 Change-Id: I0fd1e60b2a56c45776963c29bbae6f176fdf1bea
* | | Hold a wake lock while dispatching network activity events.Dianne Hackborn2014-02-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add new API for determining whether the current data network is active, and thus better scheduling network operations. This API is designed to not be tied to a mobile network -- regardless of the network, apps can use it to determine whether they should initiate activity or wait. On non-mobile networks, it simply always reports as the network being active. This changed involved reworking how the idle timers are done so that we only register an idle timer with the current default network. This way, we can know whether we currently expect to get callbacks about the network being active, or should just always report that it is active. (Ultimately we need to be getting this radio active data from the radio itself.) Change-Id: Iaf6cc91a960d7542a70b72f87a7db26d12c4ea8e
* | | Merge "API changes for 64 bit platforms."Narayan Kamath2014-02-281-2/+4
|\ \ \
| * | | API changes for 64 bit platforms.Narayan Kamath2014-02-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EGLObjectHandle.<init>(int) and int EGLObjectHandle.getHandle() have now been deprecated and replaced with variants that take and return java longs. bug: 13181704 Change-Id: I67bef5fbf064e85205b8a85e00f91f4ffcf60d19
* | | | Add support for USB devices with multiple configurations and alternate ↵Mike Lockwood2014-02-271-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interfaces Added UsbConfiguration class, as well as accessors to UsbDevice to get configuration list Added methods to UsbDeviceConnection to select configurations and alternate interfaces. Also added accessors for USB descriptor name strings and fixed some memory leaks in the JNI code. Bug: 12425052 Change-Id: Idb990f4d5c054a8cb997eb3f440f6da9f83bce05
* | | | Merge "Change Activity Scene Transitions to be more automatic redo."George Mount2014-02-271-15/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Change Activity Scene Transitions to be more automatic redo.George Mount2014-02-261-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 206e30cd93afe3eb72ec94178324417db5424ed2 along with removing the additional startActivity* methods and replaces them with ActivityOptions makeSceneTransitionAnimation methods. Change-Id: I52bec31ae3c4cea6d549810ae5a7acd8aea176d8
* | | | Fix progress bar tinting, add tint support to ShapeDrawableAlan Viverette2014-02-261-2/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | Cleans up APIs a little, since I think we may want to add tinting modes beyond what Porter-Duff can provide. Plus we don't actually support some of the Porter-Duff modes in hardware. Change-Id: I2cea1b737cc93607a24842c54eb9f0d8346b29d4
* | | Merge "Added support for WiFi frequency on WifiInfo (getter, settter, and ↵Felipe Leme2014-02-261-0/+2
|\ \ \ | | | | | | | | | | | | frequency constant). Bug: 12767819"
| * | | Added support for WiFi frequency on WifiInfo (getter, settter, and frequency ↵Felipe Leme2014-02-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constant). Bug: 12767819 Change-Id: Ib4a03919d9100861e993c733b7e478dc93dffaae
* | | | Merge "Move Session apis to android.media.session"RoboErik2014-02-261-44/+48
|\ \ \ \
| * | | | Move Session apis to android.media.sessionRoboErik2014-02-251-44/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to make it easier to distinguish the new apis from the old ones. Change-Id: Ic5eaf65e8bd054a844f87b9118c4bb18f30ac8a7
* | | | | Revert "Change Activity Scene Transitions to be more automatic."George Mount2014-02-261-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f10587faadb9080a7bf9991cbe04bac5525da482. Change-Id: I2785a3d2d6b667cad6d61dcbbc1c624161735fa4
* | | | | Regen current.txt to fix incorrect id for requiredForProfileAmith Yamasani2014-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9b3cf326070bffd78e3e30519495b062c81b3d52
* | | | | Merge "Change Activity Scene Transitions to be more automatic."George Mount2014-02-251-14/+10
|\ \ \ \ \
| * | | | | Change Activity Scene Transitions to be more automatic.George Mount2014-02-251-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shared element transitions are enabled by default when the Window has a TransitionManager. Shared element location and size are captured and transferred to the target Activity. ActionBar is treated as a shared element. Change-Id: I0f22ea4e5cbe80254e848444e3f235cb742684f4
* | | | | | am 97686e00: am 91df7766: am 42ec5035: Modify API to hide ActivityView.Craig Mautner2014-02-251-11/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '97686e00233f6475bd4a5a48bc718fcf88bbf688': Modify API to hide ActivityView.
| * | | | | am 42ec5035: Modify API to hide ActivityView.Craig Mautner2014-02-251-18/+7
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit '42ec5035672fbfe701ddbf90dcc4390dab9188af': Modify API to hide ActivityView.
| | * | | | Modify API to hide ActivityView.Craig Mautner2014-02-251-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes build too. Change-Id: Ibd571cf36c89691a37c45db59c31237fee17adac
* | | | | | Merge "Add an API to manually invoke Android Beam."Martijn Coenen2014-02-251-0/+2
|\ \ \ \ \ \
| * | | | | | Add an API to manually invoke Android Beam.Martijn Coenen2014-02-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Activities can call NfcAdapter.invokeBeam() to manually invoke the Beam animation. Any NFC tap is then enough to complete the transaction. Also, added NdefRecord convenience method for creating Text records. Bug: 5134061 Change-Id: Ia9df360d1d7e8451157c85a6d12f2a4eec924960
* | | | | | | Adding the requiredForProfile flag.Nicolas Prevot2014-02-241-0/+1
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling to use requiredForProfile in application manifests It determines which applications will be installed for managed profiles and for restricted profiles Change-Id: I14b4de2c9f41c2bbf5cd9fd0ca6caf5ce2d04131
* | | | | | Merge "Enables a profile owner or device owner to set and clear default ↵Sander Alewijnse2014-02-241-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | intent handler activities."
| * | | | | | Enables a profile owner or device owner to set and clear default intent ↵Sander Alewijnse2014-02-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handler activities. Those intent handlers are persistent preferences. They will remain the default intent handler even if the set of potential event handlers for the intent filter changes and if the intent preferences are reset. Change-Id: Id0cfae46f93c10d89e441f272096a205ec518dd0
* | | | | | | Change colorFilterColor to tint, allow use of ColorStateListAlan Viverette2014-02-231-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 13149901 Change-Id: I6487bec372cb74db53d7bbdfa35de071764763b0
* | | | | | | Merge "add new accessibility action for EditText to set text content"Guang Zhu2014-02-211-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | add new accessibility action for EditText to set text contentGuang Zhu2014-02-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12872344 Change-Id: I85a3805ab0c34b96a7d4228f2382c8ff664e36e8
* | | | | | | camera3: Fix raw/DNG tag visibilility.Ruben Brunk2014-02-211-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie3beed773b27bf56689a750e695ac7cb82580639
* | | | | | | Merge "camera3: Add green split property."Ruben Brunk2014-02-211-0/+1
|\ \ \ \ \ \ \
| * | | | | | | camera3: Add green split property.Ruben Brunk2014-02-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d3fa48a0cd6e3a08bed5eb529e7c35676c25607
* | | | | | | | Merge "Make LruCache.resize(int) public"Narayan Kamath2014-02-211-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Make LruCache.resize(int) publicNarayan Kamath2014-02-201-0/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: https://code.google.com/p/android/issues/detail?id=65062 bug: https://code.google.com/p/android/issues/detail?id=35349 Change-Id: Ia271bc45ba2b4c0f81b61b6147be5530ee2dfd67
* | | | | | | | Merge "Add more MediaStore constants for playback intents"Matt Casey2014-02-211-0/+9
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add more MediaStore constants for playback intentsMatt Casey2014-02-201-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constants are derived from this doc: https://docs.google.com/a/google.com/document/d/1lmlFcTeefLDRp_bpMrXk3yK9nKxoTVfpcShanpLxiMg/edit#heading=h.b16863tyyjzv That doc contains the full explanation of these changes. I'm making this change on behalf of {elmas,pengr} who don't have android source access but designed this in collaboration with rharagutchi on the play music team. I'll probably have to route any significant questions through them. Bug: 12874557 Change-Id: I85a4bee57a2bde519da0dc6de2cad9d036da225c
* | | | | | | | am 7206ac56: am a79ac472: am 744d3473: Merge "Add hardware feature ↵Justin Koh2014-02-201-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | describing a watch." into klp-modular-dev * commit '7206ac561291298f08809614be95963966a72ca8': Add hardware feature describing a watch.
| * | | | | | am 744d3473: Merge "Add hardware feature describing a watch." into ↵Justin Koh2014-02-201-0/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '744d3473f8a0f9f95e3fdf83670faf6d1551839e': Add hardware feature describing a watch.
| | * | | | | Add hardware feature describing a watch.Justin Koh2014-02-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hardware feature describing a watch so that hardware can specify that it is a device that is worn on the body (perhaps the wrist). Change-Id: I9d4cb7e86067f6ad41b39bcc545222b3b0fbf890
* | | | | | | Merge "Initial round of MediaSession APIs"RoboErik2014-02-201-0/+45
|\ \ \ \ \ \ \
| * | | | | | | Initial round of MediaSession APIsRoboErik2014-02-191-0/+45
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is far from complete but puts the basic components in place for an app to interact with media sessions. Change-Id: Icfe313f90ad76ae56badbe42b0e43fc5f68db36f