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

64380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
420894c938 am 94fac16a: am da296533: Reconcile with ics-mr1-release 
* commit '94fac16acc062a7c4c889ca23ebcc7b4e8fecb4c':
 2011-12-13 05:48:36 -08:00
Ashish Sharma
1ca3470e27 am 31c5158c: Merge "Add a command option to display installerPackageName" 
* commit '31c5158c5aeb2964182f29a4ced947f5603e839e':
  Add a command option to display installerPackageName
 2011-12-13 05:48:24 -08:00
Romain Guy
8c464b79bf am 5009f65c: Merge "Optimize state changes" 
* commit '5009f65c9a676b64869e638e08ec0294e20d7e6e':
  Optimize state changes
 2011-12-13 05:48:15 -08:00
Jeff Sharkey
fa2416023f am 4dbfa44a: am f0213bf1: am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1 
* commit '4dbfa44a2164724914b451ab1d6d0af8c0e9d1be':
  Avoid NPE when missing network stats.
 2011-12-13 05:48:12 -08:00
Mike Cleron
05bb6d9b9e am 12d4b3cb: am 3f69fad9: (-s ours) am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 
* commit '12d4b3cb96dd7ceb9e2f742898fc6bcc263a8011':
  Update VIBRATE_ON to a supported value when upgrading from GB.
 2011-12-13 05:48:08 -08:00
Romain Guy
23d0deeb2b am da7642b3: Merge "Minimize the amount of data uploaded to draw text" 
* commit 'da7642b31bb3490655016df979b0fad95425ac5f':
  Minimize the amount of data uploaded to draw text
 2011-12-13 05:48:03 -08:00
Romain Guy
a72a3f077a am 51fbb009: Merge "Various OpenGL optimizations" 
* commit '51fbb009661e8eeb41730fe107179425e5392b6d':
  Various OpenGL optimizations
 2011-12-13 05:48:01 -08:00
Katherine Kuan
2820e17f5c am 9751190b: Merge "Add logging to country detector logic" 
* commit '9751190b85a0e74c1f3bb99d23067149a0de88da':
  Add logging to country detector logic
 2011-12-13 05:47:57 -08:00
Dianne Hackborn
05e80d03db am acd5f963: am 0ae6e171: am 359bb3b4: Final API 15. 
* commit 'acd5f963b91f481ac0ec05c4b1517cd86eb37fe7':
  Final API 15.
 2011-12-13 05:47:52 -08:00
Dianne Hackborn
a50e705b0f am df3c49ee: am 2ad8a89b: am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 
* commit 'df3c49ee2e00f85599348473951a208be9397829':
  SDK only: now that support lib is in SDK, we can link to it.
 2011-12-13 05:47:50 -08:00
Gilles Debunne
f8c409769e am ba364285: am 8e22ec9b: am a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1 
* commit 'ba3642850295ac3bdf57cb1ce9a26ec430c2b4c3':
  Prevent a memory leak in TextLine.
 2011-12-13 05:47:45 -08:00
Gilles Debunne
51e418715b am a4b1b8ab: am 7ffadba5: am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1 
* commit 'a4b1b8ab3c240efe82d1018a54277f16dc03a8fa':
  Text blinking cursor hard to see.
 2011-12-13 05:47:43 -08:00
Adam Powell
6309759cf4 am f8c2abca: am bffe0be3: am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 
* commit 'f8c2abcadd5d7fbac64f84e6b31ec45102bcf3dd':
  Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
 2011-12-13 05:47:41 -08:00
The Android Open Source Project
94fac16acc am da296533: Reconcile with ics-mr1-release 
* commit 'da29653305f299d6390492333a6360cfa78665d9':
 2011-12-13 05:40:57 -08:00
The Android Open Source Project
da29653305 Reconcile with ics-mr1-release 
Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8
 2011-12-13 05:11:43 -08:00
Ashish Sharma
31c5158c5a Merge "Add a command option to display installerPackageName" 2011-12-13 00:31:53 -08:00
The Android Automerger
6c9b675886 merge in ics-mr1-release history after reset to ics-mr1 2011-12-12 22:08:59 -08:00
Romain Guy
5009f65c9a Merge "Optimize state changes" 2011-12-12 20:36:22 -08:00
Romain Guy
f3a910b423 Optimize state changes 
Change-Id: Iae59bc8dfd6427d0967472462cc1994987092827
 2011-12-12 20:35:21 -08:00
Jeff Sharkey
4dbfa44a21 am f0213bf1: am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1 
* commit 'f0213bf1833e49744b29be97e44c3e9eaad9449d':
  Avoid NPE when missing network stats.
 2011-12-12 20:23:47 -08:00
Jeff Sharkey
f0213bf183 am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1 
* commit 'f0bbc494d638f4c77e688bf9410027f453301559':
  Avoid NPE when missing network stats.
 2011-12-12 20:21:34 -08:00
Jeff Sharkey
f0bbc494d6 Merge "Avoid NPE when missing network stats." into ics-mr1 2011-12-12 20:19:27 -08:00
Mike Cleron
12d4b3cb96 am 3f69fad9: (-s ours) am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 
* commit '3f69fad9e958f867ceaab9c370b97959e3337c50':
  Update VIBRATE_ON to a supported value when upgrading from GB.
 2011-12-12 19:27:36 -08:00
Romain Guy
da7642b31b Merge "Minimize the amount of data uploaded to draw text" 2011-12-12 19:04:40 -08:00
Romain Guy
51fbb00966 Merge "Various OpenGL optimizations" 2011-12-12 19:04:32 -08:00
Romain Guy
d71dd367af Minimize the amount of data uploaded to draw text 
Change-Id: I6313ac039291c9cd93aadafe3566ad9d60cab42d
 2011-12-12 19:03:35 -08:00
Jeff Sharkey
d04ff11d6f Avoid NPE when missing network stats. 
Bug: 5750339
Change-Id: I4b739dbd076b270a5a2b2e2a1e0f6e445d8c124e
 2011-12-12 18:51:26 -08:00
Mike Cleron
3f69fad9e9 am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 
* commit '840201d6e2d7d53e42a31ffeb2ef454982882d12':
  Update VIBRATE_ON to a supported value when upgrading from GB.
 2011-12-12 18:17:46 -08:00
Mike Cleron
840201d6e2 Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 2011-12-12 18:15:59 -08:00
Romain Guy
39d252a663 Various OpenGL optimizations 
Change-Id: Ib0742c96f10f5f50e7e5148b742c31b6c232d127
 2011-12-12 18:14:06 -08:00
Katherine Kuan
9751190b85 Merge "Add logging to country detector logic" 2011-12-12 18:12:37 -08:00
Katherine Kuan
da123492de Add logging to country detector logic 
This is for debugging purposes to verify the effects of
change Id45abeba1b1e843053ac2c946861b439ca568de4.

Bug: 5670680
Change-Id: Ia065dec6ba651e7e77205f812b7606b15eebdc17
 2011-12-12 18:07:58 -08:00
Dianne Hackborn
acd5f963b9 am 0ae6e171: am 359bb3b4: Final API 15. 
* commit '0ae6e1719b1fc0aee6e5cf690a7005e975d96df9':
  Final API 15.
 2011-12-12 18:01:26 -08:00
Dianne Hackborn
df3c49ee2e am 2ad8a89b: am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 
* commit '2ad8a89b4b55f1cf8994e5b044d496d889839403':
  SDK only: now that support lib is in SDK, we can link to it.
 2011-12-12 18:01:22 -08:00
Gilles Debunne
ba36428502 am 8e22ec9b: am a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1 
* commit '8e22ec9bc6c59d9e54a6b48f1133881be97af1a7':
  Prevent a memory leak in TextLine.
 2011-12-12 17:49:31 -08:00
Gilles Debunne
a4b1b8ab3c am 7ffadba5: am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1 
* commit '7ffadba5dfbeeaa93a9559ca3eaf1a7719426a5f':
  Text blinking cursor hard to see.
 2011-12-12 17:49:29 -08:00
Adam Powell
f8c2abcadd am bffe0be3: am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 
* commit 'bffe0be3af2bd19a392e7d332cbfda9a60b8e057':
  Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
 2011-12-12 17:49:21 -08:00
Dianne Hackborn
0ae6e1719b am 359bb3b4: Final API 15. 
* commit '359bb3b432b21590c12588c3ca3880ac17aadc96':
  Final API 15.
 2011-12-12 17:04:04 -08:00
Irfan Sheriff
311b0f57ce am 36838993: Merge "Fix configured network status" 
* commit '36838993dfb67a2056468ab74a77a81afa053c9c':
  Fix configured network status
 2011-12-12 16:57:53 -08:00
Irfan Sheriff
36838993df Merge "Fix configured network status" 2011-12-12 16:55:49 -08:00
Romain Guy
dcd03fcca3 am d2ea737a: Merge "Remove leftover debugging code" 
* commit 'd2ea737a1f28b43ce2e01686d64a5cf8243daa49':
  Remove leftover debugging code
 2011-12-12 16:53:45 -08:00
Romain Guy
b23e7499e3 am ebb2c6b3: Merge "Keep shaders to render properly" 
* commit 'ebb2c6b36da049b32c1dba6f14f16660d860eb09':
  Keep shaders to render properly
 2011-12-12 16:51:41 -08:00
Romain Guy
d2ea737a1f Merge "Remove leftover debugging code" 2011-12-12 16:50:55 -08:00
Romain Guy
f44e66fcf7 Remove leftover debugging code 
Change-Id: I1589af7991da36744071d5081daa24ebae5b4dfd
 2011-12-12 16:50:13 -08:00
Romain Guy
ebb2c6b36d Merge "Keep shaders to render properly" 2011-12-12 16:49:40 -08:00
Romain Guy
3e263fac8c Keep shaders to render properly 
I don't know who's to blame, SGX or Tegra2 but one of those two GPUs is not
following the OpenGL ES 2.0 spec.

Change-Id: I2624e0efbc9c57d571c55c8b440a5e43f08a54f2
 2011-12-12 16:47:48 -08:00
Irfan Sheriff
cdc077c9dd Fix configured network status 
For a connected network, keep status as CURRENT. For a network,
that is disconnected it should be ENABLED. A disabled network
will have the status as DISABLED

Also, add a unit test to ensure there is only one CURRENT network
that is connected

Change-Id: Iaa4a7124a0c372a8f6df3d846ae8c15d9b29cf13
 2011-12-12 16:47:02 -08:00
Dianne Hackborn
359bb3b432 Final API 15. 
Change-Id: Ic356a7b4d56237e928e653c68e87b070e923d145
 2011-12-12 16:26:38 -08:00
Amith Yamasani
3066afdc6f Update VIBRATE_ON to a supported value when upgrading from GB. 
Bug: 5738552

If value has ringer set to VIBRATE_OFF, we need to update it to the
now default, as VIBRATE_OFF is inconsistent with the new UI controls.

Make sure notification vibrate setting follows ringer vibrate setting.
Change-Id: I6638c8a8729d850e71db10d27a0b50d24dc11f19
 2011-12-12 16:24:13 -08:00
Gilles Debunne
1db98136b0 am c1761e7f: Fixed build after merge 
* commit 'c1761e7fe10390d90b805f373b51ecaabf214dac':
  Fixed build after merge
 2011-12-12 16:16:05 -08:00