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

62345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Santoro
c5b057f423 am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1 
* commit '60e345a9a95a0f24804f729eeb5216012d1bcbac':
  Unhide social stream permissions.
 2011-11-17 15:12:52 -08:00
Michael Kolb
778f146cf4 am 5397bb52: am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1 
* commit '5397bb52fba04e8dc8496d731611210213847308':
  Draw input field focus ring in WebTextView
 2011-11-17 15:12:49 -08:00
Jeff Sharkey
f0c22dc4a0 am 7892cbff: am 8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1 
* commit '7892cbffbeffb6e73f4c88e9965064b3985971c2':
  Only write network stats when already loaded.
 2011-11-17 15:12:45 -08:00
Alex Sakhartchouk
94b064e112 Merge "adding benchmark single test" 2011-11-17 14:52:23 -08:00
Alex Sakhartchouk
37333001cb adding benchmark single test 
Change-Id: I902579085bfee2f0bdc0bf4f38442f2f1569bf71
 2011-11-17 14:08:47 -08:00
Glenn Kasten
aba3d10f37 Merge "Bug 5522189 re-enable ARM opts but disable inline" 2011-11-17 14:08:31 -08:00
Glenn Kasten
cd498c3f2d Bug 5522189 re-enable ARM opts but disable inline 
PIE did not work together with inlining.  This change combines (almost
all of) the performance benefits of ARM optimizations together with PIE.

Change-Id: I4594d33ae5a0a7bac327ae08e30fb35343a06256
 2011-11-17 13:27:22 -08:00
Amith Yamasani
16991b1438 am 664bb774: am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1 
* commit '664bb774f528fead63d7c0e62b533da66390b246':
  Don't upgrade some settings from GB to ICS.
 2011-11-17 13:20:22 -08:00
Fred Chung
66f5cf4d29 am a8f7b7c4: am 3a7e2c0b: Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1 
* commit 'a8f7b7c4794d62df4b3cec67dee1a9887afb53a4':
  Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e.
 2011-11-17 13:20:19 -08:00
Andreas Huber
aa25761114 am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 
* commit '624efe45671131903fb5165f6133ba39486092ab':
  Make sure not to cancel pending seek/EOS notifications on a cache underrun...
 2011-11-17 13:20:16 -08:00
John Reck
a93a7d6d15 am 0551287f: am 775e986e: Merge "Fix add single character check" into ics-mr1 
* commit '0551287f6ed06511feae2a6b3700a9bca4cfc3cd':
  Fix add single character check
 2011-11-17 13:20:15 -08:00
John Reck
6810017f6a am 2c6afef8: am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1 
* commit '2c6afef8766371bf933f8675c80687802ce045e0':
  Undeprecate LayoutAlgorithm
 2011-11-17 13:20:12 -08:00
Dave Santoro
60e345a9a9 am 9be49620: Merge "Unhide social stream permissions." into ics-mr1 
* commit '9be4962060ca67c4fe9bfc391043f6d2829cf720':
  Unhide social stream permissions.
 2011-11-17 12:27:44 -08:00
Dave Santoro
9be4962060 Merge "Unhide social stream permissions." into ics-mr1 2011-11-17 12:26:17 -08:00
Michael Kolb
5397bb52fb am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1 
* commit '852585c034d383ea6afe1b484afa57cbf4d04f95':
  Draw input field focus ring in WebTextView
 2011-11-17 12:25:06 -08:00
Michael Kolb
852585c034 Merge "Draw input field focus ring in WebTextView" into ics-mr1 2011-11-17 12:22:58 -08:00
Jeff Sharkey
7892cbffbe am 8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1 
* commit '8ac35e30b29f3a3e81ed722621bf7f1de708455f':
  Only write network stats when already loaded.
 2011-11-17 12:11:47 -08:00
Jeff Sharkey
8ac35e30b2 Merge "Only write network stats when already loaded." into ics-mr1 2011-11-17 12:10:02 -08:00
Jeff Sharkey
c506ff6150 Only write network stats when already loaded. 
Bug: 5584564
Change-Id: Ife2a68804bf3691e9bccdc167807204bce8a85b2
 2011-11-17 12:05:46 -08:00
Ben Murdoch
131ed03f30 am e6269f79: am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1 
* commit 'e6269f7988a2ec0d1f9ea37d92d6b0ca2f3dc3b8':
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
 2011-11-17 11:46:30 -08:00
Jeff Sharkey
ee737d9e44 am 66b570c7: am b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1 
* commit '66b570c70471976cd2a99825898c778a7850f2c8':
  Update NTP outside locks, log large trim events.
 2011-11-17 11:46:26 -08:00
Daniel Sandler
470dfcd030 am a092482c: am 293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1 
* commit 'a092482c17830b985798d5da9c1d1951735bacf3':
  Activate Dreams (screen saver) when desk-docked.
 2011-11-17 11:46:23 -08:00
Daniel Sandler
f27e94ce9d am 7fd3ba91: am d5decdcc: Merge "Disable desk dock apps." into ics-mr1 
* commit '7fd3ba9149affe68f8e21c88d3eceb4514cf2f6f':
  Disable desk dock apps.
 2011-11-17 11:46:21 -08:00
Mathias Agopian
ce51c10fc1 am 2030d78d: am 8fc3540f: Merge "be a bit more defensive when parsing extension strings" into ics-mr1 
* commit '2030d78dc9c20d2f561f4b11f1a1adddb63661c6':
  be a bit more defensive when parsing extension strings
 2011-11-17 11:46:20 -08:00
Nicolas Roard
0ecd89bce3 am e788fa84: am e88ca718: Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1 
* commit 'e788fa84f1fac845e50922fc536694ce1cc2fbdb':
  Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition.
 2011-11-17 11:46:09 -08:00
Michael Kolb
edb39ce5b4 Draw input field focus ring in WebTextView 
Bug: 5628053

Change-Id: I1a3d5402e7925e71877be2c278e95f25e75746f3
 2011-11-17 11:08:59 -08:00
Jack Palevich
22da9a8beb Merge "Fix potential GLThread / GLSurfaceView memory leak." 2011-11-17 11:05:30 -08:00
Dave Santoro
098d466a25 Unhide social stream permissions. 
Bug 5569021

Change-Id: I35ee70418be0e0286294fef54e194831b5fa3b2c
 2011-11-17 11:02:03 -08:00
Jesse Wilson
9ab5fa0aaa Merge "Add a link from LruCache to the Android support package (compatibility library)." 2011-11-17 10:42:48 -08:00
Jesse Wilson
02db1b6c00 Add a link from LruCache to the Android support package (compatibility library). 
Change-Id: Ibd16410856cd8a0a991b4a403fedd9ac4e1ecaad
 2011-11-17 13:40:01 -05:00
Alex Sakhartchouk
54b851c9b5 Merge "DO NOT MERGE" 2011-11-17 10:12:13 -08:00
Amith Yamasani
664bb774f5 am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1 
* commit 'aefc0ed9677233d5e8c991196f970222b4899dc3':
  Don't upgrade some settings from GB to ICS.
 2011-11-17 10:02:16 -08:00
Amith Yamasani
aefc0ed967 Merge "Don't upgrade some settings from GB to ICS." into ics-mr1 2011-11-17 10:01:00 -08:00
Fred Chung
a8f7b7c479 am 3a7e2c0b: Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1 
* commit '3a7e2c0ba89b40b61d2322955ab895020a70592c':
  Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e.
 2011-11-17 09:39:28 -08:00
Fred Chung
3a7e2c0ba8 Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1 2011-11-17 09:37:15 -08:00
Alex Sakhartchouk
5044556861 Merge "Fixing FBO font rendering bug that resulted from using old surface size." 2011-11-17 09:13:24 -08:00
Andreas Huber
624efe4567 am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 
* commit 'c1b1709b2faa985fb9c2b273ca2191b5bfba5fdd':
  Make sure not to cancel pending seek/EOS notifications on a cache underrun...
 2011-11-17 09:07:36 -08:00
Andreas Huber
c1b1709b2f Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 2011-11-17 09:05:17 -08:00
John Reck
0551287f6e am 775e986e: Merge "Fix add single character check" into ics-mr1 
* commit '775e986ece16b90d3260fe8c7f8e18fc3d0cf492':
  Fix add single character check
 2011-11-17 08:49:50 -08:00
John Reck
2c6afef876 am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1 
* commit '1da3d656358ab577f285d06e9db249dfb21cb8e3':
  Undeprecate LayoutAlgorithm
 2011-11-17 08:49:49 -08:00
John Reck
775e986ece Merge "Fix add single character check" into ics-mr1 2011-11-17 08:48:04 -08:00
John Reck
1da3d65635 Merge "Undeprecate LayoutAlgorithm" into ics-mr1 2011-11-17 08:47:29 -08:00
Matthew Xie
1bce803f66 am 37fb92fb: am 302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 
* commit '37fb92fb634d10ca94731a73f2a60d86135baa6a':
  Call notifyIncomingA2dpConnection with correct rejected status
 2011-11-17 07:48:29 -08:00
Mathias Agopian
280271d1f2 am f14ce7db: am 1125f89e: Merge "remove hack that hardcoded the refresh rate" into ics-mr1 
* commit 'f14ce7db5dc327724984946e7754c777908cc2ad':
  remove hack that hardcoded the refresh rate
 2011-11-17 07:48:27 -08:00
Mangesh Ghiware
163994c1d4 am 55116350: am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 
* commit '5511635090072ce02a4fb07ec25a7c279a7bbc8a':
  Revert change to setInitialScale() to take display density into account.
 2011-11-17 07:48:24 -08:00
satok
8bc972a5a4 am 9e502e90: am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1 
* commit '9e502e90b58b4d0bbb792ef1c40dcfd9b9322ce8':
  Clean up the spell checker framework
 2011-11-17 07:48:17 -08:00
Daniel Sandler
28b23cdef4 am 8b9ba6fa: am f52a4482: Merge "Add a default Dreams component." into ics-mr1 
* commit '8b9ba6fa8806c401c89df88f0a1690fbfd1ebb89':
  Add a default Dreams component.
 2011-11-17 07:48:15 -08:00
Daniel Sandler
0505984abb am e11bcd1d: am 5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1 
* commit 'e11bcd1d72cb45af984b9d457c4306f51923e853':
  Remove day of week from phone notification panel.
 2011-11-17 07:48:12 -08:00
Mathias Agopian
905a12a949 am abdade71: am 69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1 
* commit 'abdade71bc17153696fe2abe281c5a3b0c2e5abe':
  Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
 2011-11-17 07:48:10 -08:00
Marco Nelissen
5a1623b379 am 3de68918: am e937da83: Merge "Change MediaController look b/5584613" into ics-mr1 
* commit '3de689186531cebfabcb4b4d4163eae6baac528d':
  Change MediaController look b/5584613
 2011-11-17 07:48:01 -08:00