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

80377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
ab70020137 Merge "Fix caret handle offset" 2012-06-12 08:32:35 -07:00
Jean-Baptiste Queru
275784f26c am 01cb25fd: resolved conflicts for merge of 29bea61c to jb-dev-plus-aosp 
* commit '01cb25fddeb03d72585ae13a8a1f1721f4bcef8c':
  Added support for customization of mobile data setting.
 2012-06-12 08:28:55 -07:00
Jean-Baptiste Queru
01cb25fdde resolved conflicts for merge of 29bea61c to jb-dev-plus-aosp 
Change-Id: If582e1fa99691b4e4182c3a9b148fcef5cad251e
 2012-06-12 08:13:10 -07:00
Jean-Baptiste Queru
29bea61cac am f01f6b6d: Merge "Added support for customization of mobile data setting." 
* commit 'f01f6b6d379c911a2c1e350bc758cea26bfe6d9d':
  Added support for customization of mobile data setting.
 2012-06-12 08:04:53 -07:00
Jean-Baptiste Queru
f01f6b6d37 Merge "Added support for customization of mobile data setting." 2012-06-12 07:48:53 -07:00
Adam Powell
f958732bd3 Merge "Fix docs" into jb-dev 2012-06-11 20:15:32 -07:00
Adam Powell
71c69897ad Fix docs 
Change-Id: If0215c02abf419d14f28574b751c9dfc2f27bcbe
 2012-06-11 20:12:56 -07:00
Jeff Brown
ea6b818832 Merge "Improve ANR diagnostics." into jb-dev 2012-06-11 20:01:28 -07:00
Adam Powell
ae20ae1a8a More MediaRouter features. 
Add RemoteControlClient to user routes. This will allow the UI layered
on top to access info about the remote volume channel associated with
a user route.

Add icons for user routes and route groups.

Change-Id: I438aa60fc8c93f878ec7638897225738155f0746
 2012-06-11 19:28:48 -07:00
Dianne Hackborn
9d0908919a Fix issue #6634325: View.setKeepScreenOn and... 
...MediaPlayer.setScreenOnWhilePlaying seem broken

We need to correctly clear the keep screen on flag when the view
hierarchy request is gone...  and to do that, we need to keep the
actual state of the flag requested by the app.  Also when the app
changes its state, we need to compute the proper value based on
both the app request and any requests in the view hierarchy.

Bug: 6634325
Change-Id: I060e9a34a10faffbaa77c06098cf21298bb4969f
 2012-06-11 18:35:41 -07:00
Jeff Brown
265f1ccc51 Improve ANR diagnostics. 
When an ANR occurs, log the associated reason.

When an event takes too long to process (currently more than 2 seconds)
log basic information about the event including how long it actually
took.

Dump the contents of the inbound, outbound and wait queues as part
of dumpsys input.

Bug: 6574842
Change-Id: I9ab754c320f609cb86fe266c469a61e7032dfed6
 2012-06-11 18:05:31 -07:00
Geremy Condra
3a4832aa64 am 6e668238: (-s ours) am e1b573a3: (-s ours) am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file origin policy." 
* commit '6e66823873915bfd6e6c7b9b5c92e1e7e010977f':
  DO NOT MERGE Add API for file origin policy.
 2012-06-11 17:52:11 -07:00
Geremy Condra
6e66823873 am e1b573a3: (-s ours) am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file origin policy." 
* commit 'e1b573a32b3c381dd2d0fd90f3d1cce7d5719ca9':
  DO NOT MERGE Add API for file origin policy.
 2012-06-11 17:47:16 -07:00
Gilles Debunne
2fba3387c3 Prevent a crash when maxLines is set to 0 
Bug 6642222

Using setMaxLines(0) and setMinHeight(30) causes a crash
because Layout#getLineRangeForDraw() returns a [0,0] interval
in that case.

Accessing the Direction in draw causes a NPE.

Change-Id: If50f9b554e3cdc598a721b623992e9196982838c
 2012-06-11 17:46:26 -07:00
Geremy Condra
e1b573a32b am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file origin policy." 
* commit 'b4151b296fbeb39a367bb9930d605180d683ca11':
  DO NOT MERGE Add API for file origin policy.
 2012-06-11 17:43:10 -07:00
Romain Guy
68cefd2018 Merge "Textured text calls could be invisible Bug #6597730" into jb-dev 2012-06-11 17:31:44 -07:00
Craig Mautner
78a9b67691 Merge "Remove over aggressive optimization." into jb-dev 2012-06-11 17:12:03 -07:00
Craig Mautner
16a61a51ff Merge "Revert "Merge errors."" into jb-dev 2012-06-11 17:11:47 -07:00
Craig Mautner
73220fa083 Merge "Merge errors." into jb-dev 2012-06-11 17:11:33 -07:00
Eric Laurent
4ab22bb7d0 Made IAudioService.setBluetoothA2dpOn() not oneway 
IAudioService.setBluetoothA2dpOn() should not be one way as
IAudioService.isBluetoothA2dpOn() will return inconsistent results
if called just after.

Bug 6572651.

Change-Id: Ib03ae49e6c0041b1b37dcac9e198cd93a4794030
 2012-06-11 17:10:02 -07:00
Geremy Condra
b4151b296f Merge "DO NOT MERGE Add API for file origin policy." 2012-06-11 16:53:43 -07:00
Dianne Hackborn
0ed6f9a01f am 3430959c: am 569f5bdd: am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread" 
* commit '3430959c4dce7ff5e4a8bac2f9e1c3f3a8307079':
  SystemServer: Looper's getMainLooper to return ServerThread
 2012-06-11 16:41:24 -07:00
Dianne Hackborn
fdfe58126d am acfb11b7: am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)" 
* commit 'acfb11b7c49cd0c3e653700f414c014fccc5aec3':
  Improved documentation (clarify on issue 8727)
 2012-06-11 16:41:19 -07:00
Wink Saville
702182d340 am e0f8b91e: am 4853f944: am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees" 
* commit 'e0f8b91e049b51770329c43e38aa88ccbb957104':
  Adds utility method to convert 0.25 secs to decimal degrees
 2012-06-11 16:41:16 -07:00
Dianne Hackborn
23a947664f am 82b131f2: am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 
* commit '82b131f27418ecdd60d52638a72d01d4ad2b109f':
  ApplicationThread: Check interface before invoking scheduleLowMemory
 2012-06-11 16:41:13 -07:00
Wink Saville
f8030e419c am f75e3e01: am c07055c4: am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods" 
* commit 'f75e3e01f6e574a411fa936e070a7a9f2f606da7':
  Adds documentation to CdmaCellLocation get lat/long methods
 2012-06-11 16:41:10 -07:00
Dianne Hackborn
3430959c4d am 569f5bdd: am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread" 
* commit '569f5bddd2494bdeae07a6b278f6df6cc8579981':
  SystemServer: Looper's getMainLooper to return ServerThread
 2012-06-11 16:36:52 -07:00
Dianne Hackborn
acfb11b7c4 am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)" 
* commit '2e479fefbfcb388d2aa62978307420357f322441':
  Improved documentation (clarify on issue 8727)
 2012-06-11 16:36:49 -07:00
Wink Saville
e0f8b91e04 am 4853f944: am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees" 
* commit '4853f944ac4befba42219f6db8ed02b44a3e0d2b':
  Adds utility method to convert 0.25 secs to decimal degrees
 2012-06-11 16:36:46 -07:00
Dianne Hackborn
82b131f274 am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 
* commit 'f6e39b068d1d5491dc3d73d73f598790688a1c4e':
  ApplicationThread: Check interface before invoking scheduleLowMemory
 2012-06-11 16:36:42 -07:00
Wink Saville
f75e3e01f6 am c07055c4: am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods" 
* commit 'c07055c4a6e92a6c82e193c5b87b35d97418a73b':
  Adds documentation to CdmaCellLocation get lat/long methods
 2012-06-11 16:36:39 -07:00
Dianne Hackborn
569f5bddd2 am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread" 
* commit '37d8ac1b5629e3159c662a0d77503cfe85660d86':
  SystemServer: Looper's getMainLooper to return ServerThread
 2012-06-11 16:32:29 -07:00
Dianne Hackborn
2e479fefbf am bb536096: Merge "Improved documentation (clarify on issue 8727)" 
* commit 'bb5360966668ca8e97c02363b0d87dc9c9ae2451':
  Improved documentation (clarify on issue 8727)
 2012-06-11 16:32:26 -07:00
Wink Saville
4853f944ac am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees" 
* commit '3fe79dfdf4ca63535ec9e586ebed553a862061ea':
  Adds utility method to convert 0.25 secs to decimal degrees
 2012-06-11 16:32:23 -07:00
Dianne Hackborn
f6e39b068d am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 
* commit 'a03696dc6b8128bd44dc700b62ef9b5fd3ac4534':
  ApplicationThread: Check interface before invoking scheduleLowMemory
 2012-06-11 16:32:20 -07:00
Wink Saville
c07055c4a6 am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods" 
* commit 'bc69f97c663ec37aabf8ac4192752ecba0e00200':
  Adds documentation to CdmaCellLocation get lat/long methods
 2012-06-11 16:32:17 -07:00
Dianne Hackborn
f9d80b6b94 Merge "Rework media router to be per-context with global process state." into jb-dev 2012-06-11 16:31:55 -07:00
Craig Mautner
0fa77c1e0f Remove over aggressive optimization. 
It turns out that sometimes the wallpaper target is migrated to the
bottom of the window stack and then mWallpaperTarget is set to null.
In particular this happens when the launcher all-apps screen is
brought up. When this happens the layer of the wallpaper is
correctly set below the previous wallpaper target.

An optimization in WindowAnimator was keeping the layer update from
propagating to the Surface object. This fix removes that optimization.

Fixes bug 6631717.

Change-Id: I800dd043ce8df83b4e5edbf710503135396bc01e
 2012-06-11 16:30:48 -07:00
Craig Mautner
c38869abe5 Revert "Merge errors." 
This reverts commit b0419a52008e57475ee254def1da20451da22d4c.
 2012-06-11 16:30:48 -07:00
Craig Mautner
a5bbb8987b Merge errors. 
Change-Id: I33d0b1aa5dc5018cc879d2e9878e4825adaa4074
 2012-06-11 16:30:48 -07:00
Michael Jurka
64dbcd64be Merge "Tweak recents out animation a bit more" into jb-dev 2012-06-11 16:17:35 -07:00
Romain Guy
16c8808525 Textured text calls could be invisible 
Bug #6597730

Text would sometimes not appear when rendered with textured content
(BitmapShader, LinearGradientShader, etc.) This was due to a misuse
of OpenGL texture unit in FontRenderer. Textured text normally uses
two texture units:
- texture unit 0 for the font cache
- texture unit 1 for the textured content (gradient, etc.)

Recent changes to the font renderer allow it to bind new textures
while processing the text's geometry (this happens when caches get
full or when switching font size for instance.) The bindings were
done without ensuring the texture unit was the correct one
(unit 0), thus replacing the content of another texture unit
(unit 1).

This lead to text being drawn using the font cache itself as the
content texture, making the text invisible.

Change-Id: I392b4c884f09223305f6cbc6253e2ef9a98944c9
 2012-06-11 16:11:56 -07:00
Dianne Hackborn
37d8ac1b56 Merge "SystemServer: Looper's getMainLooper to return ServerThread" 2012-06-11 16:02:34 -07:00
Dianne Hackborn
bb53609666 Merge "Improved documentation (clarify on issue 8727)" 2012-06-11 16:01:38 -07:00
Jeff Brown
519e91ef84 Merge "Detect bad behavior earlier in Choreographer." into jb-dev 2012-06-11 15:59:48 -07:00
Wink Saville
3fe79dfdf4 Merge "Adds utility method to convert 0.25 secs to decimal degrees" 2012-06-11 15:58:26 -07:00
Dianne Hackborn
a03696dc6b Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 2012-06-11 15:58:22 -07:00
Wink Saville
bc69f97c66 Merge "Adds documentation to CdmaCellLocation get lat/long methods" 2012-06-11 15:57:03 -07:00
Irfan Sheriff
b81bb9b408 Clear interface addresses upon disconnect 
Change-Id: I8ce289cfc72babe894ce9f4d0119a2f2ac5f0859
Signed-off-by: Irfan Sheriff <isheriff@google.com>
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
 2012-06-11 15:48:50 -07:00
Dianne Hackborn
b58b8f832d Rework media router to be per-context with global process state. 
Change-Id: Ic1cb6f13e691d22783bcdafae85b7c75aec0a66f
 2012-06-11 15:41:08 -07:00