summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add the abort API to ICallService implementations." into master-novaBen Gilad2014-03-061-1/+2
|\
| * Add the abort API to ICallService implementations.Ben Gilad2014-03-051-1/+2
| | | | | | | | Change-Id: Ie9b996b4d23184034811ef5667403ff4e47ae2d9
* | am b7d0cfa0: Merge "Add Path.isConvex, and force View outlines to be convex"Chris Craik2014-03-061-0/+1
|\ \ | | | | | | | | | | | | * commit 'b7d0cfa0d8d10ec613bcd6f5072729571d3a9588': Add Path.isConvex, and force View outlines to be convex
| * \ Merge "Add Path.isConvex, and force View outlines to be convex"Chris Craik2014-03-061-0/+1
| |\ \
| | * | Add Path.isConvex, and force View outlines to be convexChris Craik2014-03-031-0/+1
| | | | | | | | | | | | | | | | Change-Id: Idf3f1ee44240d77f7a7ddd0da898da8aa5d41864
* | | | am 5ab31155: am 6daf22ca: am 47826bfa: am c748341a: Merge "Add addExtras and ↵Griff Hazen2014-03-061-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | getExtras to Notification.Builder." into klp-modular-dev * commit '5ab311550f01412c12c1c68fe75ae929c9d1e9d8': Add addExtras and getExtras to Notification.Builder.
| * | | 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
* | | | | | Add optional data to incoming callsEvan Charlton2014-03-051-2/+3
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a CallService creates an incoming call, allow it to pass a Bundle of arbitrary data along with the intent. This data will be returned to the CallService via setIncomingCallId. This makes it easier for CallServices to match up incoming calls with their IDs. Change-Id: I52e7e1d0788ecd01aa427e76de7ccf4d9b75f1f0
* | | | | Fix the buildEvan Charlton2014-03-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CallState.ABORTED Change-Id: Id7139069f5e3346548785d351df2962457b15299
* | | | | am 4b131046: Revert "Revert "Fix the build.""Alan Viverette2014-03-041-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '4b131046aa5685112b8f198a989daef13279cadb': Revert "Revert "Fix the build.""
| * | | | Revert "Revert "Fix the build.""Alan Viverette2014-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WE MUST GO DEEPER This reverts commit 9e0c0a6e974c8f006596207cb5ec92c7bfe1fa44. Change-Id: Ia89f764648e15a60ce488d8a2b4bce97bdb37b20
* | | | | am 9e0c0a6e: Revert "Fix the build."Alan Viverette2014-03-041-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '9e0c0a6e974c8f006596207cb5ec92c7bfe1fa44': Revert "Fix the build."
| * | | | Revert "Fix the build."Alan Viverette2014-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 737629a346e953f5506672834e466acbb06caf39. Change-Id: If3775b57f343094d343991e964faa202748d0236
* | | | | am 737629a3: Fix the build.Alan Viverette2014-03-041-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '737629a346e953f5506672834e466acbb06caf39': Fix the build.
| * | | | Fix the build.Alan Viverette2014-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If6c301de541750ef76572879facc2c1f8f2c5855
* | | | | am 568628dc: Manually merge commit \'2faf28cf\' into masterWill Haldean Brown2014-03-041-0/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '568628dc2cb92b3ec3a87cae9de3203fbdc5968c': Add swipe-to-dismiss support to PhoneWindow.
| * | | | 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
* | | | | am add749f6: Camera2: make shading.mode key publicZhijun He2014-03-041-0/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'add749f664660ea2d5acdfae5d66c5dcf511a76e': Camera2: make shading.mode key public
| * | | | Camera2: make shading.mode key publicZhijun He2014-03-041-0/+5
| | | | | | | | | | | | | | | Change-Id: I94f506be19940b1881e65a8de9fe8198194932a3
* | | | | am 5e3e630d: Merge "Injected settings no longer include summaries"Tom O'Neill2014-03-031-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '5e3e630d337dfedaac43f85a42b580ee45749364': Injected settings no longer include summaries
| * | | | Injected settings no longer include summariesTom O'Neill2014-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Bug: 13279850 Change-Id: I0fd1e60b2a56c45776963c29bbae6f176fdf1bea
* | | | | am 77b987f1: Hold a wake lock while dispatching network activity events.Dianne Hackborn2014-02-281-0/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '77b987f1a1bb6028a871de01065b94c4cfff0b5c': Hold a wake lock while dispatching network activity events.
| * | | | 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
* | | | am ef238651: Merge "API changes for 64 bit platforms."Narayan Kamath2014-02-281-2/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ef23865154bf5e6c1768023dd69845353cf8c543': API changes for 64 bit platforms.
| * | | 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
* | | | | am 17c402d6: Merge "Add support for USB devices with multiple configurations ↵Mike Lockwood2014-02-271-0/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | and alternate interfaces" * commit '17c402d6940a0778f138d2b922f4c4c081f9d09d': Add support for USB devices with multiple configurations and alternate interfaces
| * | | | 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
* | | | | am 94b5ca81: Merge "Change Activity Scene Transitions to be more automatic ↵George Mount2014-02-271-15/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | redo." * commit '94b5ca811e5716bddb4a4d86df35c29bb9165e5f': Change Activity Scene Transitions to be more automatic redo.
| * | | | 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
* | | | | am 813d85b8: Fix progress bar tinting, add tint support to ShapeDrawableAlan Viverette2014-02-261-2/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '813d85b82cb7cbaa5dbe05496d1038caa17a1698': Fix progress bar tinting, add tint support to ShapeDrawable
| * | | | 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
* | | | am 9d1ae3b8: Merge "Added support for WiFi frequency on WifiInfo (getter, ↵Felipe Leme2014-02-261-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | settter, and frequency constant). Bug: 12767819" * commit '9d1ae3b87cdb77781f21e880c7bcb3ad32f7a906': Added support for WiFi frequency on WifiInfo (getter, settter, and frequency constant). Bug: 12767819
| * | | 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
* | | | | resolved conflicts for merge of 8fb4cf1e to master-novaRoboErik2014-02-261-44/+48
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I61a6fc192b0c2099af9bebdf8e9d8bbfaa4243a3
| * | | | 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
* | | | | | am 206e30cd: Revert "Change Activity Scene Transitions to be more automatic."George Mount2014-02-261-11/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '206e30cd93afe3eb72ec94178324417db5424ed2': Revert "Change Activity Scene Transitions to be more automatic."
| * | | | | Revert "Change Activity Scene Transitions to be more automatic."George Mount2014-02-261-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f10587faadb9080a7bf9991cbe04bac5525da482. Change-Id: I2785a3d2d6b667cad6d61dcbbc1c624161735fa4
* | | | | | am 8fcd3248: Regen current.txt to fix incorrect id for requiredForProfileAmith Yamasani2014-02-251-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '8fcd324894e22bb6606c9f229d40707f555cb312': Regen current.txt to fix incorrect id for requiredForProfile
| * | | | | Regen current.txt to fix incorrect id for requiredForProfileAmith Yamasani2014-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9b3cf326070bffd78e3e30519495b062c81b3d52
* | | | | | am 121e25dc: Merge "Change Activity Scene Transitions to be more automatic."George Mount2014-02-251-14/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '121e25dcf0d4da5c1c97fad2bd27dbd361db4153': Change Activity Scene Transitions to be more automatic.
| * | | | | 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
generated by cgit v1.1 at 2025-03-22 21:08:37 +0000