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

150630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
9693de21f4 am 2e9ab3ab: am aebd7b79: Merge "Update state to failed if the VPN fails to connect." into lmp-dev 
* commit '2e9ab3abfd1fe84a3021d549cdd43c45c8bfda73':
  Update state to failed if the VPN fails to connect.
 2014-08-21 03:02:37 +00:00
Yorke Lee
8c7dfb3a3b am fa0efcd1: am 0719e606: Merge "Make AudioState modes static constants" into lmp-dev 
* commit 'fa0efcd1e746bfcdc7172d7547a53c9cf1531fb7':
  Make AudioState modes static constants
 2014-08-21 03:02:22 +00:00
Jeff Davidson
814c033d38 am d217efb9: am 709941fd: Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev 
* commit 'd217efb9da55bbdbb69bd33cb88531cb7c1ce76b':
  Less intrusive VPN dialog and other UX tweaks.
 2014-08-21 03:01:44 +00:00
Diego Pontoriero
2d21ec47ca am 744a16e4: 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 '744a16e448533d591205fb24c46ee218e08d4e4e':
  Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API for determining carrier app instead of MCC/MNC.
 2014-08-21 03:01:39 +00:00
Amith Yamasani
58201d9a8b am 614e4635: am d5d82cf3: Merge "Add a hidden method to query profile owner name for a user" into lmp-dev 
* commit '614e4635ee6f6316736384cf174dd6ca4f18c6b6':
  Add a hidden method to query profile owner name for a user
 2014-08-21 03:00:21 +00:00
Jorim Jaggi
adc397ae79 am 13a776ac: am 61dfef79: Merge "Accessibility actions for lock/phone/camera icon" into lmp-dev 
* commit '13a776ac900c690accda6f02392512f03bc1969e':
  Accessibility actions for lock/phone/camera icon
 2014-08-21 03:00:16 +00:00
John Reck
e4ed4f74d1 am 17ed6e74: am 876f1a1a: Merge "Implement full View.buildLayer" into lmp-dev 
* commit '17ed6e74ce560916d4a06198d4f6446562d9db34':
  Implement full View.buildLayer
 2014-08-21 03:00:11 +00:00
Alan Viverette
efc725aa10 am 3c7d85df: am a4fb61a6: Merge "Forward additional drawable methods in AVD" into lmp-dev 
* commit '3c7d85df63398654e6c221fd7bab8312ffbe3459':
  Forward additional drawable methods in AVD
 2014-08-21 03:00:07 +00:00
Jason Monk
e1fd447596 am fb0f3ab2: am a765518f: Merge "Lock task doesn\'t always end properly." into lmp-dev 
* commit 'fb0f3ab21eed9a93f6792f0c610d96cb8caaebf6':
  Lock task doesn't always end properly.
 2014-08-21 02:57:42 +00:00
Sailesh Nepal
9b78e2c092 am 2c4ffbf9: am 9c59bd75: Merge "Clean up and fix bugs in ConnectionService.createConnection" into lmp-dev 
* commit '2c4ffbf9dc5666b36d8b56901f47fa39da33cd5e':
  Clean up and fix bugs in ConnectionService.createConnection
 2014-08-21 02:57:36 +00:00
Tenghui Zhu
e4dc2c0ad9 am 4f39448e: am 36f1b53f: Merge "Revert "Revert "Update indeterminate linear progress bar""" into lmp-dev 
* commit '4f39448eb5fa1c62d1c7ce71f3205dcce73bb694':
  Revert "Revert "Update indeterminate linear progress bar""
 2014-08-21 02:57:30 +00:00
Jeff Brown
103ceaec67 am f6d0c657: am ddc35381: Reset auto-brightness setting to default. 
* commit 'f6d0c6570076fd63d4b6d9ba61d2cea86f38d93e':
  Reset auto-brightness setting to default.
 2014-08-21 02:57:25 +00:00
Jeff Brown
070371bbf7 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.
 2014-08-21 02:57:21 +00:00
Michael Wright
fbf5472ecd am 56ba049e: am f2516f7c: Add cleanspec for inputflinger removal 
* commit '56ba049ed08e4ad7632e10df2b0d5415b00295a0':
  Add cleanspec for inputflinger removal
 2014-08-21 02:54:20 +00:00
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
Lorenzo Colitti
a29bc43b0d am aebd7b79: Merge "Update state to failed if the VPN fails to connect." into lmp-dev 
* commit 'aebd7b79eabf3ea775b5cc25b72cebacadb9a943':
  Update state to failed if the VPN fails to connect.
 2014-08-21 00:28:13 +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
Yorke Lee
7168e78bbc am 0719e606: Merge "Make AudioState modes static constants" into lmp-dev 
* commit '0719e60653d7e328ce6d810f3a58d13fc58f089c':
  Make AudioState modes static constants
 2014-08-21 00:14:04 +00:00
Lorenzo Colitti
827296b7dd Merge "Update state to failed if the VPN fails to connect." into lmp-dev 2014-08-21 00:11:43 +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
Jeff Davidson
0e7eb9b3b2 am 709941fd: Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev 
* commit '709941fd34e02fb6639ab31e04404b023c820dec':
  Less intrusive VPN dialog and other UX tweaks.
 2014-08-21 00:02:07 +00:00
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
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
Lorenzo Colitti
438406092e Update state to failed if the VPN fails to connect. 
Without this, the VPN settings dialog stays in "Connecting..."
forever.

Bug: 17140195
Change-Id: I4771be464384b62114839523fb2a6b36aa6520ee
 2014-08-20 16:01:44 -07: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