OSDN Git Service
Deepanshu Gupta [Sat, 21 Jun 2014 23:33:11 +0000 (23:33 +0000)]
Merge "LayoutLib: Better support for compact/elegant fonts." into lmp-preview-dev
Deepanshu Gupta [Sat, 21 Jun 2014 23:32:59 +0000 (23:32 +0000)]
Merge "Material navigation bar for layoutlib." into lmp-preview-dev
Ji-Hwan Lee [Fri, 20 Jun 2014 20:54:38 +0000 (05:54 +0900)]
DO NOT MERGE: Use main looper for PackageMonitor
This is to work-around the issue that TvInputManagerService does not
receive package change callbacks from PackageMonitor.
In ATV emulator build, the background thread is blocked at
android_location_GpsLocationProvider_init(), and PackageMonitor that uses
background thread fails to handle broadcast intent.
Bug:
15767453
Change-Id: Ieef00cedf1357d57e4217ec202d50655ba3aa35a
Ji-Hwan Lee [Fri, 20 Jun 2014 19:42:05 +0000 (04:42 +0900)]
Register PackageMonitor when system services are ready
Bug:
15767453
Change-Id: I191b20dfa31eee0e37ba7df67cbf906ccbfc0f4e
Deepanshu Gupta [Wed, 18 Jun 2014 22:27:02 +0000 (15:27 -0700)]
Material navigation bar for layoutlib.
Change-Id: Id65600e5f4ffb3cd0f90c3c710f88d9b668f754f
Baligh Uddin [Thu, 19 Jun 2014 18:51:10 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
Baligh Uddin [Thu, 19 Jun 2014 18:51:04 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
Baligh Uddin [Wed, 18 Jun 2014 17:23:21 +0000 (10:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id0dea37ff97571e1bd293705c9b63fd839ed1c70
Auto-generated-cl: translation import
Baligh Uddin [Wed, 18 Jun 2014 16:46:21 +0000 (09:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: If9bee5ebdc80d406105b43be2c90de77cd4dab76
Auto-generated-cl: translation import
Baligh Uddin [Wed, 18 Jun 2014 16:39:46 +0000 (09:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id7dc159049bac4f968f722d3f029616c80f4552e
Auto-generated-cl: translation import
Christoph Studer [Tue, 17 Jun 2014 01:44:51 +0000 (18:44 -0700)]
SysUI: Hide grouped notifications
Drop grouped notification received from NoMan.
Bug:
15188947
Change-Id: I8bdb99abd216d771d435d18b2018c843e7750d18
Griff Hazen [Tue, 17 Jun 2014 07:38:38 +0000 (00:38 -0700)]
[Doc fix] Document best practices for display intent activities.
Bug:
15412926
Change-Id: I1c3082dfde85cd03ffc97be6383a0608f925edcf
(cherry picked from commit
831ca9d3bc73e37f555f6c07babde270f83044fe)
Baligh Uddin [Tue, 17 Jun 2014 14:18:49 +0000 (14:18 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
Baligh Uddin [Tue, 17 Jun 2014 14:18:45 +0000 (14:18 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
RoboErik [Mon, 16 Jun 2014 23:53:04 +0000 (16:53 -0700)]
b/
15676582 Fix ordering of sessions returned by MediaSessionManager
This was causing the wrong rcc to be shown. Simple fix
just fixes the ordering so it's not reversed.
Change-Id: I56f2d9d6895d6ba3b0eca8f77a3b0b63e0193ad1
Selim Cinek [Mon, 16 Jun 2014 23:36:51 +0000 (16:36 -0700)]
Fixed a bug where the device could not be unlocked.
When the Notifications could be scrolled, the shade could not
be closed.
Bug:
15643474
Change-Id: I59b9f55c0290da7683ce7fd40effc4b5413e4267
Chris Craik [Mon, 16 Jun 2014 21:13:01 +0000 (21:13 +0000)]
Merge "Adjust tessellation abort depth DO NOT MERGE" into lmp-preview-dev
Chris Craik [Mon, 16 Jun 2014 20:58:48 +0000 (13:58 -0700)]
Adjust tessellation abort depth DO NOT MERGE
bug:
15615144
Change-Id: Iee91f241067de9d088220c34c19db52a37ac258d
Elliott Hughes [Mon, 16 Jun 2014 20:53:31 +0000 (20:53 +0000)]
Merge "@hide." into lmp-preview-dev
Elliott Hughes [Mon, 16 Jun 2014 18:14:24 +0000 (11:14 -0700)]
@hide.
Change-Id: Ieacf34a7b850910e70ae54f738608509e2c39e2e
Baligh Uddin [Mon, 16 Jun 2014 17:10:26 +0000 (10:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic6b3eb6f14875072b5fbce1db22aacbf3027044e
Auto-generated-cl: translation import
Baligh Uddin [Mon, 16 Jun 2014 16:36:54 +0000 (09:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib6cf3952a1b349f06e1be32c5ab9524de0836b83
Auto-generated-cl: translation import
Deepanshu Gupta [Wed, 11 Jun 2014 22:40:47 +0000 (15:40 -0700)]
LayoutLib: Better support for compact/elegant fonts.
Change-Id: I67439924bc6323490ea0c7d7864985b400906f8c
Chris Wren [Thu, 12 Jun 2014 19:49:59 +0000 (19:49 +0000)]
Merge "Fix notification update path for structural updates." into lmp-preview-dev
Chris Wren [Thu, 12 Jun 2014 17:50:54 +0000 (13:50 -0400)]
Fix notification update path for structural updates.
Similar logic is required for the replacement case, as is already in place
for the update case, although the actions are different.
Bug:
15588056
Change-Id: I9ad115237c589716772e569fa1979a206b77097b
Ihab Awad [Thu, 12 Jun 2014 17:30:38 +0000 (17:30 +0000)]
Merge "DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (1/4)" into lmp-preview-dev
Selim Gurun [Fri, 13 Jun 2014 18:54:57 +0000 (18:54 +0000)]
Merge "Address the API review" into lmp-preview-dev
Selim Gurun [Fri, 13 Jun 2014 17:53:55 +0000 (10:53 -0700)]
Address the API review
Bug:
15432556
The api council asks to change the interface to an abstract class
and clarify the clearClientCertPreferences api. This change addresses
these.
Change-Id: I7979788c7c041bacbfef5ea4d94309f91279ef22
Winson Chung [Fri, 13 Jun 2014 15:55:33 +0000 (08:55 -0700)]
Fixing issue where we do not get the task rects, and therefore have no transitions. (Bug
15610655)
Change-Id: Ie25f0037a4f8bf8c3069d50e3a0ad670125be9a1
Baligh Uddin [Fri, 13 Jun 2014 14:24:58 +0000 (14:24 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
Baligh Uddin [Fri, 13 Jun 2014 14:23:57 +0000 (07:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic15fd186de8247f8a5cad5cce87218ebec6cd81e
Auto-generated-cl: translation import
Baligh Uddin [Fri, 13 Jun 2014 14:20:46 +0000 (07:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibdd11bf4b5a0ebb0394400688dd0e38a70660a62
Auto-generated-cl: translation import
Sol Boucher [Wed, 11 Jun 2014 23:35:57 +0000 (16:35 -0700)]
camera2: Remove stray </p> in CameraDevice#createCaptureSession
This was causing strange indentation.
The change also clarifies how to get the supported output sizes in the
ImageReader flow: Although the doc (correctly) instructed the developer to use
StreamConfigurationMap#getOutputSizes(int) with an ImageReader, this instruction
appeared after the bulleted list of output types. Since all other items in that
list specify that getOutputSizes(Class<?>) should be used, the reader shouldn't
be expected to read beyond the list only in this specific case.
Bug:
15574400
Change-Id: Id952b46ae52322d75abbcaffea678d5ba50b22a5
Eino-Ville Talvala [Fri, 13 Jun 2014 00:26:29 +0000 (00:26 +0000)]
Merge "camera2 docs: Fix instructions for using SurfaceView." into lmp-preview-dev
Eino-Ville Talvala [Thu, 12 Jun 2014 23:46:58 +0000 (16:46 -0700)]
camera2 docs: Fix instructions for using SurfaceView.
Bug:
15597178
Change-Id: I802369e61725451ddd8df855c384608c80e12693
Baligh Uddin [Sun, 15 Jun 2014 12:57:43 +0000 (12:57 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
Baligh Uddin [Fri, 13 Jun 2014 18:22:10 +0000 (11:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia6b6c5883d9ea2b9ce986bfa868d68bae034d36a
Auto-generated-cl: translation import
Robert Greenwalt [Thu, 12 Jun 2014 19:11:27 +0000 (19:11 +0000)]
Merge "Apply API Council comments to ConnectivityManager" into lmp-preview-dev
Robert Greenwalt [Wed, 11 Jun 2014 23:05:07 +0000 (16:05 -0700)]
Apply API Council comments to ConnectivityManager
rename isNetworkActive -> isDefaultNetworkActive
rename registerNetworkActiveListener -> registerDefaultNetworkActiveListener
make listenForNetwork/requestNetwork take a NetworkRequest
rename NetworkCallbackListener -> NetworkCallback
rename listenForNetwork -> registerNetworkCallback
rename releaseNetworkRequest -> unregisterNetworkCallback
remove NetworkRequest param from NetworkCallback functions
rename onNetworkCapabilitiesChagned to onCapabilitiesChanged
remove onReleased
change time units in onLosing from Sec -> ms
bug:
15142362
Change-Id: Ibc96e3f461706efe1eafa0d85605249cfd6e9fdd
Baligh Uddin [Sun, 15 Jun 2014 12:57:37 +0000 (12:57 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
Baligh Uddin [Fri, 13 Jun 2014 19:01:20 +0000 (12:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic5be9149b760c096c0c850e8a9a0f60bd62d819c
Auto-generated-cl: translation import
Jorim Jaggi [Sat, 14 Jun 2014 20:54:32 +0000 (20:54 +0000)]
Merge "Bigger clock." into lmp-preview-dev
Christoph Studer [Thu, 12 Jun 2014 18:22:31 +0000 (20:22 +0200)]
Prevent duplicate notifications
Don't trust mNotificationData being sorted consistently
at all times...which it actually should. But apparently isn't.
Instead of using binary search to find the previous instance of
the notification when it's updated, use a simple linear scan.
Bug:
15589158
Change-Id: I7a09d0c64e35bd1930b8992d19da1393f4e4bb4e
Jorim Jaggi [Sat, 14 Jun 2014 20:43:12 +0000 (22:43 +0200)]
Bigger clock.
Also fixes a bug where notifications would be wrongly padded
on Keyguard after rotating the screen.
Bug:
15244051
Change-Id: I2418692c3d2ffdd5fe642361f2924629bf9a75eb
Jorim Jaggi [Sat, 14 Jun 2014 04:16:24 +0000 (06:16 +0200)]
Change style of clock in status bar.
Bug:
15570452
Change-Id: I39ec2e2a18d382f378d5cccd94a6a8630b55a240
Jorim Jaggi [Sat, 14 Jun 2014 04:11:44 +0000 (04:11 +0000)]
Merge "Revert "Improve unlock motion."" into lmp-preview-dev
Jorim Jaggi [Sat, 14 Jun 2014 03:04:35 +0000 (03:04 +0000)]
Revert "Improve unlock motion."
This reverts commit
03599a4c8fcc539948174136878f5e0ceec1eeda.
Change-Id: Iacd5f7ecd755ee2c8efdf1e37060a21702bcf08a
Alan Viverette [Fri, 13 Jun 2014 22:58:25 +0000 (15:58 -0700)]
DO NOT MERGE Fix bright foreground & hint colors
BUG:
15616463
Change-Id: I747a3fd30e701bd2ee40df5faf2688cd5af4ee14
(cherry picked from commit
cf8b6f0610868a59fd8777d8aa3c865facc73e5b)
Jorim Jaggi [Thu, 12 Jun 2014 02:27:38 +0000 (04:27 +0200)]
Improve unlock motion.
Bug:
15244051
Change-Id: Ib33a7a8e27a2dc191c6e18ffe1cd2725dfa3bb37
Jorim Jaggi [Sat, 14 Jun 2014 19:40:37 +0000 (19:40 +0000)]
Merge "Revert "Introduced fading views for the camera interaction on the lockscreen."" into lmp-preview-dev
Jorim Jaggi [Sat, 14 Jun 2014 03:58:56 +0000 (03:58 +0000)]
Revert "Introduced fading views for the camera interaction on the lockscreen."
This reverts commit
4f963c1b557010bf453af500b00f36b68988f8e2.
Change-Id: I8c7df9d115be1b89b57fb9c9bb2a12b4c1d45520
Nick Kralevich [Sat, 14 Jun 2014 14:37:12 +0000 (14:37 +0000)]
Merge "update mLastSlash for gdbserver" into lmp-preview-dev
Nick Kralevich [Fri, 13 Jun 2014 23:24:58 +0000 (16:24 -0700)]
update mLastSlash for gdbserver
the gdbserver special case wasn't updating mLastSlash. Fix it.
(cherry picked from commit
195b23ef712c51dc8d2f3a1f1943a27054dc4e74)
Change-Id: I52c6bbeb5483f8f6e20dd17de29ab703a6c8ebef
Selim Cinek [Wed, 11 Jun 2014 20:48:05 +0000 (22:48 +0200)]
Introduced fading views for the camera interaction on the lockscreen.
Bug:
15126905
Change-Id: I82b0050a4216873d9cd191b32d1e5bf6871acbd6
Christian Robertson [Fri, 13 Jun 2014 20:46:00 +0000 (20:46 +0000)]
Merge "New geometric system bar icons" into lmp-preview-dev
Christian Robertson [Fri, 13 Jun 2014 05:01:26 +0000 (22:01 -0700)]
New geometric system bar icons
Bug:
15599260
Change-Id: I37688f368ce22f1dc30119fe174ce701c7c147cc
Christian Robertson [Fri, 13 Jun 2014 20:45:36 +0000 (20:45 +0000)]
Merge "Tunings for touch ripple animations" into lmp-preview-dev
Christian Robertson [Thu, 12 Jun 2014 20:44:53 +0000 (13:44 -0700)]
Tunings for touch ripple animations
Added a log based interpolator (it's faster in the beginning and smoother
at the finish than the decelerate interpolator)
Scaled the timing and opacity of the falloff ripple based on the size
of the outer bounding radius. Backing circles aren't as apparent for
Smaller touch targets.
BUG:
15591274
Jorim Jaggi [Wed, 11 Jun 2014 01:22:39 +0000 (03:22 +0200)]
Fix blank lockscreen.
Bug:
15281241
Change-Id: If315891274a97fa5cc579554b83b85cf3c87f0fb
Daniel Sandler [Thu, 5 Jun 2014 06:54:26 +0000 (02:54 -0400)]
Clean up progress bars for media & other notifications.
Bug:
15147533
Change-Id: Ib4905203c004232bd7d78fe9fa316aa5688eaaa2
Jessica Hummel [Wed, 21 May 2014 11:32:57 +0000 (12:32 +0100)]
Update documentation so it meets api requirements
Change-Id: Ice52dc3d5ecca77f81d3df1b43179c94aece6fef
bug:
15023443
Conflicts:
api/current.txt
core/java/android/app/admin/DeviceAdminReceiver.java
Ihab Awad [Tue, 10 Jun 2014 20:29:47 +0000 (13:29 -0700)]
DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (1/4)
Bug:
15275904
Bug:
15196474
Change-Id: If9aeae519047b221aa2c178d8d2903c4e2054a6d
Jean Chalard [Thu, 12 Jun 2014 03:13:02 +0000 (03:13 +0000)]
Merge "Fix a CTS test" into lmp-preview-dev
Jean Chalard [Wed, 11 Jun 2014 09:03:05 +0000 (18:03 +0900)]
Fix a CTS test
SpannableStringBuilder should throw an exception when the
parameters to #insert and related methods are in the wrong
order.
We'll have to reopen b/
9570771 and deal with it separately.
Bug:
14965397
Change-Id: I01847e0010d23f98ad3def8ba030d36570528900
Yohei Yukawa [Thu, 12 Jun 2014 03:11:30 +0000 (03:11 +0000)]
Merge "Rename CursorAnchorInfoBuilder with Builder" into lmp-preview-dev
Robert Greenwalt [Thu, 12 Jun 2014 01:43:25 +0000 (01:43 +0000)]
Merge "Fix Build" into lmp-preview-dev
Robert Greenwalt [Thu, 12 Jun 2014 01:36:36 +0000 (18:36 -0700)]
Fix Build
Change-Id: Iebbce8eaf21b3d2ba01ec720812d38018b13529e
Robert Greenwalt [Thu, 12 Jun 2014 01:06:55 +0000 (18:06 -0700)]
Fix build breakage.
Change-Id: Ideb32704ce5dc37ef36b05609f88da2aa55b3a00
Robert Greenwalt [Thu, 12 Jun 2014 00:00:16 +0000 (00:00 +0000)]
Merge "Missed an api update." into lmp-preview-dev
Robert Greenwalt [Wed, 11 Jun 2014 23:57:03 +0000 (16:57 -0700)]
Missed an api update.
Fix build.
Change-Id: I2563ec3c26e1c8dbb9abea9f87537a87ce5fda41
Robert Greenwalt [Wed, 11 Jun 2014 23:48:25 +0000 (23:48 +0000)]
Merge "Fix wifi connectivity issues." into lmp-preview-dev
Sreeram Ramachandran [Wed, 11 Jun 2014 22:56:51 +0000 (15:56 -0700)]
Fix wifi connectivity issues.
http://ag/480881 changed RouteInfo.getDestination() to return an IpPrefix
instead of a LinkAddress. This makes the equals() comparison always fail.
So, when ConnectivityService.updateRoutes() is given identical routes, instead
of realizing that there's no diff, it would consider them different, and thus
add and remove the same route. The add would fail, since the route already
existed in netd, but the remove would succeed, leaving the system with no routes
and thus no connectivity.
Bug:
15564210
Change-Id: I2003b0fcb809cc20837dc489c58af37891ca4556
Adam Powell [Wed, 11 Jun 2014 22:54:16 +0000 (22:54 +0000)]
Merge "Explicitly track consumed state for WindowInsets" into lmp-preview-dev
Adam Powell [Wed, 11 Jun 2014 22:33:08 +0000 (15:33 -0700)]
Explicitly track consumed state for WindowInsets
Treating 0-insets as fully consumed is incorrect since it means that
you can't dispatch empty insets down the view hierarchy - traversal
terminates immediately. Track consumed state independent of actual
values. Replacing a given set of insets with all zeroes will mark it
consumed.
Bug
15341653
Change-Id: I55b33b7dfbf4cae1e906a82140537156cffdbf47
Winson Chung [Wed, 11 Jun 2014 21:34:03 +0000 (21:34 +0000)]
Merge "Stop sending broadcasts to RecentsActivity before boot has completed. (Bug
15109101)" into lmp-preview-dev
Winson Chung [Wed, 11 Jun 2014 21:19:53 +0000 (14:19 -0700)]
Stop sending broadcasts to RecentsActivity before boot has completed. (Bug
15109101)
Change-Id: Ic04dc2ef73c75d63e107e7b50842dd618d3a173a
Christopher Tate [Wed, 11 Jun 2014 22:44:31 +0000 (22:44 +0000)]
Merge "Relax duplicate-permission-definition constraints slightly" into lmp-preview-dev
Alan Viverette [Thu, 12 Jun 2014 01:39:52 +0000 (01:39 +0000)]
Merge "Add Settings theme, fix DialogWhenLarge theme" into lmp-preview-dev
Alan Viverette [Thu, 12 Jun 2014 01:33:33 +0000 (18:33 -0700)]
Add Settings theme, fix DialogWhenLarge theme
Adds dialog background with baked-in shadow. Temporary until we get
window shadow management sorted out.
Change-Id: I2bafed620ac00f8a4e4a17cf19255aaba41858b2
Robert Greenwalt [Wed, 11 Jun 2014 23:42:21 +0000 (23:42 +0000)]
Merge "Minor changes to the LinkAddress API docs." into lmp-preview-dev
Robert Greenwalt [Wed, 11 Jun 2014 23:42:05 +0000 (23:42 +0000)]
Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev
Sreeram Ramachandran [Wed, 4 Jun 2014 01:41:43 +0000 (18:41 -0700)]
Add a new IpPrefix class and use it in RouteInfo.
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.
Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.
Bug:
15142362
Bug:
13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
(cherry picked from commit
7d3b4b9a3d4de9673119632da0ebd583e50126f7)
Robert Greenwalt [Wed, 11 Jun 2014 23:39:56 +0000 (23:39 +0000)]
Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev
Robert Greenwalt [Sun, 8 Jun 2014 23:42:59 +0000 (16:42 -0700)]
Make NetworkCapabilities publicly immutable.
Applying API council comments.
bug:
15142362
(cherry picked from commit Ie0bde68b72656a676d90c0343b9756fe9268d8d6)
Change-Id: Ie0bde68b72656a676d90c0343b9756fe9268d8d6
RoboErik [Wed, 11 Jun 2014 23:38:54 +0000 (23:38 +0000)]
Merge "b/
15330955 Make RemoteController use the new session APIs" into lmp-preview-dev
Lorenzo Colitti [Mon, 9 Jun 2014 13:58:46 +0000 (22:58 +0900)]
Minor changes to the LinkAddress API docs.
1. Rename getNetworkPrefixLength to getPrefixLength. Update all
callers in frameworks/base and add a shim method and a TODO
for the rest.
2. @hide isSameAddressAs. It doesn't add much, and it's just
one-liner that callers can implement if they want.
3. Fix the alignment of the initial paragraph (<ul> should have
been </ul>).
4. Remove the documentation that talks about creating
LinkAddresses, since there's no public API for creating them.
With these changes I think LinkAddress is fine as a public API.
Bug:
15142362
Change-Id: Iaf3b1db577745bb68a9e1dd7f96d666dd3f3ec7c
(cherry picked from commit
9ab53650cfcd91a2a151b44b3fd1381841f76269)
RoboErik [Wed, 11 Jun 2014 00:10:41 +0000 (17:10 -0700)]
b/
15330955 Make RemoteController use the new session APIs
This moves RemoteController over to using Sessions instead of
the RCC/RCD framework. This also adds several hidden APIs to
help with translating between the two apis.
Change-Id: I0f50313db2b6190b16fa86ce670ac9250654ca05
Ruben Brunk [Wed, 11 Jun 2014 00:09:36 +0000 (00:09 +0000)]
Merge "DO NOT MERGE: camera2: Disallow shim usage for preview." into lmp-preview-dev
Eino-Ville Talvala [Wed, 11 Jun 2014 00:04:08 +0000 (00:04 +0000)]
Merge "Camera2: Many docs updates" into lmp-preview-dev
Robert Greenwalt [Tue, 10 Jun 2014 23:30:34 +0000 (23:30 +0000)]
Merge "Apply API review to android.net.Network:" into lmp-preview-dev
Paul Jensen [Thu, 29 May 2014 14:12:39 +0000 (10:12 -0400)]
Apply API review to android.net.Network:
- socketFactory() renamed to getSocketFactory()
- Make sure bindProcess() documentation points developers to getSocketFactory() as the preferred approach
- Move bindProcess() and unbindProcess() to ConnectivityManager.setProcessBoundNetwork() -- passing null clears it.
- Move getProcessBoundNetwork() to ConnectivityManager.getProcessBoundNetwork().
Bug:
15142362
Bug:
13885501
Change-Id: Ia55c59d52e1ec8bf10dd0d9d037bd04c0998bc71
(cherry picked from commit
5ca1e6675bf4182b6e9ca76a7696bf2e38e96c4f)
Dianne Hackborn [Wed, 11 Jun 2014 17:42:35 +0000 (17:42 +0000)]
Merge "Implement control of auto power save mode." into lmp-preview-dev
Dianne Hackborn [Wed, 11 Jun 2014 06:13:02 +0000 (23:13 -0700)]
Implement control of auto power save mode.
Follow the setting for auto power save mode in both
battery service and battery UI. Default level is 15 when
setting is not set; otherwise it is whatever the setting
gives, with 0 meaning auto battery save is off.
Change how we define the "turn off warn" level to be
an adjustment from the warn level, so we can have a good
value for whatever auto setting is set.
Fix power manager to never go in to power save mode when
plugged in, even if the user has manually turned it on.
Add new delete option to settings command, because I needed
it for testing.
Change-Id: I512b691df84399d50b8e751fd50732c6093ebe85
Matthew Williams [Tue, 10 Jun 2014 23:22:47 +0000 (23:22 +0000)]
Merge "Fix battery controller non-fire bug" into lmp-preview-dev
Matthew Williams [Tue, 10 Jun 2014 19:59:29 +0000 (12:59 -0700)]
Fix battery controller non-fire bug
Receiver wasn't registered to listen for the action coming
back from the Alarm Manager.
Also, if a task starts being tracked by the battery controller
and the device is on power, the batt. controller will notify
the scheduler as such.
Added dumpsys for battery controller to help debugging.
Change-Id: I7ce305b816aea69e8d05a3daf23124c163546788
Matthew Williams [Tue, 10 Jun 2014 23:06:13 +0000 (16:06 -0700)]
Fix build.
Two tests were breaking the build.
Change-Id: If424a552d3fedb912fa94870b88c60dc3750b69a
Dianne Hackborn [Wed, 11 Jun 2014 17:20:58 +0000 (17:20 +0000)]
Merge "Some tweaks to improve document task creation." into lmp-preview-dev
Dianne Hackborn [Wed, 11 Jun 2014 04:36:35 +0000 (21:36 -0700)]
Some tweaks to improve document task creation.
- Mark the chooser activity as never launching in to a new
task, even if the caller asks for it. These are dialogs
so don't make sense as stand-alone tasks. (Maybe later
the policy should be to not launch into a new task in any
case that the activity is a dialog or even transparent at all.)
- Keep track in the task record of whether any activities in
it have been shown to the user, and use this to automatically
remove the task when all activities finish. This leans up
cases where apps are launching stub activities that get turned
in to tasks but are never seen by the user because they
immediately launch another activity in another task and
then finish.
Change-Id: I00b641c80aa96bd5071479f36ee2e4d8e3a81aeb
Winson Chung [Tue, 10 Jun 2014 22:00:10 +0000 (22:00 +0000)]
Merge "Updating Recents to make the cards slightly more visible." into lmp-preview-dev
John Spurlock [Thu, 12 Jun 2014 03:06:04 +0000 (03:06 +0000)]
Merge "Heads-up notifications for low battery warnings." into lmp-preview-dev