Aravind Akella
ceaea58e3f
am b1762eb6: Merge "Step Counter documentation fix." into lmp-dev
...
* commit 'b1762eb6c0e9f59ef69d425ff531d7eedb282968':
Step Counter documentation fix.
2014-08-20 20:18:25 +00:00
Julia Reynolds
2f4466b158
am a6e05830: Merge "Prevent profile owners from setting certain user restrictions." into lmp-dev
...
* commit 'a6e0583072f23da08f900c81bc44fcbb2ee11271':
Prevent profile owners from setting certain user restrictions.
2014-08-20 20:18:21 +00:00
Jason Monk
abc2358778
Merge "Lock task doesn't always end properly." into lmp-dev
2014-08-20 20:15:45 +00:00
Jeff Davidson
833dcd4bea
Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev
2014-08-20 20:15:45 +00:00
Jorim Jaggi
1cf18c8716
am 4ff1c9a2: Merge "Don\'t close panel when in QS and all notifications go away" into lmp-dev
...
* commit '4ff1c9a2ce88b5aa28e7056b64f988c69448a85d':
Don't close panel when in QS and all notifications go away
2014-08-20 20:07:42 +00:00
Alan Viverette
034b0e0214
am 0f9a48b6: Merge "Use correct single-letter date format in SimpleMonthView" into lmp-dev
...
* commit '0f9a48b60226c538c1cf7128abcf59302f69f46b':
Use correct single-letter date format in SimpleMonthView
2014-08-20 20:07:36 +00:00
John Spurlock
65c71f9561
am 62c52c37: Merge "Volume: Shave 12dp off of the volume dialog." into lmp-dev
...
* commit '62c52c375115ce8fbef1ce28b2dc82ba403d11be':
Volume: Shave 12dp off of the volume dialog.
2014-08-20 20:07:32 +00:00
Adrian Roos
ad2cff7463
am e0f85cb7: Only show face unlock indication if it applies
...
* commit 'e0f85cb7ab0431f627f5c14f7b85db38903a44ae':
Only show face unlock indication if it applies
2014-08-20 20:07:27 +00:00
Christian Robertson
bc31136802
am 8f1b2a4a: Merge "Updated set of geometric navigation bar icon assets" into lmp-dev
...
* commit '8f1b2a4adacbd8abea097bd1797d9d7ec1bb6bed':
Updated set of geometric navigation bar icon assets
2014-08-20 19:57:13 +00:00
RoboErik
76764eeb4e
am 7a754ab3: Merge "Api updates to MediaSession components" into lmp-dev
...
* commit '7a754ab331d6832034b5188584c51139f44bf629':
Api updates to MediaSession components
2014-08-20 19:57:08 +00:00
Adrian Roos
4a4101714d
Only show face unlock indication if it applies
...
When trust is not managed or the indication is set for
a different than the current user, don't show it on the
lock screen.
Bug: 17034124
Change-Id: Ia470520d6bd05db8417b3b0bb1f55894f791554e
2014-08-20 19:54:21 +00:00
Jason Monk
835495c117
Lock task doesn't always end properly.
...
This can result in the keyguard not being re-enabled, the status
bar being in a bad state, and various other weirdness. When a task
is going away, it needs to send the standard lock task ending
messages so that exiting the state can be handled properly.
Bug: 16010327
Change-Id: Id7ee632f4765af0af209b70fb69dd75f2e541820
2014-08-20 15:29:06 -04:00
vandwalle
ccb019d04e
am 3a7bbbff: am 14aa17a2: Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev
...
* commit '3a7bbbff1e526dce660fc1d08113167134402b75':
remove passpoint, except ANQP - DO NOT MERGE
2014-08-20 19:26:13 +00:00
Adrian Roos
623caf5d3c
am cb640c62: am 68d3e6c7: Merge "Implement trust managed visuals" into lmp-dev
...
* commit 'cb640c625d063a757b5deb9b15a971745aacb8d6':
Implement trust managed visuals
2014-08-20 19:26:08 +00:00
Adam Lesinski
82340c87ea
am 7224e1b2: am 7d98d0a0: Merge "Fix crash when launching Activities in \'android\' package" into lmp-dev
...
* commit '7224e1b20c3f0be88ea8fc2daa9144cf68f091d9':
Fix crash when launching Activities in 'android' package
2014-08-20 19:26:03 +00:00
Jorim Jaggi
f3d483a607
am c3dbfd16: am f28c44b9: Merge "Remove battery color when in power save" into lmp-dev
...
* commit 'c3dbfd1673ef88bf43c7fd23d421ca6155c30217':
Remove battery color when in power save
2014-08-20 19:25:58 +00:00
Selim Cinek
e6a803365a
am d59026ba: am ffb5acc3: Merge "Announcing quick settings changes now via talkback" into lmp-dev
...
* commit 'd59026baf0b1aa94f02e6f38672bce653b994a4f':
Announcing quick settings changes now via talkback
2014-08-20 19:25:53 +00:00
vandwalle
ee6ae28760
am 14aa17a2: Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev
...
* commit '14aa17a230d141c9a1f4478f4fc85d5263080c47':
remove passpoint, except ANQP - DO NOT MERGE
2014-08-20 19:13:26 +00:00
Adrian Roos
0a1b75f7a0
am 68d3e6c7: Merge "Implement trust managed visuals" into lmp-dev
...
* commit '68d3e6c797efa43fa0852ae7583c554463938059':
Implement trust managed visuals
2014-08-20 19:13:21 +00:00
Adam Lesinski
6ceec090cd
am 7d98d0a0: Merge "Fix crash when launching Activities in \'android\' package" into lmp-dev
...
* commit '7d98d0a0c57232d5c00b823cf8ff4fa6ff643e06':
Fix crash when launching Activities in 'android' package
2014-08-20 19:13:17 +00:00
Jorim Jaggi
66a3993e02
am f28c44b9: Merge "Remove battery color when in power save" into lmp-dev
...
* commit 'f28c44b963d09d0f3f8a7515644e48144b214ac2':
Remove battery color when in power save
2014-08-20 19:13:12 +00:00
Selim Cinek
3531b09a9b
am ffb5acc3: Merge "Announcing quick settings changes now via talkback" into lmp-dev
...
* commit 'ffb5acc3d82c67fa8ced8a7d2b699620241ec6d2':
Announcing quick settings changes now via talkback
2014-08-20 19:13:07 +00:00
Christopher Tate
4746bc78ec
Merge "Don't crash good-citizen restore session clients" into lmp-dev
2014-08-20 18:43:12 +00:00
Christian Robertson
46a8f45253
Merge "Updated set of geometric navigation bar icon assets" into lmp-dev
2014-08-20 18:43:12 +00:00
Chris Craik
b9627eee5c
am c8028af9: am 1ada8566: Merge "Add outlineProvider attribute" into lmp-dev
...
* commit 'c8028af9f90268db55547b56fd0dc242bb7d9053':
Add outlineProvider attribute
2014-08-20 17:59:56 +00:00
Chris Craik
ad0a3c920a
am 5edc6c50: am 4fe137c7: Merge "Make getOutline account for gravity BitmapDrawable" into lmp-dev
...
* commit '5edc6c500490bbb9d36b6122106ccb291e1cfe78':
Make getOutline account for gravity BitmapDrawable
2014-08-20 17:59:52 +00:00
Mathieu Chartier
9a88f10b89
Remove unnecessary explicit GC in ZygoteInit.
...
Removes > 1s of GC time and hundreds of GC during device boot.
Zygote size before: 8388608
Zygote size after: 8388608
No increase in zygote space size due to zygote compaction.
Bug: 16398684
Change-Id: I3c6f5a0b26a207ab39bb0a952400d7488e42f00c
2014-08-20 10:57:45 -07:00
Chris Craik
07811d31c2
am 1ada8566: Merge "Add outlineProvider attribute" into lmp-dev
...
* commit '1ada856628fb56518b438a45d0b66693d7eef185':
Add outlineProvider attribute
2014-08-20 17:47:00 +00:00
Chris Craik
72acaa3b50
am 4fe137c7: Merge "Make getOutline account for gravity BitmapDrawable" into lmp-dev
...
* commit '4fe137c71378711bf1cb09286341f90c2a5d59e2':
Make getOutline account for gravity BitmapDrawable
2014-08-20 17:46:55 +00:00
Sailesh Nepal
cf7020b7e8
Clean up and fix bugs in ConnectionService.createConnection
...
This CL fixes serveral issues with the createConnection code:
- it uses failureCode/failureMessage which were never set.
Renamed to disconnectCode and disconnectMessage and set
those fields in Connection.setDisconnected
- Connection.CANCELED_CONNECTION was static and it caused
lots of log spew which was confusing. Changed to create
a new connection every time, same as failure
- moved sNullConnection from Connection to ConnectionService
- made FailureSignalingConnection private and removed type
checks for it. Using disconnect code is better, this is
already what ConnectionServiceWrapper does
Note, the current code still expects connections to be cancelled
or failed in synchronously. This bug is being tracked separately.
Bug: 17156304
Change-Id: I0b13a78b738c4bf37a69de9fd5dcd17be0c45c14
2014-08-20 10:45:08 -07:00
Jorim Jaggi
2281e12d34
am 87aa9654: am b055471f: Merge "Make alarm invisible when going to detail in QS" into lmp-dev
...
* commit '87aa965447505c2981871871e89110d4398e2460':
Make alarm invisible when going to detail in QS
2014-08-20 17:12:31 +00:00
Nicolas Prevot
f3a2fc889b
am 7270d1f3: am 5d6c6120: Merge "Allow the system in other users to call startActivityAsCaller." into lmp-dev
...
* commit '7270d1f33272398613e8dffcd780ccab450f5133':
Allow the system in other users to call startActivityAsCaller.
2014-08-20 17:12:26 +00:00
John Spurlock
42b958170b
am c58697ad: am b79e1367: Merge "Copy framework internal resources for indeterminate anim." into lmp-dev
...
* commit 'c58697ad299e106fa7de0b597f77416205ed1610':
Copy framework internal resources for indeterminate anim.
2014-08-20 17:03:07 +00:00
Jorim Jaggi
ce1d5279c2
am b055471f: Merge "Make alarm invisible when going to detail in QS" into lmp-dev
...
* commit 'b055471f10a7c705328ad8a5f6e5e82e3da90ffb':
Make alarm invisible when going to detail in QS
2014-08-20 17:02:42 +00:00
Nicolas Prevot
f753f35c26
am 5d6c6120: Merge "Allow the system in other users to call startActivityAsCaller." into lmp-dev
...
* commit '5d6c612084f2c2dc002b61c8fbf7c23ff9a2ce1c':
Allow the system in other users to call startActivityAsCaller.
2014-08-20 17:02:39 +00:00
John Spurlock
ee07749285
am b79e1367: Merge "Copy framework internal resources for indeterminate anim." into lmp-dev
...
* commit 'b79e13674193193bbf82a02759c3a9636b385c1d':
Copy framework internal resources for indeterminate anim.
2014-08-20 16:54:45 +00:00
Santos Cordon
9fee66a59d
am 13de398d: am 3715de8f: Merge "Made all classes required for an InCallService @SystemApi" into lmp-dev
...
* commit '13de398dc86d8b52a1f56a95601ee073cd564039':
Made all classes required for an InCallService @SystemApi
2014-08-20 16:24:37 +00:00
Justin Koh
3cdf006ce6
am c88da6d5: am e6a59a4c: Merge "Add check to allow notification listener packages to post >50 notifications" into lmp-dev
...
* commit 'c88da6d5c5cbf0ef68cb932d8cb877ae6b0b53af':
Add check to allow notification listener packages to post >50 notifications
2014-08-20 16:24:33 +00:00
Santos Cordon
5bbe9e4166
am 3715de8f: Merge "Made all classes required for an InCallService @SystemApi" into lmp-dev
...
* commit '3715de8f0e969c892f8a153627110f092e5527fb':
Made all classes required for an InCallService @SystemApi
2014-08-20 16:14:19 +00:00
Justin Koh
721edc540d
am e6a59a4c: Merge "Add check to allow notification listener packages to post >50 notifications" into lmp-dev
...
* commit 'e6a59a4c42c4c9e60a69abef966202024640f867':
Add check to allow notification listener packages to post >50 notifications
2014-08-20 16:14:14 +00:00
Jason Monk
9dee734351
am 202b67f0: am abd834f3: Merge "Add hotspot tile to defaults" into lmp-dev
...
* commit '202b67f0326fe022fed56b92c9b2675c4ea50bbd':
Add hotspot tile to defaults
2014-08-20 16:06:28 +00:00
Michael Lentine
b9d1efec83
Merge "Reduce shutdown animation duration." into lmp-dev
2014-08-20 16:06:26 +00:00
Michael Lentine
0c9a62dc8d
Reduce shutdown animation duration.
...
Change-Id: Idb58e8ff9a7e05c6f3d6964970b32a6aa69615c1
2014-08-20 13:19:14 -07:00
Aravind Akella
be2ecae5fe
Merge "Step Counter documentation fix." into lmp-dev
2014-08-20 16:06:26 +00:00
vandwalle
da3475dba7
Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev
2014-08-20 16:06:26 +00:00
John Reck
8b19f914a0
am 7d6636fa: am 0d0dbcb0: Merge "Don\'t use Animator:reverse()" into lmp-dev
...
* commit '7d6636fa60f5b63c983c80cf19d3bd1ff6245b28':
Don't use Animator:reverse()
2014-08-20 16:06:23 +00:00
Jason Monk
74d340cc33
am abd834f3: Merge "Add hotspot tile to defaults" into lmp-dev
...
* commit 'abd834f3d31c2b222decbf484818be1bef9cc4ef':
Add hotspot tile to defaults
2014-08-20 15:59:01 +00:00
John Reck
ce1846a7e6
am 0d0dbcb0: Merge "Don\'t use Animator:reverse()" into lmp-dev
...
* commit '0d0dbcb012596d063d52749298e84bd50c591b7b':
Don't use Animator:reverse()
2014-08-20 15:58:56 +00:00
Jorim Jaggi
8faf5f56aa
am 8cf86b66: am 7fda5cd7: Merge "Fix crash when reset() gets called during an animation" into lmp-dev
...
* commit '8cf86b663a385215eaeaf1f0d152e777c85926ea':
Fix crash when reset() gets called during an animation
2014-08-20 15:46:24 +00:00
Jorim Jaggi
a4493cb76d
am 7fda5cd7: Merge "Fix crash when reset() gets called during an animation" into lmp-dev
...
* commit '7fda5cd78b340b4edf6072a9c749c3cff64e89f6':
Fix crash when reset() gets called during an animation
2014-08-20 15:38:17 +00:00