26668 Commits

Author SHA1 Message Date
Andy McFadden
001c7d1281 Merge "Set capabilities sooner." into gingerbread 2010-10-27 13:22:50 -07:00
Andy McFadden
1b4c7966b1 Set capabilities sooner.
Bug 3135433.

Change-Id: I4e34b60c0a01b85ce0d80eb96ff3510604a68c71
2010-10-27 11:26:05 -07:00
Xavier Ducrohet
63e5d07ec9 Merge "Fix issue with project resources overriding framework resources." into gingerbread 2010-10-27 11:22:22 -07:00
Yu Shan Emily Lau
8b023a2ea2 Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread 2010-10-27 11:12:58 -07:00
Marco Nelissen
67c7a4ae2e Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread 2010-10-27 11:06:39 -07:00
Marco Nelissen
f514bdc964 Fix off-by-two and other bugs in the visualization code.
b/3137511

Change-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6
2010-10-27 10:23:59 -07:00
Nick Pelly
6d55e1342f Make best effort attempt to recover NFC service when it dies.
Retrieve the service again from ServiceManager on RemoteException.

Change-Id: Ie227b52019e7deafeab712af1addd6d957f7a8ee
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-27 01:15:32 -07:00
Xavier Ducrohet
c2e28dd748 Fix issue with project resources overriding framework resources.
Framework resources loaded through Drawable.createFromXml could
be overriden by project resources if there were loaded through
a  state list drawable where the final resource name was used
by a project resource (of the same type).

This ensures that the XML parser knows that it's a framework
resource being parsed and that the resource resolution uses
that information.

Change-Id: I39cf9eba755e55f1604b968637aeecff969a558d
2010-10-26 17:14:55 -07:00
Andreas Huber
2088e371ed Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread 2010-10-26 16:21:48 -07:00
Justin Ho
3810c08bbc Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread 2010-10-26 16:06:28 -07:00
Justin Ho
95ce5b20c8 DO NOT MERGE - Fixing ringtones that were put in as notifications
Change-Id: I09a8a0f369604a6332b921b9e944a800ec4d6677
2010-10-26 15:34:07 -07:00
Andreas Huber
0a612889b5 Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise.
Change-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490
2010-10-26 15:06:44 -07:00
Yu Shan Emily Lau
93aa00c664 Add the mediaplayer release in the test validation. This is to ensure the media player release properly.
Change-Id: Ia4758a3c549b64b6efead18e7538d977dee2be76
2010-10-26 14:36:09 -07:00
Mathias Agopian
2f19f56ac5 Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread 2010-10-26 12:18:32 -07:00
Mathias Agopian
5219dd8e29 Merge "add format parameter to setBufferGeometry" into gingerbread 2010-10-26 12:18:19 -07:00
Mathias Agopian
a7b745ca75 Merge "fix eglChooseConfig() for special attributes." into gingerbread 2010-10-26 12:18:07 -07:00
Jeff Hamilton
d8cf2125c1 Merge "Add a way to get a string for an error code." into gingerbread 2010-10-26 12:14:17 -07:00
Jeff Hamilton
68a5c9f3cf Add a way to get a string for an error code.
Change-Id: I133e974c656eb558349cbc3f9a2caf5b18c8fc3d
2010-10-26 14:09:48 -05:00
Xavier Ducrohet
1b6180ec31 Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread 2010-10-26 12:09:18 -07:00
Xavier Ducrohet
25e96ce7b9 Fix rendering of digitalClock/Gallery in Eclipse editors.
Change-Id: I80f4f90b173529632eaf2fbc3bb5471b7ede8216
2010-10-26 11:18:39 -07:00
Justin Ho
5a147d083c Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread 2010-10-26 09:09:22 -07:00
Justin Ho
34952c0121 DO NOT MERGE - Fixing capitalized ringtone metadata only
Change-Id: Ib16ca195356b6cbb3d3926f6d5a3de366eaa980e
2010-10-26 09:05:06 -07:00
Mike Lockwood
1d28a84059 Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread 2010-10-26 08:34:32 -07:00
Eric Laurent
1a58d9c398 Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:13:32 -07:00
Jeff Hamilton
79fb6449a1 Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:16:47 -07:00
Mike Lockwood
9e3191d16c Location Manager: Fix LocationManager.getBestProvider filtering.
getBestProvider should only return location providers that the client
has permission to use.

BUG: 3124614

Change-Id: I065091d0445092563bc53fb4f7d93a1ab6bebb9a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-26 10:01:55 -04:00
Jeff Hamilton
d6c052a8ec Make some contructors public but hidden.
This allows them to be used from within the
NFC stack process internally.

Change-Id: I7f81759da63d451efe86550a57a400fb224b2064
2010-10-26 08:59:18 -05:00
Eric Laurent
164a8f86c7 Partial fix for issue 3124895.
When a SIP call is put on hold and no other call is active, the audio mode should not be
switched to incall.

Change-Id: I1307330f10cbfb9c4223bcb9dc4faa79778750af
2010-10-25 19:45:39 -07:00
Joe Onorato
11e2e9b0c2 Merge "Don't turn the button backlights on if the screen is off. Part 2." into gingerbread 2010-10-25 18:48:08 -07:00
Scott Main
3d40cd5055 am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items
Merge commit 'c9ac1079696b93a294f504c6561397ef731a46f9' into gingerbread

* commit 'c9ac1079696b93a294f504c6561397ef731a46f9':
  update featured videos
2010-10-25 17:15:50 -07:00
Mathias Agopian
b9737a1d1b Updade Surface (ANativeWindow) format based on its buffers format
this is to allow applications to change the format of a surface's
buffer, and have it reflected in EGL; which is needed for
EGLConfig validation.

Change-Id: Iee074c30ad765881e2409c1d37450b05e561c44d
2010-10-25 17:08:37 -07:00
Justin Ho
044df235c8 Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread 2010-10-25 16:44:01 -07:00
Justin Ho
6a83d37769 DO NOT MERGE - Updated ringtone assets for crespo
Change-Id: Ie5c6b0bfa282f976129f5e87a09512da01e6851b
2010-10-25 16:38:41 -07:00
Joe Malin
5016df1cfa Merge "Doc Change: Revert NotePad sample test package" into gingerbread 2010-10-25 16:19:18 -07:00
Eric Fischer
3d1ce9ec2a Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-25 16:14:47 -07:00
Mathias Agopian
3026a1c4e8 add format parameter to setBufferGeometry
Change-Id: I7cc2acdc6e65e9468ecfd5b2f22e6b495a383be9
2010-10-25 15:58:35 -07:00
Joe Malin
24fed74a34 Doc Change: Revert NotePad sample test package
Change-Id: I68a1b6f9cd64a86c5a8fa6657559f47a89162b37
2010-10-25 15:55:13 -07:00
Mathias Agopian
d8e350bc96 fix eglChooseConfig() for special attributes.
affects software renderer (emu) only.

per EGL spec:
  If EGL_MAX_PBUFFER_WIDTH, EGL_MAX_PBUFFER_HEIGHT,
  EGL_MAX_PBUFFER_PIXELS, or EGL_NATIVE_VISUAL_ID are specified
  in attrib list, then they are ignored

Change-Id: I3d5214ce896986da2f11d2eb1889afc41731eaa6
2010-10-25 15:51:24 -07:00
Scott Main
c9ac107969 update featured videos
also remove "new" tags from SDK and Resources nav items

Change-Id: I75e16fc6dda5a7cbcd4ff8e4ebb2189860e884d5
2010-10-25 15:42:03 -07:00
Eric Fischer
0820821213 Import revised translations. DO NOT MERGE
Change-Id: I404fe29521193ca9d0a3689d4a786253dc27e2d6
2010-10-25 15:41:31 -07:00
Jeff Hamilton
106165b510 Merge "Add a RHS status bar slot for NFC." into gingerbread 2010-10-25 14:46:45 -07:00
Jeff Hamilton
e0be933ec7 Add a RHS status bar slot for NFC.
Change-Id: I62cbcec051a2c69f76fb9a5b9ff6f6bc05a8257b
2010-10-25 16:41:41 -05:00
Joe Onorato
06eb33acb7 Don't turn the button backlights on if the screen is off. Part 2.
These are the logs from when I just reproduced it here.  This means that we got an event after the
screen turned off.  So isScreenTurningOffLocked() is working, but we need to also check that we're
not off.  This bug is happening because lightSensorChangedLocked is calling
mButtonLight.setBrightness() directly instead of going through updateLightsLocked, which is where
I added that check to not turn the buttons on of the screen is off.

D/PowerManagerService( 1243): onSensorChanged: light value: 1280
I/power   ( 1243): *** set_screen_state 0
D/PowerManagerService( 1243): enableLightSensor false
D/PowerManagerService( 1243): onSensorChanged: light value: 320
D/PowerManagerService( 1243): lightSensorChangedLocked 320
D/PowerManagerService( 1243): lcdValue 55
D/PowerManagerService( 1243): buttonValue 255
D/PowerManagerService( 1243): keyboardValue 0
D/SurfaceFlinger( 1243): About to give-up screen, flinger = 0x8dcf! 0

Bug: 3117801
Change-Id: I722d66cafba71b183cc987b7383d4ad7e171ba82
2010-10-25 14:21:06 -07:00
Mike Lockwood
8c32bddfac Merge "GPS: Disable verbose logging" into gingerbread 2010-10-25 13:49:13 -07:00
Mike Lockwood
4a7b65e0d5 GPS: Disable verbose logging
BUG: 3127049

Change-Id: I9efd9eb7ff69724b133f3b70c52e173f49ddfbc5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-25 16:35:55 -04:00
Mathias Agopian
457bed2bc6 Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread 2010-10-25 13:31:11 -07:00
Mathias Agopian
ce4d36ad72 Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread 2010-10-25 13:31:03 -07:00
Adam Powell
17efcde161 Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread 2010-10-25 11:43:03 -07:00
Scott Main
abb50f1528 Merge "docs: fix a couple api links" into gingerbread 2010-10-25 11:18:28 -07:00
Adam Powell
b9b8f7b99b DO NOT MERGE Fix bug 3124899 - timeout in CTS test
ExpandableListViewBasicTest

A certain sequence of events could cause AbsListView to enter an
infinite event loop. Only report reaching a scroll boundary to the
overscroll code path if the Scroller wants to move further, not if
we're done moving.

Change-Id: Ifdaf72d60ca25584e4a37d3d8f17365e0fcbfa40
2010-10-25 11:12:41 -07:00