Diego Pontoriero
735c479664
am dede6854: Merge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC." into lmp-dev
...
* commit 'dede685497ef4be3c58cd1472f92540f27a2a14b':
Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC.
2014-08-21 00:02:03 +00:00
Amith Yamasani
b61504d544
am d5d82cf3: Merge "Add a hidden method to query profile owner name for a user" into lmp-dev
...
* commit 'd5d82cf3fe07254eb35aea05c06473f81ab0e316':
Add a hidden method to query profile owner name for a user
2014-08-20 23:52:25 +00:00
Jorim Jaggi
a226b53656
am 61dfef79: Merge "Accessibility actions for lock/phone/camera icon" into lmp-dev
...
* commit '61dfef79fc6e2a3d61314f378f38aef381cb1393':
Accessibility actions for lock/phone/camera icon
2014-08-20 23:52:21 +00:00
John Reck
a6074d245a
am 876f1a1a: Merge "Implement full View.buildLayer" into lmp-dev
...
* commit '876f1a1ad2216bceaf437a5737f804bd7e355372':
Implement full View.buildLayer
2014-08-20 23:52:17 +00:00
Alan Viverette
99d2f93025
am a4fb61a6: Merge "Forward additional drawable methods in AVD" into lmp-dev
...
* commit 'a4fb61a68eabd71bae9cbf58f0007704a1551aab':
Forward additional drawable methods in AVD
2014-08-20 23:52:13 +00:00
Jason Monk
f7d3e88e88
am a765518f: Merge "Lock task doesn\'t always end properly." into lmp-dev
...
* commit 'a765518fc82854224e156431c573bf8492545087':
Lock task doesn't always end properly.
2014-08-20 22:22:37 +00:00
Sailesh Nepal
86e88fd2a2
am 9c59bd75: Merge "Clean up and fix bugs in ConnectionService.createConnection" into lmp-dev
...
* commit '9c59bd75a24d1af3fa987c95950354ed1e6e7266':
Clean up and fix bugs in ConnectionService.createConnection
2014-08-20 22:22:32 +00:00
Tenghui Zhu
2629170590
am 36f1b53f: Merge "Revert "Revert "Update indeterminate linear progress bar""" into lmp-dev
...
* commit '36f1b53f43c63db4bac3b18dba7fc96d85a50055':
Revert "Revert "Update indeterminate linear progress bar""
2014-08-20 22:22:27 +00:00
Jeff Brown
cf481ea624
am ddc35381: Reset auto-brightness setting to default.
...
* commit 'ddc35381b014f7c65231036d9c8dd255680bca02':
Reset auto-brightness setting to default.
2014-08-20 22:22:23 +00:00
Jeff Brown
7beb1bc14e
am 2bc60f6e: Only select bluetooth route by default when A2DP is enabled.
...
* commit '2bc60f6e8c990549eb9173c88c0e1457ceb9acd7':
Only select bluetooth route by default when A2DP is enabled.
2014-08-20 22:22:18 +00:00
Michael Wright
782d4d1f66
am f2516f7c: Add cleanspec for inputflinger removal
...
* commit 'f2516f7cb96ac5fd3f0dcb3db41891f94b0841be':
Add cleanspec for inputflinger removal
2014-08-20 21:56:56 +00:00
Diego Pontoriero
3f38f72a1b
Merge "Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC." into lmp-dev
2014-08-20 21:47:20 +00:00
Alan Viverette
f4b4616ddb
Merge "Forward additional drawable methods in AVD" into lmp-dev
2014-08-20 21:47:20 +00:00
Tenghui Zhu
72a8e26257
Merge "Revert "Revert "Update indeterminate linear progress bar""" into lmp-dev
2014-08-20 21:47:20 +00:00
Jeff Brown
49cb613c99
Reset auto-brightness setting to default.
...
Reset the auto-brightness setting to default since the behavior
of the feature is now quite different and is being presented to
the user in a new way as "adaptive brightness".
Bug: 17114082
Change-Id: Ica63f4caaaf50ad95dc9df88bb376f79782976f7
2014-08-20 14:45:38 -07:00
Jeff Brown
f1b2335a36
Only select bluetooth route by default when A2DP is enabled.
...
Bug: 15756471
Change-Id: I822e51742e009b473000b8d67ec9c9a81c39b702
2014-08-20 14:45:38 -07:00
Sailesh Nepal
163a80538e
Merge "Clean up and fix bugs in ConnectionService.createConnection" into lmp-dev
2014-08-20 21:39:11 +00:00
Michael Wright
101717fc9d
Add cleanspec for inputflinger removal
...
Change-Id: I4fe5ca7f8024d3a8d68eea6070d8c508501da280
2014-08-20 21:09:41 +00:00
Tenghui Zhu
d750563a34
Revert "Revert "Update indeterminate linear progress bar""
...
This reverts commit f010cb690c49887ba8fc6f925c468b8fa865a4c1.
Change-Id: I9e36ddf046eb0ff07fc736da2498e1669c8821f1
2014-08-20 21:02:09 +00:00
Jeff Davidson
a10e152909
am fa141926: Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev
...
* commit 'fa141926ed0318690213dbd620052daf7873a497':
Improve documentation of ScanResult and WifiInfo.
2014-08-20 20:52:13 +00:00
Alan Viverette
06cd7dce24
Forward additional drawable methods in AVD
...
BUG: 17156349
Change-Id: I1d7b41fc8d0399b31db4cf21aa47180e96bfbcfe
2014-08-20 13:44:44 -07:00
Adrian Roos
cc18724a91
am 323d9567: Merge "Allow SystemUI to control Bluetooth for secondary users" into lmp-dev
...
* commit '323d9567c051fc17c70edb347d3245173603b33f':
Allow SystemUI to control Bluetooth for secondary users
2014-08-20 20:33:18 +00:00
Adam Powell
d7371b3a59
am 7ad2d5b4: Merge "Correctly populate title for ResolverActivity" into lmp-dev
...
* commit '7ad2d5b4eda851dc1d890b0e135a7a3c3bdb41b5':
Correctly populate title for ResolverActivity
2014-08-20 20:33:14 +00:00
Christopher Tate
bf0a405ca2
am 08191dff: Merge "Don\'t crash good-citizen restore session clients" into lmp-dev
...
* commit '08191dff4ce703498f66cd74b2d3377d98d55587':
Don't crash good-citizen restore session clients
2014-08-20 20:28:33 +00:00
Jeff Sharkey
e9280ee577
am 08db58c4: Merge "More progress towards split APKs in ASECs." into lmp-dev
...
* commit '08db58c444b0c92d7e3fd55753c1ac8bad33cfa4':
More progress towards split APKs in ASECs.
2014-08-20 20:28:28 +00:00
Michael Lentine
629161692e
am 97c4c03a: Merge "Reduce shutdown animation duration." into lmp-dev
...
* commit '97c4c03a1655f7b82d13ecb96a36cec6caee666e':
Reduce shutdown animation duration.
2014-08-20 20:28:24 +00:00
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
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
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
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