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

150822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Adam Powell
5352a89e8a Unify code paths for collapsing action views in action bars 
This reverts a well-intentioned bugfix that made
ActionBarOverlayLayout focusable in touch mode and caused issues with
some activity layouts. Removes the associated key handling code for
the Back key in ActionBarOverlayLayout and handles it at a higher
level in Activity instead. (This same code path was already in use by
ToolbarActionBar.)

Bug 17105724

Change-Id: I57e4cace44a6d11f25a2549644b565446d616a52
 2014-08-20 17:33:24 -07:00
Amit Mahajan
dbc6689664 Merge "Adding APIs to get IMEI/MEID" into lmp-dev 2014-08-21 00:16:54 +00:00
Chris Craik
2d84cdb414 Merge "Add bounds checking to nine patch scaling" into lmp-dev 2014-08-21 00:16:54 +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
Guang Zhu
cf038760f2 Merge "fixes for connectivity manager test suite" into lmp-dev 2014-08-21 00:11:43 +00:00
Guang Zhu
d21f1c1e4d fixes for connectivity manager test suite 
* reduced visibility of most util functions in
  ConnectivityManagerTestBase
* reimplemented various waitFor... util function in base class:
  instead of relying on received broadcast and synchronization
  mechanism, we just poll for what we want with a fixed interval
  and a max timeout
* minor style fixes
* removed state transition checks in all test cases of
  ConnectivityManagerMobileTest: since exact state transitions
  are not that interesting, we just care about if we reach a
  particular state and if all network interfaces are in their
  corresponding states
* clarified in comment what each test cases are testing, since
  some of the test case names are not very straightforward
* any wait for DISCONNECTED checkes with ConnectivityManager are
  temporarily commented out

Change-Id: I99cca95c33c6060909e0df684969b75c2dca23a9
 2014-08-20 17:15:35 -07:00
Svetoslav
49cbfcc10c Merge "Using default system icon for print spooler" into lmp-dev 2014-08-21 00:11:43 +00:00
Guang Zhu
e02f340d9a Merge "follow up minor fixes for connectivity manager test" into lmp-dev 2014-08-21 00:11:43 +00:00
Guang Zhu
4afd179a9a follow up minor fixes for connectivity manager test 
Change-Id: I8f0606890b21d67130efb3bc02c6825823060139
 2014-08-20 17:40:18 -07: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
Amit Mahajan
284f1ec16e Adding APIs to get IMEI/MEID 
Change-Id: I553b7c019b20a64ff1049f35b0e3999ab82b7cce
 2014-08-20 17:02:17 -07: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