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
Svetoslav
fed7173306
Using default system icon for print spooler
...
bug:16568027
Change-Id: I87c7e7d60864b6d28899210bb400e56e21bf43f8
2014-08-20 20:28:22 +00:00
Svet Ganov
6bd702538d
Notify app widget hosts when cross-profile providers change.
...
1. Notify the hosts in the group if a package gets white-listed or
un-white-listed for providing widgets across profiles.
2. Notify hosts in the group for provider changes when a profile
is deleted.
bug:17126070
Change-Id: Ic719c1c68e45842d50decc95603f1d61583b8f02
2014-08-20 20:25:10 +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
Robert Greenwalt
1bbcaa0fc4
Merge "Fix listening NetworkRequests to listen for all networks." into lmp-dev
2014-08-20 20:15:45 +00:00
Robert Greenwalt
c671c8ded6
Merge "Add missing break statements to avoid unnecessary network validation." into lmp-dev
2014-08-20 20:15:45 +00:00
Robert Greenwalt
0d39e6722b
Merge "Fix CS/NetworkMonitor race." into lmp-dev
2014-08-20 20:15:45 +00:00
Jason Monk
e1bf163c1e
Merge "Fix SOCKS proxies from being dropped from PAC" into lmp-dev
2014-08-20 20:15:45 +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
Behdad Esfahbod
bf8d5620f7
Throw exception on nonexistent font
...
In K, this used to throw RuntimeException. Before this patch, NULL
was returned and no exceptions thrown. With this patch,
FileNotFoundException is thrown. This might be considered API
change and be undesirable as callers need to either catch it or
declare it to be thrown.
Bug: 16180181
Change-Id: If83d76857f640c6293a3d5d08fb89ceddbaf41bc
2014-08-20 16:11:59 -04:00
Paul Lawrence
878ba0a266
Save PatternVisible setting to crypto header
...
Bug: 17059314
Change-Id: Ic64c64567f70ea11030cabfd33b57f77fb23dac7
2014-08-20 13:08:01 -07: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
Svetoslav
3c238245eb
Update the "More options" button in printing.
...
The "More options" button needed changes to match the
new UX spec. Also fixed some identation issues as well
as a missing marging in the erorr UI.
bug:16301066
Change-Id: I29f0d41915d1816d754f2c6288a7387aafeba2c2
2014-08-20 19:57:16 +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
e5656c75fe
Update VPN Icon to key.
...
Bug: 16153201
Change-Id: I7d1dd3ca85a6f9325a6443da0e0bcb2ae8c51ab3
2014-08-20 15:54:00 -04: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
RoboErik
d2b8c947dd
Api updates to MediaSession components
...
-renames get/setBufferPosition to get/setBufferedPosition
-renames getLaunchActivity to getSessionActivity
-adds doc link to setVolumeTo flags param
-renames setLaunchActivity to setSessionActivity
-hides setMediaRouter
-moves PLAYBACK_TYPE_ constants to MediaController.AudioInfo
-adds addOnActiveSessionsChangedListener version with a handler parameter
-renames AudioInfo to PlaybackInfo
bug:17114404
Change-Id: I0fbfe4eb979cb2af98e3f13095c654bb131f7ae5
2014-08-20 10:05:06 -07: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