drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,577 Commits 1 Branch 0 Tags
Commit Graph

150577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
2cfe5359eb am 5e3130d6: am fa141926: Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev 
* commit '5e3130d63a745ad6cd3ccf535845128ae744d092':
  Improve documentation of ScanResult and WifiInfo.
 2014-08-21 02:47:05 +00:00
Robert Greenwalt
5a4b32fa5c Merge "resolved conflicts for merge of 4b48ce8f to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 2014-08-21 00:22:45 +00:00
Robert Greenwalt
3befd9c074 resolved conflicts for merge of 4b48ce8f to lmp-dev-plus-aosp 
Change-Id: I9bb9b6b48bc3c355ad303db89b0cbd1642eaa292
 2014-08-20 17:56:56 -07:00
Adrian Roos
9d0a5fd90c 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
 2014-08-21 00:45:14 +00:00
Adam Powell
06716eda04 am cc448e10: am 7ad2d5b4: Merge "Correctly populate title for ResolverActivity" into lmp-dev 
* commit 'cc448e102bae06bcd2f9d1d1e59013f531f09a3e':
  Correctly populate title for ResolverActivity
 2014-08-21 00:45:09 +00:00
Christopher Tate
2ad553d07b 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
 2014-08-21 00:45:05 +00:00
Jeff Sharkey
28d57a5e6c am 54a521e9: am 08db58c4: Merge "More progress towards split APKs in ASECs." into lmp-dev 
* commit '54a521e9ca79002b8191f33f6d8bf0d61e6d10d2':
  More progress towards split APKs in ASECs.
 2014-08-21 00:45:00 +00:00
Michael Lentine
fd782ebad7 am b3b29eda: am 97c4c03a: Merge "Reduce shutdown animation duration." into lmp-dev 
* commit 'b3b29edad23c27d8787d26d903c9728f5fabca5f':
  Reduce shutdown animation duration.
 2014-08-21 00:44:55 +00:00
Aravind Akella
6c5b04a192 am da35d356: am b1762eb6: Merge "Step Counter documentation fix." into lmp-dev 
* commit 'da35d3566292ada09172d8eb7b8e07828b49ee73':
  Step Counter documentation fix.
 2014-08-21 00:44:45 +00:00
Julia Reynolds
9d36917870 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.
 2014-08-21 00:44:41 +00:00
Jorim Jaggi
e3cc7b20c6 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
 2014-08-21 00:44:34 +00:00
Alan Viverette
5709934c71 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
 2014-08-21 00:44:26 +00:00
John Spurlock
c57fc9a951 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.
 2014-08-21 00:44:21 +00:00
Adrian Roos
bee1eaf62c am 4e399ae7: am e0f85cb7: Only show face unlock indication if it applies 
* commit '4e399ae720008acb61efdc52e3fd9b591e3e2220':
  Only show face unlock indication if it applies
 2014-08-21 00:44:16 +00:00
Christian Robertson
791cbc3dc8 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
 2014-08-21 00:44:09 +00:00
RoboErik
1874251325 am 8961b5d5: am 7a754ab3: Merge "Api updates to MediaSession components" into lmp-dev 
* commit '8961b5d5ac341ca7ae239569e962f7ff3437f312':
  Api updates to MediaSession components
 2014-08-21 00:44:03 +00:00
Mathieu Chartier
cbed4e523b am be39e991: am 977c4a5b: Merge "Clean up ExceptionOccurred." 
* commit 'be39e99187eec88222722e9ec4c91f1744731cf4':
  Clean up ExceptionOccurred.
 2014-08-21 00:02:38 +00:00
Mathieu Chartier
41b07f1413 am 554bd893: am 8f9ebc8a: Merge "Remove unnecessary explicit GC in ZygoteInit." 
* commit '554bd8937b60e8f015f1f46b939dff92c2259790':
  Remove unnecessary explicit GC in ZygoteInit.
 2014-08-21 00:02:12 +00:00
Robert Greenwalt
4b48ce8f0c am bda0d8e3: Merge "Mark configuration strings as non-translatable." 
* commit 'bda0d8e3d6d4ddb5d70351169852693b4c5ec047':
  Mark configuration strings as non-translatable.
 2014-08-20 23:50:00 +00:00
Mathieu Chartier
be39e99187 am 977c4a5b: Merge "Clean up ExceptionOccurred." 
* commit '977c4a5b81317cdf6537e58f82a5edcd0641ca50':
  Clean up ExceptionOccurred.
 2014-08-20 23:49:56 +00:00
Mathieu Chartier
554bd8937b am 8f9ebc8a: Merge "Remove unnecessary explicit GC in ZygoteInit." 
* commit '8f9ebc8a7c0238ce85104d2f20d0ddad1e4d8696':
  Remove unnecessary explicit GC in ZygoteInit.
 2014-08-20 23:49:12 +00:00
Robert Greenwalt
bda0d8e3d6 Merge "Mark configuration strings as non-translatable." 2014-08-20 21:39:46 +00:00
Igor Viarheichyk
e1501d73c8 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
 2014-08-20 16:22:54 -07:00
Mathieu Chartier
977c4a5b81 Merge "Clean up ExceptionOccurred." 2014-08-20 21:39:46 +00:00
Mathieu Chartier
98671c34fa Clean up ExceptionOccurred. 
Use ExceptionCheck before ExceptionOccurred since ExceptionCheck
doesn't acquire any locks and is faster.

Change-Id: Ibd87fd1e33b339bd2a6effa1d20d3253c8a61bdc
 2014-08-20 16:24:47 -07:00
Mathieu Chartier
8f9ebc8a7c Merge "Remove unnecessary explicit GC in ZygoteInit." 2014-08-20 21:39:46 +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
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
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
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