OSDN Git Service
Gilles Debunne [Tue, 2 Nov 2010 00:01:56 +0000 (17:01 -0700)]
Rescaled/updated mdpi assets added.
Change-Id: Ifd179b6850e04a785aef588c2f0f4fd80fc5c8fe
Scott Main [Fri, 29 Oct 2010 17:03:36 +0000 (10:03 -0700)]
Merge "docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs" into gingerbread
Joe Onorato [Fri, 29 Oct 2010 01:18:52 +0000 (18:18 -0700)]
Merge "Report the new size to wallpapers when the requested size changed." into gingerbread
Joe Onorato [Fri, 29 Oct 2010 01:03:23 +0000 (18:03 -0700)]
Report the new size to wallpapers when the requested size changed.
We were telling the app, but we weren't saving the data for ourselves.
This also tells them to re-scroll when there's a new size.
Bug:
3144373
Change-Id: I9d12b714119ff02dd7d7f1cfa997d8a44475b9e9
Nick Pelly [Thu, 28 Oct 2010 23:47:31 +0000 (16:47 -0700)]
Merge "Hide some NFC API's." into gingerbread
Scott Main [Fri, 22 Oct 2010 18:29:57 +0000 (11:29 -0700)]
docs: revise javadocs for sip
add a package description, revise class descriptions and edit some method docs
Change-Id: Ice969a99c830349674c65d99e4b7a6f1d2f24a7e
Nick Pelly [Thu, 28 Oct 2010 20:39:37 +0000 (13:39 -0700)]
Hide some NFC API's.
We are leaving enough API so that you can see when any Tag is discovered,
get its ID, and get its NDEF messages.
But for advanced use - creating tag connections and writing messages - we have
2 problems. Firstly a lot of the code is untested
(RawTagConnection.transceive()), or in some cases known not to work
(NdefTagConnection.write()). Secondly, there is still debate about how to
best expose information about Tags.
The set of data/methods exposed for a Tag changes completely depending on the
tag technology. There may be multiple sets of technology implemented in a
single tag. Tag A may have technology X and Y, Tag B may have technology Y
and Z. Furthermore, some NFC controllers will be not be able to use all
technologies, and so Android Device 1 may see technology X and Y on Tag A but
Android device 2 may only see technology X. So we have a pretty challenging
set of constraints to work under, and we are not convinced the current Tag and
NdefTag class is the best approach going forwards.
The Tag application should be able to remain unbundled, since it just needs to
get incoming NDEF Messages.
Change-Id: Ic09f094f33794e10f8d730fffe011c9a5957e0ac
Signed-off-by: Nick Pelly <npelly@google.com>
Mike Lockwood [Thu, 28 Oct 2010 21:28:46 +0000 (14:28 -0700)]
Merge "GPS: remove some logging" into gingerbread
Jeff Hamilton [Thu, 28 Oct 2010 21:01:21 +0000 (14:01 -0700)]
Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread
Jeff Hamilton [Thu, 28 Oct 2010 20:05:27 +0000 (15:05 -0500)]
DO NOT MERGE. Fix asset file descriptor for pipe based fds.
Change-Id: Ic366d01f91017109abfcfa65bd2231dd7416ce71
Justin Ho [Thu, 28 Oct 2010 17:23:33 +0000 (10:23 -0700)]
DO NOT MERGE - Ringtone bugfixes (round 1)
Change-Id: Idb72659b9cb00ec141b1229f42951e0a6e0b9a9a
Mike Lockwood [Thu, 28 Oct 2010 11:34:47 +0000 (07:34 -0400)]
GPS: remove some logging
Change-Id: Ib2dca53364c9da207a87f2664b54d2ec1d1bd8d9
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mathias Agopian [Thu, 28 Oct 2010 06:44:07 +0000 (23:44 -0700)]
Merge "really fix [
3118445] Transform * Transform does not work as expected" into gingerbread
Jaikumar Ganesh [Thu, 28 Oct 2010 06:42:43 +0000 (23:42 -0700)]
Merge "DO NOT MERGE Fix auto connection with headsets which don't send incoming connections for all profiles." into gingerbread
Jeff Brown [Thu, 28 Oct 2010 01:43:51 +0000 (18:43 -0700)]
Drop all dispatcher state when dispatcher is disabled.
This patch makes the dispatcher drop all of its state when it is
disabled (when the screen turns off). This ensures that the dispatcher
does not get stuck thinking a pointer is still down if the screen
turned off while the user was touching the display (such as a fat touch
while hitting the power button).
Bug:
3098344
Change-Id: If50ef5804870aa1acd3179fd4b40e3cda58dd39d
Mathias Agopian [Tue, 26 Oct 2010 01:29:35 +0000 (18:29 -0700)]
really fix [
3118445] Transform * Transform does not work as expected
Two bugs were counter acting each other.
- rotation matrices are on the left-hand side of multiplies
- the transform of the overlay is applied before that of the layer
Change-Id: Ia79bd368e9b719235c89ecf244ea263f01ce906a
Jaikumar Ganesh [Wed, 27 Oct 2010 22:57:23 +0000 (15:57 -0700)]
DO NOT MERGE Fix auto connection with headsets which don't send incoming
connections for all profiles.
Bug:
3136095
Change-Id: I48f36b99f3f7619a6a18c6adc2057c9d6d23c3e3
Dianne Hackborn [Wed, 27 Oct 2010 20:57:00 +0000 (13:57 -0700)]
Fix issue #
3138926: App's preferences can be lost after onPause()
Change-Id: Icea3d37fab5e47c89c5cbc0adff7bbec898fa93e
Andy McFadden [Wed, 27 Oct 2010 20:22:50 +0000 (13:22 -0700)]
Merge "Set capabilities sooner." into gingerbread
Andy McFadden [Wed, 27 Oct 2010 18:26:05 +0000 (11:26 -0700)]
Set capabilities sooner.
Bug
3135433.
Change-Id: I4e34b60c0a01b85ce0d80eb96ff3510604a68c71
Xavier Ducrohet [Wed, 27 Oct 2010 18:22:22 +0000 (11:22 -0700)]
Merge "Fix issue with project resources overriding framework resources." into gingerbread
Yu Shan Emily Lau [Wed, 27 Oct 2010 18:12:58 +0000 (11:12 -0700)]
Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread
Marco Nelissen [Wed, 27 Oct 2010 18:06:39 +0000 (11:06 -0700)]
Merge "Fix off-by-two and other bugs in the visualization code. b/
3137511" into gingerbread
Marco Nelissen [Wed, 27 Oct 2010 16:06:01 +0000 (09:06 -0700)]
Fix off-by-two and other bugs in the visualization code.
b/
3137511
Change-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6
Nick Pelly [Wed, 27 Oct 2010 08:14:43 +0000 (01:14 -0700)]
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>
Xavier Ducrohet [Tue, 26 Oct 2010 23:58:34 +0000 (16:58 -0700)]
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
Andreas Huber [Tue, 26 Oct 2010 23:21:47 +0000 (16:21 -0700)]
Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread
Justin Ho [Tue, 26 Oct 2010 23:06:28 +0000 (16:06 -0700)]
Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread
Justin Ho [Tue, 26 Oct 2010 22:34:07 +0000 (15:34 -0700)]
DO NOT MERGE - Fixing ringtones that were put in as notifications
Change-Id: I09a8a0f369604a6332b921b9e944a800ec4d6677
Andreas Huber [Tue, 26 Oct 2010 22:01:03 +0000 (15:01 -0700)]
Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise.
Change-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490
Yu Shan Emily Lau [Tue, 26 Oct 2010 21:36:09 +0000 (14:36 -0700)]
Add the mediaplayer release in the test validation. This is to ensure the media player release properly.
Change-Id: Ia4758a3c549b64b6efead18e7538d977dee2be76
Mathias Agopian [Tue, 26 Oct 2010 19:18:32 +0000 (12:18 -0700)]
Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:18:19 +0000 (12:18 -0700)]
Merge "add format parameter to setBufferGeometry" into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:18:07 +0000 (12:18 -0700)]
Merge "fix eglChooseConfig() for special attributes." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:14:17 +0000 (12:14 -0700)]
Merge "Add a way to get a string for an error code." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:09:48 +0000 (14:09 -0500)]
Add a way to get a string for an error code.
Change-Id: I133e974c656eb558349cbc3f9a2caf5b18c8fc3d
Xavier Ducrohet [Tue, 26 Oct 2010 19:09:18 +0000 (12:09 -0700)]
Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
Xavier Ducrohet [Tue, 26 Oct 2010 18:18:39 +0000 (11:18 -0700)]
Fix rendering of digitalClock/Gallery in Eclipse editors.
Change-Id: I80f4f90b173529632eaf2fbc3bb5471b7ede8216
Justin Ho [Tue, 26 Oct 2010 16:09:22 +0000 (09:09 -0700)]
Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread
Justin Ho [Tue, 26 Oct 2010 16:05:06 +0000 (09:05 -0700)]
DO NOT MERGE - Fixing capitalized ringtone metadata only
Change-Id: Ib16ca195356b6cbb3d3926f6d5a3de366eaa980e
Mike Lockwood [Tue, 26 Oct 2010 15:34:32 +0000 (08:34 -0700)]
Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread
Eric Laurent [Tue, 26 Oct 2010 15:13:32 +0000 (08:13 -0700)]
Merge "Partial fix for issue
3124895." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 14:16:46 +0000 (07:16 -0700)]
Merge "Make some contructors public but hidden." into gingerbread
Mike Lockwood [Tue, 26 Oct 2010 14:01:55 +0000 (10:01 -0400)]
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>
Jeff Hamilton [Tue, 26 Oct 2010 13:59:18 +0000 (08:59 -0500)]
Make some contructors public but hidden.
This allows them to be used from within the
NFC stack process internally.
Change-Id: I7f81759da63d451efe86550a57a400fb224b2064
Eric Laurent [Tue, 26 Oct 2010 02:42:08 +0000 (19:42 -0700)]
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
Joe Onorato [Tue, 26 Oct 2010 01:48:08 +0000 (18:48 -0700)]
Merge "Don't turn the button backlights on if the screen is off. Part 2." into gingerbread
Scott Main [Tue, 26 Oct 2010 00:15:50 +0000 (17:15 -0700)]
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
Mathias Agopian [Mon, 25 Oct 2010 23:29:24 +0000 (16:29 -0700)]
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
Justin Ho [Mon, 25 Oct 2010 23:44:01 +0000 (16:44 -0700)]
Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Justin Ho [Mon, 25 Oct 2010 23:38:41 +0000 (16:38 -0700)]
DO NOT MERGE - Updated ringtone assets for crespo
Change-Id: Ie5c6b0bfa282f976129f5e87a09512da01e6851b
Joe Malin [Mon, 25 Oct 2010 23:19:18 +0000 (16:19 -0700)]
Merge "Doc Change: Revert NotePad sample test package" into gingerbread
Eric Fischer [Mon, 25 Oct 2010 23:14:47 +0000 (16:14 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Mathias Agopian [Mon, 25 Oct 2010 01:35:26 +0000 (18:35 -0700)]
add format parameter to setBufferGeometry
Change-Id: I7cc2acdc6e65e9468ecfd5b2f22e6b495a383be9
Joe Malin [Mon, 25 Oct 2010 22:55:13 +0000 (15:55 -0700)]
Doc Change: Revert NotePad sample test package
Change-Id: I68a1b6f9cd64a86c5a8fa6657559f47a89162b37
Mathias Agopian [Mon, 25 Oct 2010 22:51:24 +0000 (15:51 -0700)]
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 speciļ¬ed
in attrib list, then they are ignored
Change-Id: I3d5214ce896986da2f11d2eb1889afc41731eaa6
Scott Main [Mon, 25 Oct 2010 20:45:35 +0000 (13:45 -0700)]
update featured videos
also remove "new" tags from SDK and Resources nav items
Change-Id: I75e16fc6dda5a7cbcd4ff8e4ebb2189860e884d5
Eric Fischer [Mon, 25 Oct 2010 22:41:31 +0000 (15:41 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I404fe29521193ca9d0a3689d4a786253dc27e2d6
Jeff Hamilton [Mon, 25 Oct 2010 21:46:45 +0000 (14:46 -0700)]
Merge "Add a RHS status bar slot for NFC." into gingerbread
Jeff Hamilton [Mon, 25 Oct 2010 21:41:41 +0000 (16:41 -0500)]
Add a RHS status bar slot for NFC.
Change-Id: I62cbcec051a2c69f76fb9a5b9ff6f6bc05a8257b
Joe Onorato [Mon, 25 Oct 2010 21:09:21 +0000 (14:09 -0700)]
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
Mike Lockwood [Mon, 25 Oct 2010 20:49:13 +0000 (13:49 -0700)]
Merge "GPS: Disable verbose logging" into gingerbread
Mike Lockwood [Mon, 25 Oct 2010 20:35:55 +0000 (16:35 -0400)]
GPS: Disable verbose logging
BUG:
3127049
Change-Id: I9efd9eb7ff69724b133f3b70c52e173f49ddfbc5
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mathias Agopian [Mon, 25 Oct 2010 20:31:11 +0000 (13:31 -0700)]
Merge "fix [
3123221] Video sticks playing back upside down following orientation switch" into gingerbread
Mathias Agopian [Mon, 25 Oct 2010 20:31:03 +0000 (13:31 -0700)]
Merge "fix [
3118445] Transform * Transform does not work as expected" into gingerbread
Adam Powell [Mon, 25 Oct 2010 18:43:03 +0000 (11:43 -0700)]
Merge "DO NOT MERGE Fix bug
3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread
Scott Main [Mon, 25 Oct 2010 18:18:28 +0000 (11:18 -0700)]
Merge "docs: fix a couple api links" into gingerbread
Adam Powell [Mon, 25 Oct 2010 18:08:06 +0000 (11:08 -0700)]
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
Nick Pelly [Mon, 25 Oct 2010 15:58:00 +0000 (08:58 -0700)]
Merge "Fixed NdefTag parcelable conversion methods." into gingerbread
Wu-cheng Li [Mon, 25 Oct 2010 15:55:54 +0000 (08:55 -0700)]
Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread
Sylvain Fonteneau [Mon, 25 Oct 2010 14:28:03 +0000 (07:28 -0700)]
Fixed NdefTag parcelable conversion methods.
Also removed call to obsolete openTagConnection() method which was crashing.
Change-Id: Iffd46bd5cad877bb3a82ede298e65ae98322dca9
Signed-off-by: Nick Pelly <npelly@google.com>
Wu-cheng Li [Thu, 21 Oct 2010 04:50:37 +0000 (12:50 +0800)]
Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
Now overlay does flip before rotation.
bug:
3114236
Change-Id: I1780e56154566435a0ceeb2f101de7ed0a0613cb
Nick Pelly [Mon, 25 Oct 2010 05:06:15 +0000 (22:06 -0700)]
Merge "Document getPollBytes() and getActivationBytes()." into gingerbread
Nick Pelly [Mon, 25 Oct 2010 05:03:04 +0000 (22:03 -0700)]
Document getPollBytes() and getActivationBytes().
No code change.
Change-Id: Ideb427b2684b9f9296abefb7c97eabc52db73ee0
Signed-off-by: Nick Pelly <npelly@google.com>
Mathias Agopian [Mon, 25 Oct 2010 02:03:58 +0000 (19:03 -0700)]
fix [
3123221] Video sticks playing back upside down following orientation switch
the overlay wasn't reconfigured when the screen-orientation changed. It was
only done when a parameter of the surface itself changed.
Change-Id: I0ca0925bf58ded4c91ab89d12cb1fe4d1477c96c
Dianne Hackborn [Mon, 25 Oct 2010 01:33:36 +0000 (18:33 -0700)]
Merge "Fix issue #
3126018: No way to specify NativeActivity's native method" into gingerbread
Dianne Hackborn [Sun, 24 Oct 2010 21:56:38 +0000 (14:56 -0700)]
Fix issue #
3126018: No way to specify NativeActivity's native method
Change-Id: I59de6a543e7f7f45d963a905829a3f56f32bf8cf
Mathias Agopian [Sun, 24 Oct 2010 21:53:05 +0000 (14:53 -0700)]
fix [
3118445] Transform * Transform does not work as expected
The problem wasn't in the multiply operator, but rather in the code
that built the transform from the HAL bitmask.
We now use the multiply operator to build the Transform from the bitmask,
which guarantees, it'll always be correct.
Also added a simple test for Transform.
Change-Id: I09bf3b0e51d92f59d83ea91c4cc94fc2aa0bf227
Jeff Brown [Sun, 24 Oct 2010 21:18:19 +0000 (14:18 -0700)]
Merge "Add unit tests for native input and fix bugs identified." into gingerbread
Joe Onorato [Sat, 23 Oct 2010 21:49:30 +0000 (14:49 -0700)]
Make sure that when the screen is off, we don't try to turn the buttons on too.
Bug:
3117801
Change-Id: I763f114a2b0426660d29bbda04ea7db12c1137e8
Jeff Brown [Wed, 20 Oct 2010 22:33:38 +0000 (15:33 -0700)]
Add unit tests for native input and fix bugs identified.
Fixed a bug where we would lose the first touch point when swiping out of
the virtual key area.
Fixed a bug where we would not send an ACTION_MOVE event in cases where
individual pointers went down/up and the remaining pointers actually moved.
This is important since many applications do not handle pointer movements
during ACTION_POINTER_DOWN or ACTION_POINTER_UP. In the case of
ACTION_POINTER_UP the movement was completely lost since all pointers were
dispatched using their old location rather than the new location.
Improved motion event validation to check for duplicate pointer ids.
Added an input source constant that was missing from the NDK api but
defined in the framework api.
Added a timestamp when reporting added/removed devices in EventHub.
Bug:
3070082
Change-Id: I3206a030f43b7616e2f48006e5a9d522c4d92e56
Eric Laurent [Sat, 23 Oct 2010 01:37:09 +0000 (18:37 -0700)]
Merge "Fix issue
3126094." into gingerbread
Eric Laurent [Sat, 23 Oct 2010 01:03:35 +0000 (18:03 -0700)]
Fix issue
3126094.
android_media_Visualizer.cpp:
Delete local reference to jArray in captureCallback() in
the case of waveform capture.
Change-Id: Ia822ab6d9945fff93605f7732e56120c19fd42a5
Eric Fischer [Sat, 23 Oct 2010 00:14:36 +0000 (17:14 -0700)]
Merge "Import translations for status bar." into gingerbread
Eric Rowe [Sat, 23 Oct 2010 00:14:12 +0000 (17:14 -0700)]
Merge "Change disable timeout for BT disable stress test" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 23:49:14 +0000 (16:49 -0700)]
Import translations for status bar.
Change-Id: I5f40e9c507530fb4110da711e54465c2ae920a94
Eric Rowe [Fri, 22 Oct 2010 23:32:22 +0000 (16:32 -0700)]
Change disable timeout for BT disable stress test
Bug: b/
3125900
Change-Id: Ie1f599f1c418fc40c29debd1401297441a2a9db3
Nick Pelly [Fri, 22 Oct 2010 04:42:24 +0000 (21:42 -0700)]
Push Tag/NdefTag implementation details into the service.
Tag/NdefTag objects should just be simple data objects. Push the mapping of
internal tag type to public rawTarget/ndefTarget into Nfc Service.
This gives an oppurtunity to clean up some Tag/NdefTag API methods. Most
significantly, adding createMockTag() and createMockNdefTag() to help with
application testing.
There will probably be some more tweaking of the types/targets in
Tag/NdefTag to come, this commit makes that a lot easier.
Also:
- Introduce getActivationBytes() and getPollBytes(). These are just stubs
for NFC service to implement, we have feedback these are really important
to help identify NFC tags.
- Based on outside advice, remove 3B_PRIME (roll into 3B) and TOPAZ (roll
into 3A).
Change-Id: I3e6789c047f6ee5c298bf76c65e0885cf3c15d97
Signed-off-by: Nick Pelly <npelly@google.com>
Eric Fischer [Fri, 22 Oct 2010 23:06:37 +0000 (16:06 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 22:59:42 +0000 (15:59 -0700)]
Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread
Eric Fischer [Fri, 22 Oct 2010 22:24:30 +0000 (15:24 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: If41b9f790002bb3cf0adb5214955f496a7170e61
Eric Fischer [Fri, 22 Oct 2010 21:52:46 +0000 (14:52 -0700)]
Add a space before the weekday in the zh_CN lock screen date format.
Bug
3121853
Change-Id: I3685079bc504544c8d244d8a926c02a5eb367d21
Dianne Hackborn [Fri, 22 Oct 2010 21:01:25 +0000 (14:01 -0700)]
Merge "Fix issue #
3122240: Expose xlarge in GB." into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 19:59:20 +0000 (12:59 -0700)]
Fix issue #
3122240: Expose xlarge in GB.
Plus some other small API cleanup.
Change-Id: I1a3c60f510f99224cccac9cc3f838f04141064f8
Kenny Root [Fri, 22 Oct 2010 19:17:02 +0000 (12:17 -0700)]
Merge "Exit immediately on some linklib failures" into gingerbread
Justin Ho [Fri, 22 Oct 2010 19:14:26 +0000 (12:14 -0700)]
Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread
Justin Ho [Fri, 22 Oct 2010 18:55:58 +0000 (11:55 -0700)]
DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator
Change-Id: Ia855f0461a984974e3f54d8f8f5fe146ff330c4f
Dianne Hackborn [Fri, 22 Oct 2010 17:58:35 +0000 (10:58 -0700)]
Merge "Update script for copying NDK headers/library." into gingerbread
Jeff Hamilton [Fri, 22 Oct 2010 17:20:06 +0000 (10:20 -0700)]
Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread
Nick Pelly [Fri, 22 Oct 2010 15:49:51 +0000 (08:49 -0700)]
Merge "Attempt to fix simulator build." into gingerbread