git.osdn.net Git - android-x86/frameworks-base.git/log

Tenghui Zhu [Thu, 21 Aug 2014 04:08:09 +0000 (04:08 +0000)]

am 66c24c53: am 4f39448e: am 36f1b53f: Merge "Revert "Revert "Update indeterminate linear progress bar""" into lmp-dev

* commit '66c24c53bad66b885e6d823a5bcf58dcd24f09d8':
Revert "Revert "Update indeterminate linear progress bar""

commit | commitdiff | tree

Jeff Brown [Thu, 21 Aug 2014 04:07:53 +0000 (04:07 +0000)]

am 88506671: am f6d0c657: am ddc35381: Reset auto-brightness setting to default.

* commit '88506671fff4b7ed7da9e634888c7fad659784c3':
Reset auto-brightness setting to default.

commit | commitdiff | tree

Jeff Brown [Thu, 21 Aug 2014 04:07:49 +0000 (04:07 +0000)]

am 94b31e2e: am 6562f2ce: am 2bc60f6e: Only select bluetooth route by default when A2DP is enabled.

* commit '94b31e2e2d887e42bd6db904bd68c87017788d44':
Only select bluetooth route by default when A2DP is enabled.

commit | commitdiff | tree

Michael Wright [Thu, 21 Aug 2014 04:07:45 +0000 (04:07 +0000)]

am bce0c696: am 56ba049e: am f2516f7c: Add cleanspec for inputflinger removal

* commit 'bce0c6969a4a25fcd881a369a656b38f8298d2d0':
Add cleanspec for inputflinger removal

commit | commitdiff | tree

Jeff Davidson [Thu, 21 Aug 2014 04:07:39 +0000 (04:07 +0000)]

am 00fde029: am 5e3130d6: am fa141926: Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev

* commit '00fde029a5d9ec74dd5e47e29f53c5885779e4ac':
Improve documentation of ScanResult and WifiInfo.

commit | commitdiff | tree

Robert Greenwalt [Thu, 21 Aug 2014 03:34:36 +0000 (03:34 +0000)]

am 6f020e24: Merge "resolved conflicts for merge of 4b48ce8f to lmp-dev-plus-aosp" into lmp-dev-plus-aosp

* commit '6f020e24ff8263295f79b232899870db443da3c1':
Mark configuration strings as non-translatable.

commit | commitdiff | tree

Adrian Roos [Thu, 21 Aug 2014 03:33:36 +0000 (03:33 +0000)]

am 3fb9ce8a: am 28ee5f81: am 323d9567: Merge "Allow SystemUI to control Bluetooth for secondary users" into lmp-dev

* commit '3fb9ce8ad6276fc49f0dba2060b92d24e2eb269e':
Allow SystemUI to control Bluetooth for secondary users

commit | commitdiff | tree

Adam Powell [Thu, 21 Aug 2014 03:33:31 +0000 (03:33 +0000)]

am 788735b9: am cc448e10: am 7ad2d5b4: Merge "Correctly populate title for ResolverActivity" into lmp-dev

* commit '788735b9a19b1fb3a790be8277baf029c0c7c9ec':
Correctly populate title for ResolverActivity

commit | commitdiff | tree

Christopher Tate [Thu, 21 Aug 2014 03:33:26 +0000 (03:33 +0000)]

am 82c550da: am 9ca86a61: am 08191dff: Merge "Don\'t crash good-citizen restore session clients" into lmp-dev

* commit '82c550dab16748cd2f20646aace3afbe18842b2d':
Don't crash good-citizen restore session clients

commit | commitdiff | tree

Jeff Sharkey [Thu, 21 Aug 2014 03:33:20 +0000 (03:33 +0000)]

am 44884372: am 54a521e9: am 08db58c4: Merge "More progress towards split APKs in ASECs." into lmp-dev

* commit '448843725d388c409a0ac20602fbc5611e7b2134':
More progress towards split APKs in ASECs.

commit | commitdiff | tree

Michael Lentine [Thu, 21 Aug 2014 03:33:15 +0000 (03:33 +0000)]

am f9fdf7b8: am b3b29eda: am 97c4c03a: Merge "Reduce shutdown animation duration." into lmp-dev

* commit 'f9fdf7b82a6cf4a56183245d550625f3323c27fb':
Reduce shutdown animation duration.

commit | commitdiff | tree

Aravind Akella [Thu, 21 Aug 2014 03:33:10 +0000 (03:33 +0000)]

am 43e0c717: am da35d356: am b1762eb6: Merge "Step Counter documentation fix." into lmp-dev

* commit '43e0c7170454f1206b487071351ed676a926b3cd':
Step Counter documentation fix.

commit | commitdiff | tree

Tenghui Zhu [Thu, 21 Aug 2014 02:57:30 +0000 (02:57 +0000)]

am 4f39448e: am 36f1b53f: Merge "Revert "Revert "Update indeterminate linear progress bar""" into lmp-dev

* commit '4f39448eb5fa1c62d1c7ce71f3205dcce73bb694':
Revert "Revert "Update indeterminate linear progress bar""

commit | commitdiff | tree

Jeff Brown [Thu, 21 Aug 2014 02:57:25 +0000 (02:57 +0000)]

am f6d0c657: am ddc35381: Reset auto-brightness setting to default.

* commit 'f6d0c6570076fd63d4b6d9ba61d2cea86f38d93e':
Reset auto-brightness setting to default.

commit | commitdiff | tree

Jeff Brown [Thu, 21 Aug 2014 02:57:21 +0000 (02:57 +0000)]

am 6562f2ce: am 2bc60f6e: Only select bluetooth route by default when A2DP is enabled.

* commit '6562f2ce10715a18112be6158e8fa76b82b70b87':
Only select bluetooth route by default when A2DP is enabled.

commit | commitdiff | tree

Michael Wright [Thu, 21 Aug 2014 02:54:20 +0000 (02:54 +0000)]

am 56ba049e: am f2516f7c: Add cleanspec for inputflinger removal

* commit '56ba049ed08e4ad7632e10df2b0d5415b00295a0':
Add cleanspec for inputflinger removal

commit | commitdiff | tree

Jeff Davidson [Thu, 21 Aug 2014 02:47:05 +0000 (02:47 +0000)]

am 5e3130d6: am fa141926: Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev

* commit '5e3130d63a745ad6cd3ccf535845128ae744d092':
Improve documentation of ScanResult and WifiInfo.

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Aug 2014 02:42:08 +0000 (22:42 -0400)]

resolved conflicts for merge of b259603d to master

Change-Id: Ia74bb64ce5946a86ecf05b8c4e258dd2ac68ba04

commit | commitdiff | tree

Jorim Jaggi [Thu, 21 Aug 2014 00:57:34 +0000 (00:57 +0000)]

am dae3e104: am 1654a6c7: am 4ff1c9a2: Merge "Don\'t close panel when in QS and all notifications go away" into lmp-dev

* commit 'dae3e104d6ea2bc7e18ddb7d55b3483c61d0954a':
Don't close panel when in QS and all notifications go away

commit | commitdiff | tree

Alan Viverette [Thu, 21 Aug 2014 00:57:29 +0000 (00:57 +0000)]

am c29680bf: am 28646cf6: am 0f9a48b6: Merge "Use correct single-letter date format in SimpleMonthView" into lmp-dev

* commit 'c29680bf487a1a1460aca922555ecf76e6918193':
Use correct single-letter date format in SimpleMonthView

commit | commitdiff | tree

John Spurlock [Thu, 21 Aug 2014 00:57:22 +0000 (00:57 +0000)]

am 1c171c47: am 1c2f0be2: am 62c52c37: Merge "Volume: Shave 12dp off of the volume dialog." into lmp-dev

* commit '1c171c4759960968af4e272874b023944d2aaa41':
Volume: Shave 12dp off of the volume dialog.

commit | commitdiff | tree

Adrian Roos [Thu, 21 Aug 2014 00:57:17 +0000 (00:57 +0000)]

am 6e0891fd: am 4e399ae7: am e0f85cb7: Only show face unlock indication if it applies

* commit '6e0891fd0d335e2f2feb376ce6fb5e93d5bf7608':
Only show face unlock indication if it applies

commit | commitdiff | tree

Christian Robertson [Thu, 21 Aug 2014 00:57:12 +0000 (00:57 +0000)]

am f6134a72: am e3f4e333: am 8f1b2a4a: Merge "Updated set of geometric navigation bar icon assets" into lmp-dev

* commit 'f6134a72113066c35bfc42b476bfea7710f54bc1':
Updated set of geometric navigation bar icon assets

commit | commitdiff | tree

RoboErik [Thu, 21 Aug 2014 00:57:08 +0000 (00:57 +0000)]

am 666360cb: am 8961b5d5: am 7a754ab3: Merge "Api updates to MediaSession components" into lmp-dev

* commit '666360cbe70a3c482b16a0fd438a3f10d0fcf643':
Api updates to MediaSession components

commit | commitdiff | tree

Mathieu Chartier [Thu, 21 Aug 2014 00:51:09 +0000 (00:51 +0000)]

am bc3bd0a4: am be39e991: am 977c4a5b: Merge "Clean up ExceptionOccurred."

* commit 'bc3bd0a4e67a00bcde97f297e6d8743bcac7f2df':
Clean up ExceptionOccurred.

commit | commitdiff | tree

Mathieu Chartier [Thu, 21 Aug 2014 00:51:05 +0000 (00:51 +0000)]

am a13e69f1: am 554bd893: am 8f9ebc8a: Merge "Remove unnecessary explicit GC in ZygoteInit."

* commit 'a13e69f1ab0f03bb9afbe0578d1599d25d04aaf2':
Remove unnecessary explicit GC in ZygoteInit.

commit | commitdiff | tree

Adrian Roos [Thu, 21 Aug 2014 00:45:14 +0000 (00:45 +0000)]

am 28ee5f81: am 323d9567: Merge "Allow SystemUI to control Bluetooth for secondary users" into lmp-dev

* commit '28ee5f81038ef47bc6855e77bd5a9dadd296f45a':
Allow SystemUI to control Bluetooth for secondary users

commit | commitdiff | tree

Adam Powell [Thu, 21 Aug 2014 00:45:09 +0000 (00:45 +0000)]

am cc448e10: am 7ad2d5b4: Merge "Correctly populate title for ResolverActivity" into lmp-dev

* commit 'cc448e102bae06bcd2f9d1d1e59013f531f09a3e':
Correctly populate title for ResolverActivity

commit | commitdiff | tree

Christopher Tate [Thu, 21 Aug 2014 00:45:05 +0000 (00:45 +0000)]

am 9ca86a61: am 08191dff: Merge "Don\'t crash good-citizen restore session clients" into lmp-dev

* commit '9ca86a61476b2c6f33392400ced14cf43ee589c1':
Don't crash good-citizen restore session clients

commit | commitdiff | tree

Jeff Sharkey [Thu, 21 Aug 2014 00:45:00 +0000 (00:45 +0000)]

am 54a521e9: am 08db58c4: Merge "More progress towards split APKs in ASECs." into lmp-dev

* commit '54a521e9ca79002b8191f33f6d8bf0d61e6d10d2':
More progress towards split APKs in ASECs.

commit | commitdiff | tree

Michael Lentine [Thu, 21 Aug 2014 00:44:55 +0000 (00:44 +0000)]

am b3b29eda: am 97c4c03a: Merge "Reduce shutdown animation duration." into lmp-dev

* commit 'b3b29edad23c27d8787d26d903c9728f5fabca5f':
Reduce shutdown animation duration.

commit | commitdiff | tree

Aravind Akella [Thu, 21 Aug 2014 00:44:45 +0000 (00:44 +0000)]

am da35d356: am b1762eb6: Merge "Step Counter documentation fix." into lmp-dev

* commit 'da35d3566292ada09172d8eb7b8e07828b49ee73':
Step Counter documentation fix.

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Aug 2014 00:44:41 +0000 (00:44 +0000)]

am 8da65466: am a6e05830: Merge "Prevent profile owners from setting certain user restrictions." into lmp-dev

* commit '8da654665ea6c62359e99c9694de81ea1a2fe2ab':
Prevent profile owners from setting certain user restrictions.

commit | commitdiff | tree

Jorim Jaggi [Thu, 21 Aug 2014 00:44:34 +0000 (00:44 +0000)]

am 1654a6c7: am 4ff1c9a2: Merge "Don\'t close panel when in QS and all notifications go away" into lmp-dev

* commit '1654a6c7fbfcb5ba4299fc3a59532d0fe157b8d9':
Don't close panel when in QS and all notifications go away

commit | commitdiff | tree

Alan Viverette [Thu, 21 Aug 2014 00:44:26 +0000 (00:44 +0000)]

am 28646cf6: am 0f9a48b6: Merge "Use correct single-letter date format in SimpleMonthView" into lmp-dev

* commit '28646cf6ab8f5837b44bed1393bce06d7ece508a':
Use correct single-letter date format in SimpleMonthView

commit | commitdiff | tree

John Spurlock [Thu, 21 Aug 2014 00:44:21 +0000 (00:44 +0000)]

am 1c2f0be2: am 62c52c37: Merge "Volume: Shave 12dp off of the volume dialog." into lmp-dev

* commit '1c2f0be2ea528bd5693f223ec1ceaf5b9ce93d52':
Volume: Shave 12dp off of the volume dialog.

commit | commitdiff | tree

Adrian Roos [Thu, 21 Aug 2014 00:44:16 +0000 (00:44 +0000)]

am 4e399ae7: am e0f85cb7: Only show face unlock indication if it applies

* commit '4e399ae720008acb61efdc52e3fd9b591e3e2220':
Only show face unlock indication if it applies

commit | commitdiff | tree

Christian Robertson [Thu, 21 Aug 2014 00:44:09 +0000 (00:44 +0000)]

am e3f4e333: am 8f1b2a4a: Merge "Updated set of geometric navigation bar icon assets" into lmp-dev

* commit 'e3f4e333af46a903459023e471982455b17f60dd':
Updated set of geometric navigation bar icon assets

commit | commitdiff | tree

RoboErik [Thu, 21 Aug 2014 00:44:03 +0000 (00:44 +0000)]

am 8961b5d5: am 7a754ab3: Merge "Api updates to MediaSession components" into lmp-dev

* commit '8961b5d5ac341ca7ae239569e962f7ff3437f312':
Api updates to MediaSession components

commit | commitdiff | tree

Robert Greenwalt [Thu, 21 Aug 2014 00:58:10 +0000 (00:58 +0000)]

Merge "resolved conflicts for merge of 4b48ce8f to lmp-dev-plus-aosp" into lmp-dev-plus-aosp

commit | commitdiff | tree

Robert Greenwalt [Thu, 21 Aug 2014 00:56:56 +0000 (17:56 -0700)]

resolved conflicts for merge of 4b48ce8f to lmp-dev-plus-aosp

Change-Id: I9bb9b6b48bc3c355ad303db89b0cbd1642eaa292

commit | commitdiff | tree

Mathieu Chartier [Thu, 21 Aug 2014 00:02:38 +0000 (00:02 +0000)]

am be39e991: am 977c4a5b: Merge "Clean up ExceptionOccurred."

* commit 'be39e99187eec88222722e9ec4c91f1744731cf4':
Clean up ExceptionOccurred.

commit | commitdiff | tree

Mathieu Chartier [Thu, 21 Aug 2014 00:02:12 +0000 (00:02 +0000)]

am 554bd893: am 8f9ebc8a: Merge "Remove unnecessary explicit GC in ZygoteInit."

* commit '554bd8937b60e8f015f1f46b939dff92c2259790':
Remove unnecessary explicit GC in ZygoteInit.

commit | commitdiff | tree

Robert Greenwalt [Wed, 20 Aug 2014 23:50:00 +0000 (23:50 +0000)]

am bda0d8e3: Merge "Mark configuration strings as non-translatable."

* commit 'bda0d8e3d6d4ddb5d70351169852693b4c5ec047':
Mark configuration strings as non-translatable.

commit | commitdiff | tree

Mathieu Chartier [Wed, 20 Aug 2014 23:49:56 +0000 (23:49 +0000)]

am 977c4a5b: Merge "Clean up ExceptionOccurred."

* commit '977c4a5b81317cdf6537e58f82a5edcd0641ca50':
Clean up ExceptionOccurred.

commit | commitdiff | tree

Mathieu Chartier [Wed, 20 Aug 2014 23:49:12 +0000 (23:49 +0000)]

am 8f9ebc8a: Merge "Remove unnecessary explicit GC in ZygoteInit."

* commit '8f9ebc8a7c0238ce85104d2f20d0ddad1e4d8696':
Remove unnecessary explicit GC in ZygoteInit.

commit | commitdiff | tree

Tenghui Zhu [Wed, 20 Aug 2014 22:22:27 +0000 (22:22 +0000)]

am 36f1b53f: Merge "Revert "Revert "Update indeterminate linear progress bar""" into lmp-dev

* commit '36f1b53f43c63db4bac3b18dba7fc96d85a50055':
Revert "Revert "Update indeterminate linear progress bar""

commit | commitdiff | tree

Jeff Brown [Wed, 20 Aug 2014 22:22:23 +0000 (22:22 +0000)]

am ddc35381: Reset auto-brightness setting to default.

* commit 'ddc35381b014f7c65231036d9c8dd255680bca02':
Reset auto-brightness setting to default.

commit | commitdiff | tree

Jeff Brown [Wed, 20 Aug 2014 22:22:18 +0000 (22:22 +0000)]

am 2bc60f6e: Only select bluetooth route by default when A2DP is enabled.

* commit '2bc60f6e8c990549eb9173c88c0e1457ceb9acd7':
Only select bluetooth route by default when A2DP is enabled.

commit | commitdiff | tree

Michael Wright [Wed, 20 Aug 2014 21:56:56 +0000 (21:56 +0000)]

am f2516f7c: Add cleanspec for inputflinger removal

* commit 'f2516f7cb96ac5fd3f0dcb3db41891f94b0841be':
Add cleanspec for inputflinger removal

commit | commitdiff | tree

Tenghui Zhu [Wed, 20 Aug 2014 22:00:57 +0000 (22:00 +0000)]

Merge "Revert "Revert "Update indeterminate linear progress bar""" into lmp-dev

commit | commitdiff | tree

Jeff Brown [Wed, 20 Aug 2014 21:32:38 +0000 (14:32 -0700)]

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

commit | commitdiff | tree

Jeff Brown [Wed, 20 Aug 2014 21:17:37 +0000 (14:17 -0700)]

Only select bluetooth route by default when A2DP is enabled.

Bug: 15756471
Change-Id: I822e51742e009b473000b8d67ec9c9a81c39b702

commit | commitdiff | tree

Robert Greenwalt [Wed, 20 Aug 2014 23:35:37 +0000 (23:35 +0000)]

Merge "Mark configuration strings as non-translatable."

commit | commitdiff | tree

Igor Viarheichyk [Wed, 20 Aug 2014 23:22:54 +0000 (16:22 -0700)]

Mark configuration strings as non-translatable.

10 out of 36 strings in config.xml were not marked as non-translatable,
making pseudolocalization handle them incorrectly and leading to
potential issues with unexpected translations. Added translatable="false"
to all of them for consistency.

Change-Id: I55d8b0c24834722e71fa3e89ae508a95839416e9

commit | commitdiff | tree

Mathieu Chartier [Wed, 20 Aug 2014 23:31:38 +0000 (23:31 +0000)]

Merge "Clean up ExceptionOccurred."

commit | commitdiff | tree

Mathieu Chartier [Wed, 20 Aug 2014 17:04:08 +0000 (10:04 -0700)]

Clean up ExceptionOccurred.

Use ExceptionCheck before ExceptionOccurred since ExceptionCheck
doesn't acquire any locks and is faster.

Change-Id: Ibd87fd1e33b339bd2a6effa1d20d3253c8a61bdc

commit | commitdiff | tree

Mathieu Chartier [Wed, 20 Aug 2014 23:17:06 +0000 (23:17 +0000)]

Merge "Remove unnecessary explicit GC in ZygoteInit."

commit | commitdiff | tree

Michael Wright [Tue, 19 Aug 2014 20:16:47 +0000 (13:16 -0700)]

Add cleanspec for inputflinger removal

Change-Id: I4fe5ca7f8024d3a8d68eea6070d8c508501da280

commit | commitdiff | tree

Tenghui Zhu [Wed, 20 Aug 2014 20:48:11 +0000 (20:48 +0000)]

Revert "Revert "Update indeterminate linear progress bar""

This reverts commit f010cb690c49887ba8fc6f925c468b8fa865a4c1.

Change-Id: I9e36ddf046eb0ff07fc736da2498e1669c8821f1

commit | commitdiff | tree

Jeff Davidson [Wed, 20 Aug 2014 20:52:13 +0000 (20:52 +0000)]

am fa141926: Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev

* commit 'fa141926ed0318690213dbd620052daf7873a497':
Improve documentation of ScanResult and WifiInfo.

commit | commitdiff | tree

Adrian Roos [Wed, 20 Aug 2014 20:33:18 +0000 (20:33 +0000)]

am 323d9567: Merge "Allow SystemUI to control Bluetooth for secondary users" into lmp-dev

* commit '323d9567c051fc17c70edb347d3245173603b33f':
Allow SystemUI to control Bluetooth for secondary users

commit | commitdiff | tree

Adam Powell [Wed, 20 Aug 2014 20:33:14 +0000 (20:33 +0000)]

am 7ad2d5b4: Merge "Correctly populate title for ResolverActivity" into lmp-dev

* commit '7ad2d5b4eda851dc1d890b0e135a7a3c3bdb41b5':
Correctly populate title for ResolverActivity

commit | commitdiff | tree

Christopher Tate [Wed, 20 Aug 2014 20:28:33 +0000 (20:28 +0000)]

am 08191dff: Merge "Don\'t crash good-citizen restore session clients" into lmp-dev

* commit '08191dff4ce703498f66cd74b2d3377d98d55587':
Don't crash good-citizen restore session clients

commit | commitdiff | tree

Jeff Sharkey [Wed, 20 Aug 2014 20:28:28 +0000 (20:28 +0000)]

am 08db58c4: Merge "More progress towards split APKs in ASECs." into lmp-dev

* commit '08db58c444b0c92d7e3fd55753c1ac8bad33cfa4':
More progress towards split APKs in ASECs.

commit | commitdiff | tree

Michael Lentine [Wed, 20 Aug 2014 20:28:24 +0000 (20:28 +0000)]

am 97c4c03a: Merge "Reduce shutdown animation duration." into lmp-dev

* commit '97c4c03a1655f7b82d13ecb96a36cec6caee666e':
Reduce shutdown animation duration.

commit | commitdiff | tree

Aravind Akella [Wed, 20 Aug 2014 20:18:25 +0000 (20:18 +0000)]

am b1762eb6: Merge "Step Counter documentation fix." into lmp-dev

* commit 'b1762eb6c0e9f59ef69d425ff531d7eedb282968':
Step Counter documentation fix.

commit | commitdiff | tree

Julia Reynolds [Wed, 20 Aug 2014 20:18:21 +0000 (20:18 +0000)]

am a6e05830: Merge "Prevent profile owners from setting certain user restrictions." into lmp-dev

* commit 'a6e0583072f23da08f900c81bc44fcbb2ee11271':
Prevent profile owners from setting certain user restrictions.

commit | commitdiff | tree

Jeff Davidson [Wed, 20 Aug 2014 20:41:43 +0000 (20:41 +0000)]

Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 20:07:42 +0000 (20:07 +0000)]

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

commit | commitdiff | tree

Alan Viverette [Wed, 20 Aug 2014 20:07:36 +0000 (20:07 +0000)]

am 0f9a48b6: Merge "Use correct single-letter date format in SimpleMonthView" into lmp-dev

* commit '0f9a48b60226c538c1cf7128abcf59302f69f46b':
Use correct single-letter date format in SimpleMonthView

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 20:07:32 +0000 (20:07 +0000)]

am 62c52c37: Merge "Volume: Shave 12dp off of the volume dialog." into lmp-dev

* commit '62c52c375115ce8fbef1ce28b2dc82ba403d11be':
Volume: Shave 12dp off of the volume dialog.

commit | commitdiff | tree

Adrian Roos [Wed, 20 Aug 2014 20:07:27 +0000 (20:07 +0000)]

am e0f85cb7: Only show face unlock indication if it applies

* commit 'e0f85cb7ab0431f627f5c14f7b85db38903a44ae':
Only show face unlock indication if it applies

commit | commitdiff | tree

Christian Robertson [Wed, 20 Aug 2014 19:57:13 +0000 (19:57 +0000)]

am 8f1b2a4a: Merge "Updated set of geometric navigation bar icon assets" into lmp-dev

* commit '8f1b2a4adacbd8abea097bd1797d9d7ec1bb6bed':
Updated set of geometric navigation bar icon assets

commit | commitdiff | tree

RoboErik [Wed, 20 Aug 2014 19:57:08 +0000 (19:57 +0000)]

am 7a754ab3: Merge "Api updates to MediaSession components" into lmp-dev

* commit '7a754ab331d6832034b5188584c51139f44bf629':
Api updates to MediaSession components

commit | commitdiff | tree

Adrian Roos [Wed, 20 Aug 2014 15:41:44 +0000 (17:41 +0200)]

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

commit | commitdiff | tree

vandwalle [Wed, 20 Aug 2014 19:33:36 +0000 (19:33 +0000)]

am e0eba745: (-s ours) am 3a7bbbff: am 14aa17a2: Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev

* commit 'e0eba7457c680585aec754a516981d713109649e':
remove passpoint, except ANQP - DO NOT MERGE

commit | commitdiff | tree

Adrian Roos [Wed, 20 Aug 2014 19:33:32 +0000 (19:33 +0000)]

am 4f6d1458: am cb640c62: am 68d3e6c7: Merge "Implement trust managed visuals" into lmp-dev

* commit '4f6d1458e280ce1be3a82e09c5e4cb174d9c58c3':
Implement trust managed visuals

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Aug 2014 19:33:23 +0000 (19:33 +0000)]

am 5066ef8a: am 7224e1b2: am 7d98d0a0: Merge "Fix crash when launching Activities in \'android\' package" into lmp-dev

* commit '5066ef8a448a74619fa0083caf89eb3f925021cf':
Fix crash when launching Activities in 'android' package

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 19:33:19 +0000 (19:33 +0000)]

am 2cb54809: am c3dbfd16: am f28c44b9: Merge "Remove battery color when in power save" into lmp-dev

* commit '2cb54809de3d673c5f221f2472c9fdcf9b040470':
Remove battery color when in power save

commit | commitdiff | tree

Selim Cinek [Wed, 20 Aug 2014 19:33:10 +0000 (19:33 +0000)]

am 0b972d9d: am d59026ba: am ffb5acc3: Merge "Announcing quick settings changes now via talkback" into lmp-dev

* commit '0b972d9df92b88adb4b62b8c521142f3919e2235':
Announcing quick settings changes now via talkback

commit | commitdiff | tree

vandwalle [Wed, 20 Aug 2014 19:26:13 +0000 (19:26 +0000)]

am 3a7bbbff: am 14aa17a2: Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev

* commit '3a7bbbff1e526dce660fc1d08113167134402b75':
remove passpoint, except ANQP - DO NOT MERGE

commit | commitdiff | tree

Adrian Roos [Wed, 20 Aug 2014 19:26:08 +0000 (19:26 +0000)]

am cb640c62: am 68d3e6c7: Merge "Implement trust managed visuals" into lmp-dev

* commit 'cb640c625d063a757b5deb9b15a971745aacb8d6':
Implement trust managed visuals

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Aug 2014 19:26:03 +0000 (19:26 +0000)]

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

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 19:25:58 +0000 (19:25 +0000)]

am c3dbfd16: am f28c44b9: Merge "Remove battery color when in power save" into lmp-dev

* commit 'c3dbfd1673ef88bf43c7fd23d421ca6155c30217':
Remove battery color when in power save

commit | commitdiff | tree

Selim Cinek [Wed, 20 Aug 2014 19:25:53 +0000 (19:25 +0000)]

am d59026ba: am ffb5acc3: Merge "Announcing quick settings changes now via talkback" into lmp-dev

* commit 'd59026baf0b1aa94f02e6f38672bce653b994a4f':
Announcing quick settings changes now via talkback

commit | commitdiff | tree

vandwalle [Wed, 20 Aug 2014 19:13:26 +0000 (19:13 +0000)]

am 14aa17a2: Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev

* commit '14aa17a230d141c9a1f4478f4fc85d5263080c47':
remove passpoint, except ANQP - DO NOT MERGE

commit | commitdiff | tree

Adrian Roos [Wed, 20 Aug 2014 19:13:21 +0000 (19:13 +0000)]

am 68d3e6c7: Merge "Implement trust managed visuals" into lmp-dev

* commit '68d3e6c797efa43fa0852ae7583c554463938059':
Implement trust managed visuals

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Aug 2014 19:13:17 +0000 (19:13 +0000)]

am 7d98d0a0: Merge "Fix crash when launching Activities in \'android\' package" into lmp-dev

* commit '7d98d0a0c57232d5c00b823cf8ff4fa6ff643e06':
Fix crash when launching Activities in 'android' package

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 19:13:12 +0000 (19:13 +0000)]

am f28c44b9: Merge "Remove battery color when in power save" into lmp-dev

* commit 'f28c44b963d09d0f3f8a7515644e48144b214ac2':
Remove battery color when in power save

commit | commitdiff | tree

Selim Cinek [Wed, 20 Aug 2014 19:13:07 +0000 (19:13 +0000)]

am ffb5acc3: Merge "Announcing quick settings changes now via talkback" into lmp-dev

* commit 'ffb5acc3d82c67fa8ced8a7d2b699620241ec6d2':
Announcing quick settings changes now via talkback

commit | commitdiff | tree

Christopher Tate [Wed, 20 Aug 2014 20:23:42 +0000 (20:23 +0000)]

Merge "Don't crash good-citizen restore session clients" into lmp-dev

commit | commitdiff | tree

Christian Robertson [Wed, 20 Aug 2014 19:54:16 +0000 (19:54 +0000)]

Merge "Updated set of geometric navigation bar icon assets" into lmp-dev

commit | commitdiff | tree

Chris Craik [Wed, 20 Aug 2014 18:08:20 +0000 (18:08 +0000)]

am d2affeca: am c8028af9: am 1ada8566: Merge "Add outlineProvider attribute" into lmp-dev

* commit 'd2affecab253cd4e96a7b4c67fa2e38bc89df122':
Add outlineProvider attribute

commit | commitdiff | tree

Chris Craik [Wed, 20 Aug 2014 18:08:15 +0000 (18:08 +0000)]

am 807659ea: am 5edc6c50: am 4fe137c7: Merge "Make getOutline account for gravity BitmapDrawable" into lmp-dev

* commit '807659ea9447402cba1975d0960ae22334c52e26':
Make getOutline account for gravity BitmapDrawable

commit | commitdiff | tree

Chris Craik [Wed, 20 Aug 2014 17:59:56 +0000 (17:59 +0000)]

am c8028af9: am 1ada8566: Merge "Add outlineProvider attribute" into lmp-dev

* commit 'c8028af9f90268db55547b56fd0dc242bb7d9053':
Add outlineProvider attribute

commit | commitdiff | tree

Chris Craik [Wed, 20 Aug 2014 17:59:52 +0000 (17:59 +0000)]

am 5edc6c50: am 4fe137c7: Merge "Make getOutline account for gravity BitmapDrawable" into lmp-dev

* commit '5edc6c500490bbb9d36b6122106ccb291e1cfe78':
Make getOutline account for gravity BitmapDrawable

commit | commitdiff | tree

Mathieu Chartier [Wed, 20 Aug 2014 17:24:11 +0000 (10:24 -0700)]

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

commit | commitdiff | tree

Chris Craik [Wed, 20 Aug 2014 17:47:00 +0000 (17:47 +0000)]

am 1ada8566: Merge "Add outlineProvider attribute" into lmp-dev

* commit '1ada856628fb56518b438a45d0b66693d7eef185':
Add outlineProvider attribute

commit | commitdiff | tree

Chris Craik [Wed, 20 Aug 2014 17:46:55 +0000 (17:46 +0000)]

am 4fe137c7: Merge "Make getOutline account for gravity BitmapDrawable" into lmp-dev

* commit '4fe137c71378711bf1cb09286341f90c2a5d59e2':
Make getOutline account for gravity BitmapDrawable