54271 Commits

Author SHA1 Message Date
Wink Saville
848aa3ab8a Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE 2011-07-07 14:39:23 -07:00
Adam Powell
eea5be5447 Merge "Action bar layout tweaks" 2011-07-07 14:35:22 -07:00
Jim Miller
cb925e7a56 Merge "Fix 4689527: Fix rendering issue with thumbnails on phones" 2011-07-07 14:35:18 -07:00
Joe Fernandez
1574bb7e20 Merge "docs: OpenGL Tutorials" 2011-07-07 14:31:02 -07:00
Philip Milne
6d836b606b Merge "Simplify and tidy the API for maximum value support." 2011-07-07 14:30:31 -07:00
Jim Miller
28637bacfd Fix 4689527: Fix rendering issue with thumbnails on phones
This fixes a bug where the phone thumbnail scale was being miscalculated
for the square aspect of thumbnails on phones.  The code now constrains
thumbnails to fit the smaller of screen width and screen height.

Change-Id: I174abacd4cf3dcf124e10fe8980fb01fe299ec6a
2011-07-07 14:26:32 -07:00
Philip Milne
5d1a9840aa Simplify and tidy the API for maximum value support.
Also:

. Remove CAN_SHRINK, FIXED from public view. These can be added later.

Change-Id: I63a64ac4748605da60373c8e3c2109178b5260c2
2011-07-07 14:23:00 -07:00
Wink Saville
8735a07a64 No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
Update comment that values should be changed after releasing.

Change-Id: I10ed6a0238e4f5be866dd97cfb56c5e7c84ddb52
2011-07-07 14:16:30 -07:00
Adam Powell
160bb7fa60 Action bar layout tweaks
Fix a Spinner issue that reported odd baselines

Fix detection of expandable items for action menus and allocation of cells

Use the right asset for home-as-up in Theme.Holo.Light.SolidActionBar.Inverse

Add TextAppearance.Holo.Widget.ActionBar.Menu as a basis for further
menu item styling

Sync with design for tab/menu text appearance

Change-Id: I32026bbde1cd4e15b6cda30d78d3d48250c84c94
2011-07-07 14:14:38 -07:00
Romain Guy
b1b375ee08 Merge "Add an API to query maximum bitmap/texture size on Canvas." 2011-07-07 14:10:52 -07:00
Romain Guy
f61970fc79 Add an API to query maximum bitmap/texture size on Canvas.
Change-Id: I2c576c9a4ecad9f33cc6636bcbc29786acdf052d
2011-07-07 14:10:06 -07:00
Jim Miller
a7987101d5 Merge "Fix 4689527: Update Recents" 2011-07-07 13:58:13 -07:00
Daniel Lehmann
fb7a1446c0 Merge "Contacts contract changes for social updates." 2011-07-07 13:35:00 -07:00
James Dong
484738f31c Merge "Add support for some custom YUV420 color formats to recordvideo utility" 2011-07-07 13:34:58 -07:00
Matthew Xie
a0c680393f Incoming Bluetooth Connection requests - dialog.
This sends the intents to the Settings app to show
the dialogs for the incoming connection requests.
Includes down merged contributions from Jaikumar Ganesh.

Change-Id: Ic8b857aad3554315aae39a0e871eb94d0ac98a91
2011-07-07 12:43:27 -07:00
Eric Fischer
b75a798471 Merge "Import revised translations." 2011-07-07 11:33:38 -07:00
Eric Fischer
ff2612bc9d Import revised translations.
Change-Id: Iad20de7deafae6bfec4c37f23a1fcea35aae5a46
2011-07-07 11:27:19 -07:00
Scott Main
b623842e28 am 33f6d634: am e4e1c3fd: am 40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
* commit '33f6d6347b88d239b16a6b3f28adcb7bf4a61881':
  cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
2011-07-07 11:23:25 -07:00
Scott Main
bba7c0a5dd am 9638fbcf: am 0657e1a7: am 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '9638fbcfd2c4449075ead8545a759a4d4dd03a28':
  cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
2011-07-07 11:23:22 -07:00
Wink Saville
12f20ca200 am 19065008: am 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
* commit '19065008b820ea95530d49cf1894f7481929f8e6':
  Reset FAILED ApnContext state to IDLE on data setup triggers
2011-07-07 11:22:34 -07:00
Robert Ly
50e894c800 am 6c9d636f: am 027654e9: am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
* commit '6c9d636f40477ef3ac44a6e30ac645d708d89002':
  cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
2011-07-07 11:22:31 -07:00
Kazuhiro Ondo
5fa49298bf am 6716ac53: am c8e2916d: Bring back ERI into CDMA-LTE mode
* commit '6716ac5342de7e83e5ba47f28aac40a46d1363ac':
  Bring back ERI into CDMA-LTE mode
2011-07-07 11:22:10 -07:00
Wink Saville
8bddafa357 am 5eeeea29: am 97667d0c: Merge "Allow vril-dump to work on user builds" into honeycomb-LTE
* commit '5eeeea29ecd731897211d31bde7ee87af182420c':
  Allow vril-dump to work on user builds
2011-07-07 11:05:51 -07:00
Huahui Wu
b083fa61d9 Merge "b/3302378 Passes touch pressures, size and timestamps to webkit." 2011-07-07 11:05:13 -07:00
Huahui Wu
6e64e0c617 b/3302378 Passes touch pressures, size and timestamps to webkit.
Related CL in WebKit:
  https://android-git.corp.google.com/g/#change,118422

Change-Id: Ibf209131a6d9ca8186c461b0c5b6286e5f669d0d
2011-07-07 10:59:27 -07:00
James Dong
43e8a83521 Add support for some custom YUV420 color formats to recordvideo utility
Change-Id: I2f0dfba466efb94b704dca761162d7c7457a43cf
2011-07-07 10:30:31 -07:00
Jeff Sharkey
2ad3111759 Merge "Temporarily disable socket tagging." 2011-07-07 10:23:44 -07:00
Jeff Sharkey
d0d2517d52 Temporarily disable socket tagging.
Change-Id: Ib4a8babdbbe3ea05057dc930b67c2cac89ac5e42
2011-07-07 10:22:04 -07:00
Scott Main
33f6d6347b am e4e1c3fd: am 40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
* commit 'e4e1c3fda937d30c9aa75a43c470de6c54a97073':
  cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
2011-07-07 10:17:00 -07:00
Scott Main
9638fbcfd2 am 0657e1a7: am 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '0657e1a7e7d25fee700930252f6b85c3d70bc368':
  cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
2011-07-07 10:14:38 -07:00
Scott Main
e4e1c3fda9 am 40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
* commit '40afb97c3289cd3daae9a31f4829d660ba747d37':
  cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
2011-07-07 10:13:44 -07:00
Scott Main
0657e1a7e7 am 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '77dfe2173e2970a6a662b7d9537715c81886185e':
  cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
2011-07-07 10:10:29 -07:00
Scott Main
40afb97c32 cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896
docs: add button builder for android market apps

Change-Id: I0d9da685f850f92737c2d9d3eb758b41dbec0a39
2011-07-07 10:08:15 -07:00
Scott Main
77dfe2173e cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb
docs: update dashboards

Change-Id: Ib37f2b8a3bf8c9c7ae09ea2edbeeb707899abf58
2011-07-07 09:58:33 -07:00
Robert Ly
18077843fb am f870327d: am bc45fcbb: am 205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
* commit 'f870327d5dc8a914d0fc55f454b6378f3e504d79':
  cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
2011-07-07 09:54:18 -07:00
Jean-Baptiste Queru
d5299ff39a Merge 37dbfcaf
Change-Id: Iae55ecada8dc231c88bb87b32e8bd5e7b6a47bd0
2011-07-07 08:46:09 -07:00
Adrian Ludwig
1a65b441b1 Merge "Android security code review." 2011-07-07 08:08:13 -07:00
Mathew Inwood
bdaa1aafd5 SearchBox API to determine if it's supported by the current page.
Change-Id: I0119243ed0e19e237c1f51de887af5c954f96693
2011-07-07 12:56:39 +01:00
Adam Powell
2c742c2aeb Fix bug 5000009 - NPE in Phone UI
Change-Id: I9c5c2c73b340192d754949865b6e4ee4a9a324ff
2011-07-06 23:18:25 -07:00
Adam Powell
a72ef62e5c Add style/theme definitions for solid action bar configurations.
Change-Id: I540e12ad3d8fc779dac24402286d995f542b5d25
2011-07-06 22:58:50 -07:00
Irfan Sheriff
6d815e9dd0 Merge "Moved WifiWatchdogService and DnsPinger" 2011-07-06 22:08:38 -07:00
Wink Saville
19065008b8 am 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
* commit '48b6d5afae76bec08c5e1194758e6db3e0f8b07c':
  Reset FAILED ApnContext state to IDLE on data setup triggers
2011-07-06 19:05:40 -07:00
Wink Saville
48b6d5afae Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE 2011-07-06 19:04:30 -07:00
Kazuhiro Ondo
378a4380f2 Reset FAILED ApnContext state to IDLE on data setup triggers
Make sure FAILED ApnContext state is reset to IDLE regarless of
existence of the reconnect alarm. This is to let FW re-evaluate
call setup conditions properly on data setup triggers.

Bug: 4989604
Change-Id: Ia9ec439db1df03bbd2e56803d3558542ba5f5400
2011-07-06 18:45:06 -07:00
Robert Ly
6c9d636f40 am 027654e9: am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
* commit '027654e90da14275fbf076e739e16f89c4fcae2c':
  cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
2011-07-06 18:19:26 -07:00
Robert Ly
027654e90d am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
* commit 'ad2724de956955b0ddf95491f6cb378f54dafde5':
  cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
2011-07-06 18:17:53 -07:00
Elliott Hughes
ed61ee1fae Merge "Add the "debug.jni.logging" property so third-party developers can debug their JNI problems." 2011-07-06 18:11:20 -07:00
Kazuhiro Ondo
6716ac5342 am c8e2916d: Bring back ERI into CDMA-LTE mode
* commit 'c8e2916d0bdbbda5fb6faf61d6f24100641d19f5':
  Bring back ERI into CDMA-LTE mode
2011-07-06 18:04:30 -07:00
Mike Lockwood
269318760f Merge "UsbDeviceManager: Initialize RNDIS ethernet address based on device serial number" 2011-07-06 17:54:08 -07:00
Robert Ly
ad2724de95 cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
Change-Id: I763f02a523c7467e7c0241197e8f2652ed7d4f9c
2011-07-06 17:47:47 -07:00