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

68240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
db316b212f Merge "Move declaration of mixerStatus to inner block" 2012-02-27 07:21:00 -08:00
Ben Murdoch
1d7b856a97 Merge "Fix looping HTML5 Audio." 2012-02-27 02:17:23 -08:00
Jamie Gennis
c108613fb8 Merge "Removed dependecies between BufferQueue and SurfaceTexture" 2012-02-26 17:06:42 -08:00
Eric Fischer
7fbedadb62 Merge "Import translations. DO NOT MERGE" 2012-02-25 19:34:19 -08:00
Mathias Agopian
f69d204d2d Merge "attempt to fix IMSFramework crash" 2012-02-24 19:58:05 -08:00
Adam Powell
d020ebff2c Merge "Fix bug 6065890 - Correct callback sequence for action bar tab switching" 2012-02-24 19:50:11 -08:00
Mathias Agopian
d13f9aa8b1 attempt to fix IMSFramework crash 
Change-Id: Iad6dd85afe8f37c1e443c116162d75f116c24316
 2012-02-24 19:32:03 -08:00
Adam Powell
c4e57e23f9 Fix bug 6065890 - Correct callback sequence for action bar tab switching 
Keep the callback behavior consistent when action bar tabs collapse
into a spinner.

Change-Id: Ia82e55d816a92b7ec746e1d25486bc9d2c0778f4
 2012-02-24 19:25:43 -08:00
Daniel Sandler
13ff5331f9 Merge "Fix fullScreenIntents." 2012-02-24 19:10:01 -08:00
Mathias Agopian
018549e4bf Merge "remove dependency on android_native{s_priv|buffer}.h" 2012-02-24 19:08:12 -08:00
Daniel Sandler
fc6fda3950 Fix fullScreenIntents. 
The intruder alert stuff was getting activated, but it's not
really ready yet.

Bug: 6070420
Change-Id: If65165e96bddf1e5e4c89ed26131e45639d5cf2d
 2012-02-24 22:05:27 -05:00
Dianne Hackborn
5265466e8a Merge "New development permissions." 2012-02-24 18:40:37 -08:00
Mathias Agopian
af01feafc3 remove dependency on android_native{s_priv|buffer}.h 
Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
 2012-02-24 18:26:01 -08:00
Romain Guy
2abb138152 Merge "More infrastructure for Canvas.drawTextOnPath" 2012-02-24 18:01:47 -08:00
Romain Guy
778f67f7c0 Merge "Add hooks to implement Canvas.drawTextOnPath() in GL" 2012-02-24 18:01:22 -08:00
Romain Guy
03d58520c3 More infrastructure for Canvas.drawTextOnPath 
Change-Id: Iff42b24e342650d06fa4e2fa9db6c28da820ff01
 2012-02-24 17:54:07 -08:00
Jason Sams
b73644a94f Merge "Make compute work without an app context." 2012-02-24 17:52:59 -08:00
Jason Sams
1a4e1f3efd Make compute work without an app context. 
Change-Id: I644b4711135d6f5d9866b6c2e5e6f6a5ceb1f3d4
 2012-02-24 17:51:24 -08:00
Gilles Debunne
5cd164c5cf Merge "Fix NPE on Activity start in TextView" 2012-02-24 17:42:03 -08:00
Gilles Debunne
c1e79b45a2 Fix NPE on Activity start in TextView 
Bug 6065279

The selection can be created programatically, and mEditor may be null
when it happens.

Make sure mEditor is created to display the selection highlight.

Change-Id: Idd66a5fd4ad327f9b390b539574e6878c794ba4a
 2012-02-24 17:40:22 -08:00
Jason Sams
93d083b6ad Merge "Do RS caching the same way HardwareRenderer does. Eliminates the need for an application context for caching." 2012-02-24 17:21:32 -08:00
Jason Sams
3d408e5010 Merge "test runs but I do not check results yet." 2012-02-24 17:21:02 -08:00
Gilles Debunne
9f809c2fd1 Merge "Fix crash on long press in TextView" 2012-02-24 17:04:10 -08:00
Gilles Debunne
f14634e491 Fix crash on long press in TextView 
Bug 6058792

Glitch in mEditor handling

Change-Id: I9b68796d5038c20d190ba5fbdaff1608b36aaee6
 2012-02-24 17:01:59 -08:00
Adam Powell
b87148b2c0 Merge "Add support for optional titles in action modes" 2012-02-24 17:00:37 -08:00
Adam Powell
b98a81f86a Add support for optional titles in action modes 
Optional titles will only be displayed in the CAB if they entirely fit
instead of ellipsizing.

Fixes bug 5821883

Change-Id: I0cfd6d4fd34a4fa9f520499d577706da30606811
 2012-02-24 16:59:03 -08:00
Romain Guy
325740fb44 Add hooks to implement Canvas.drawTextOnPath() in GL 
Change-Id: I165c9e05facf5365aa6850605688e538640c7fcc
 2012-02-24 16:48:34 -08:00
Mathias Agopian
f9c83f3763 Merge "remove libui dependency on libEGL" 2012-02-24 16:44:40 -08:00
Mathias Agopian
cc0eaa6582 remove libui dependency on libEGL 
Change-Id: I1194f04085637d5c384e134967249430cc43b6ee
 2012-02-24 16:42:46 -08:00
Dianne Hackborn
8657477721 am 44b1a43d: am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '44b1a43d823ec3cb93e02df4834b27a75bb30ba5':
 2012-02-24 16:42:14 -08:00
Dianne Hackborn
7e847390e8 Merge "resolved conflicts for merge of 34706a4c to master" 2012-02-24 16:39:59 -08:00
Dianne Hackborn
cb581bbe2e resolved conflicts for merge of 34706a4c to master 
Change-Id: I4dd24f3b917aa7e3d2c4b0fae51e951dfcf88ba8
 2012-02-24 16:37:35 -08:00
James Dong
b7956de3a9 Merge "Improved comment about DrmStore.ConstraintsColumns" 2012-02-24 16:36:34 -08:00
James Dong
aacc4b86c9 Merge "Only allow valid types to be used in DrmErrorEvent and DrmInfoEvent" 2012-02-24 16:35:20 -08:00
Dianne Hackborn
44b1a43d82 am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '4a6e6991b0df0d1b269193b9e9edbd3bc44ba238':
 2012-02-24 16:29:44 -08:00
Dianne Hackborn
34706a4c81 am e65a9ab1: am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit 'e65a9ab1ea42d1f6190bee844ee666b7910d71ef':
  Fix build.
 2012-02-24 16:26:57 -08:00
Dianne Hackborn
4a6e6991b0 am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.
 2012-02-24 16:25:30 -08:00
Dianne Hackborn
e65a9ab1ea am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.
 2012-02-24 16:24:40 -08:00
Dianne Hackborn
5786f5cf1b Merge "Fix build." into ics-mr1 2012-02-24 16:23:07 -08:00
Jason Sams
a6f338ca5f Do RS caching the same way HardwareRenderer does. 
Eliminates the need for an application context for caching.

Change-Id: I4374738083b5eb4ce983d2cb5409428e3668c423
 2012-02-24 16:22:16 -08:00
Glenn Kasten
26debac448 Move declaration of mixerStatus to inner block 
mixerStatus was being declared (and initialized) too early,
which also resulted in a duplicate initialization.  Moved
the declaration into the block where it is actually used.

Change-Id: Ifdcfefe362a5efe3493dd616cdb44645c6f9aed5
 2012-02-24 16:14:46 -08:00
Dianne Hackborn
b69b2c01b4 Fix build. 
Change-Id: Id3262bff0df598ecc81a4346dee9febd3aaa60c9
 2012-02-24 16:10:26 -08:00
Glenn Kasten
2521a01970 Pull out duplicated copies of silent mode check 
Also fix the error handling for the property_get.

This is part of preparation for the threadLoop() merge.

Change-Id: I6405190ea18146d1271575e1dfe9f279e8f36b17
 2012-02-24 16:02:24 -08:00
James Dong
e82f055e3e Only allow valid types to be used in DrmErrorEvent and DrmInfoEvent 
o This patch will prevent applications from abusing the API by using
  arbitrary int value for DrmErrorEvent or DrmInfoEvent types.
o We should have not defined some type constants in the super/base
  class, DrmEvent.

Change-Id: Id0bb12caa8ce471cb6951cc2b5d37ea408f90063
 2012-02-24 15:50:41 -08:00
Dianne Hackborn
56694cec11 am 92ce6314: am 140da7c4: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '92ce6314c15bd6d59a94a247ae63f1da9b4ccab2':
 2012-02-24 15:47:40 -08:00
Dianne Hackborn
0aec3ea6de am 911b505f: am dc5fa185: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '911b505f11c719906985f169a4f45930bdec8695':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:44:55 -08:00
Dianne Hackborn
92ce6314c1 am 140da7c4: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '140da7c4140f0536c3fad1f7be555ebd58055b63':
 2012-02-24 15:42:43 -08:00
Dianne Hackborn
911b505f11 am dc5fa185: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit 'dc5fa1859d03ecca36fc6be2fed7bbd4ba70b51f':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:41:35 -08:00
Dianne Hackborn
dc5fa1859d am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '133dc2d7aecc68990c363c861716b134910a4ced':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:38:07 -08:00
Dianne Hackborn
140da7c414 am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '133dc2d7aecc68990c363c861716b134910a4ced':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:38:03 -08:00