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

150838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Svet Ganov
38676f370e am 2b86b50b: Merge "Notify app widget hosts when cross-profile providers change." into lmp-dev 
* commit '2b86b50b0f79b24cc2e738469dbfc2e0dc110cdb':
  Notify app widget hosts when cross-profile providers change.
 2014-08-21 02:02:56 +00:00
Svetoslav
c3c5ad6fdf am 0ab2d34b: Merge "Using default system icon for print spooler" into lmp-dev 
* commit '0ab2d34bb6a182fc15994c3e212ea458a5f048f7':
  Using default system icon for print spooler
 2014-08-21 02:02:52 +00:00
Svetoslav
748b9a1638 am d5f8a500: Merge "Update the "More options" button in printing." into lmp-dev 
* commit 'd5f8a5008cf56e33b5bd99ed8ef80179691e0966':
  Update the "More options" button in printing.
 2014-08-21 02:02:44 +00:00
Wei Wang
88d35d0c39 am b6f53353: Merge "Fix race condition for BluetoothLeScanner." into lmp-dev 
* commit 'b6f533534fce404f00b519ad963bf614747853cb':
  Fix race condition for BluetoothLeScanner.
 2014-08-21 02:02:39 +00:00
Christopher Tate
04d3cc02e2 am 54eaf4f8: Merge "Maintain transport connection through package updates" into lmp-dev 
* commit '54eaf4f85277483743827c52530df407e720a046':
  Maintain transport connection through package updates
 2014-08-21 01:44:54 +00:00
Adam Powell
3857746ee5 am 74f2ad5d: Merge "Fix measurement regression in ActionBarContainer" into lmp-dev 
* commit '74f2ad5da40a186d78647e4ab31bb39ad9a58957':
  Fix measurement regression in ActionBarContainer
 2014-08-21 01:28:15 +00:00
RoboErik
93b4662531 Set transport control flags when a session is created 
Some apps only set the transport control flags once when their service
starts. This was leading to them not getting set when a session is
created on their behalf in RCC. This sets the flags when a session
is created if needed.

bug:16822064
Change-Id: Iea1ebf7747b3059101eb3c36b143b594cc51e114
 2014-08-20 18:19:30 -07:00
Robert Greenwalt
d4aba7aa88 am 251ccb52: Merge "Add config resource to overlay tcp buffer sizes." into lmp-dev 
* commit '251ccb52dff69b2e91b8795756d8ef1a2dd46386':
  Add config resource to overlay tcp buffer sizes.
 2014-08-21 01:15:44 +00:00
Robert Greenwalt
78da155fd4 am 3a494857: Merge "Avoid reusing a currently active NetID." into lmp-dev 
* commit '3a494857919ee37e1decb9c09e6f663ede89b271':
  Avoid reusing a currently active NetID.
 2014-08-21 01:15:38 +00:00
Robert Greenwalt
330be3f207 am c0674366: Merge "Fix listening NetworkRequests to listen for all networks." into lmp-dev 
* commit 'c067436609984a06fd95355b06e180ef8d9801e1':
  Fix listening NetworkRequests to listen for all networks.
 2014-08-21 01:15:33 +00:00
Robert Greenwalt
80eecc3401 am 7f07196d: Merge "Add missing break statements to avoid unnecessary network validation." into lmp-dev 
* commit '7f07196d232adb4e78f9e43d5bd1e28d39ec832e':
  Add missing break statements to avoid unnecessary network validation.
 2014-08-21 01:15:29 +00:00
Robert Greenwalt
090dcee5a7 am dd387b4a: Merge "Fix CS/NetworkMonitor race." into lmp-dev 
* commit 'dd387b4a63394918c758c745995f4f09785dfccc':
  Fix CS/NetworkMonitor race.
 2014-08-21 01:15:14 +00:00
Jason Monk
d20f09ab3b am 45959a5e: Merge "Fix SOCKS proxies from being dropped from PAC" into lmp-dev 
* commit '45959a5e4f0eb42e1e18cd563a9cf56d5c9dd65b':
  Fix SOCKS proxies from being dropped from PAC
 2014-08-21 01:15:08 +00:00
Dianne Hackborn
aec68bb89f Fix issue #17038762: Add API to add entries to the recents list 
New API Added to ActivityManager for adding an entry.  See docs
there.

Repercussions:

- I hit a bug in system UI where if the thumbnail has alpha, it tries
  to modify it, but thumbnails are loading immutable so crashes.  Fixed
  this by loading the bitmaps to be mutable.
- Improved dump output of recents; there was a lot of stuff missing.
  Also split the recents dump output from the rest of the activity
  output, since it can be really large.
- Added tests to the lovely ActivityTest app.

Bonus: new method on AppTask to control the exclude from recents flag.

Change-Id: I01e543db4d15320ee1701e95872fef73c116526c
 2014-08-20 18:03:43 -07:00
Chris Craik
5faf85b6dd Clarify text shadow attribute/method comments 
bug:17157162

Change-Id: I7abe7c0eb1973ddf7d7a17d9dd85c08833c4bf88
 2014-08-20 17:59:25 -07:00
Adam Lesinski
6022debdbc AAPT: Fix regression generating dynamic ref table for shared libraries 
AAPT stopped generating dynamic reference tables for shared libraries.

Change-Id: Ib0025811bdca1a4756eb21080dd6b6bb3fc1ca3d
 2014-08-20 17:55:33 -07:00
Guang Zhu
aacaa1735c am 6c2d3ce6: Merge "follow up minor fixes for connectivity manager test" into lmp-dev 
* commit '6c2d3ce66163a78f407f596a496a97c1d62aa871':
  follow up minor fixes for connectivity manager test
 2014-08-21 00:50:38 +00:00
Adam Powell
39b1bdaba2 am c33bc746: Merge "Unify code paths for collapsing action views in action bars" into lmp-dev 
* commit 'c33bc746d05f9896dc1f12f8c6bba5fb53c6a2b8':
  Unify code paths for collapsing action views in action bars
 2014-08-21 00:50:34 +00:00
Winson Chung
3bad5cc0f5 Fixing issue with inconsistent icon filename. (Bug 16992882) 2014-08-21 00:44:27 +00:00
Guang Zhu
00c4026e21 am e046262d: Merge "fixes for connectivity manager test suite" into lmp-dev 
* commit 'e046262d2d5883b800187a558c32883e1b87d33d':
  fixes for connectivity manager test suite
 2014-08-21 00:36:47 +00:00
Amit Mahajan
0f9851cb14 am 5b821459: Merge "Adding APIs to get IMEI/MEID" into lmp-dev 
* commit '5b8214597f6518132643bcd0ce37fa8d1ff6375a':
  Adding APIs to get IMEI/MEID
 2014-08-21 00:36:43 +00:00
Chris Craik
b825e937f7 am d093d695: Merge "Add bounds checking to nine patch scaling" into lmp-dev 
* commit 'd093d695c8be9a25642de5433521a5cb9e230f01':
  Add bounds checking to nine patch scaling
 2014-08-21 00:36:37 +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
Svet Ganov
635bc8bc84 Merge "Notify app widget hosts when cross-profile providers change." into lmp-dev 2014-08-21 00:22:45 +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
Christopher Tate
a555fd847c Merge "Maintain transport connection through package updates" into lmp-dev 2014-08-21 00:22:45 +00:00
Christopher Tate
b2707afb0c Maintain transport connection through package updates 
When a package is updated, existing bindings to that package's
services are severed and must be manually re-established.  Now
that the transport can be updated outside the system per se,
make sure that we detect these cases and rebind as needed.

Bug 16139912

Change-Id: I5d6fa75bb86484f8f7d4f8e93c9157773995e6a7
 2014-08-21 00:25:53 +00:00
Svetoslav
bdbb6e0679 Merge "Update the "More options" button in printing." into lmp-dev 2014-08-21 00:16:54 +00:00
Adam Powell
a900677a0b Merge "Fix measurement regression in ActionBarContainer" into lmp-dev 2014-08-21 00:16:54 +00:00
Adam Powell
635c21b061 Fix measurement regression in ActionBarContainer 
Make sure that we take into account all child views (including
ActionBarContextViews) when measuring the action bar container to
determine the measurement influence of an additional tab bar.

Bug 16982971

Change-Id: I53ba7e9a4c9e36d97c6385d2007a3ee0a4e2bc77
 2014-08-20 18:15:30 -07:00
Adam Powell
75f9918760 Merge "Unify code paths for collapsing action views in action bars" into lmp-dev 2014-08-21 00:16:54 +00:00