Romain Guy
9d13fe25f4
Fix text rendering artifact.
...
Change-Id: I50f47207846e4208d363dde4e8f5f1a0f23d2d75
2010-10-15 16:06:03 -07:00
Jeff Brown
2d3f159aa9
Add support for secure system overlays. (DO NOT MERGE)
...
This change adds a new window type for secure system overlays
created by the system itself from non-secure system overlays that
might be created by applications that have the system alert permission.
Secure views ignore the presence of secure system overlays.
Bug: 3098519
Change-Id: I8f8398f4fdeb0469e5d71124c21bedf121bd8c07
2010-10-15 16:03:35 -07:00
Jeff Brown
497a92cc5b
Add keycodes and meta-key modifiers to support external keyboards.
...
Added new key maps for external keyboards. These maps are intended to
be shared across devices by inheriting the "keyboards.mk" product
makefile as part of the device's product definition.
One of the trickier changes here was to unwind some code in
MetaKeyKeyListener that assumed that only the low 8 bits of the meta key
state were actually used. The new code abandons bitshifts in favor
of simple conditionals that are probably easier to read anyways.
The special meta key state constants used by MetaKeyKeyListener
are now (@hide) defined in KeyEvent now so as to make it clearer that they
share the same code space even if those codes are not valid for KeyEvents.
The EventHub now takes care of detecting the appropriate key layout
map and key character map when the device is added and sets system
properties accordingly. This avoids having duplicate code in
KeyCharacterMap to probe for the appropriate key character map
although the current probing mechanism has been preserved for legacy
reasons just in case.
Added support for tracking caps lock, num lock and scroll lock and
turning their corresponding LEDs on and off as needed.
The key character map format will need to be updated to correctly support
PC style external keyboard semantics related to modifier keys.
That will come in a later change so caps lock doesn't actually do
anything right now except turn the shiny LEDs on and off...
Added a list of symbolic key names to KeyEvent and improved the toString()
output for debug diagnosis. Having this list in a central place in the
framework also allows us to remove it from Monkey so there is one less
thing to maintain when we add new keycodes.
Bug: 2912307
Change-Id: If8c25e8d50a7c29bbf5d663c94284f5f86de5da4
2010-10-15 16:00:07 -07:00
Scott Main
c9f7890a20
Revise some javadocs for NFC; add package description
...
Change-Id: I60223e2ad24af98b3b16a74960365185096ae614
2010-10-15 15:27:16 -07:00
Shimeng (Simon) Wang
7ef6834eea
Merge "DO NOT MERGE" into gingerbread
2010-10-15 15:17:22 -07:00
Jesse Wilson
8718a51a5b
Close System.out and System.err streams when they are made unreachable.
...
Change-Id: I295a9b2e5eb2d4e94b042f3a51e2f39b58a47d49
http://b/3072844
2010-10-15 15:15:20 -07:00
Kenny Root
88b6faad2c
Import revised translations DO NOT MERGE
...
Change-Id: Ifa466bf152e7331f2ea16e925e714690d9034f3a
2010-10-15 15:11:18 -07:00
Andreas Huber
b04f356d86
Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread
2010-10-15 14:58:54 -07:00
Andreas Huber
ff7a7a455c
Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread
2010-10-15 14:58:05 -07:00
Dianne Hackborn
736f5ec476
Merge "Work on issue #3101415 : Crespo apps seem to have their UID changed over time." into gingerbread
2010-10-15 14:55:06 -07:00
Dianne Hackborn
8bdf5935c0
Work on issue #3101415 : Crespo apps seem to have their UID changed over time.
...
fsync!
Change-Id: Ie6c5397202579935ac69bf61d3e7b3081ecf269c
2010-10-15 14:46:33 -07:00
Irfan Sheriff
4e08a98541
Merge "fix build DO NOT MERGE" into gingerbread
2010-10-15 14:30:36 -07:00
Raphael Moll
cd9afc3722
am 729503c2: am 848a2bc4: Merge "MinGW/Cygwin requires open() in O_BINARY mode." into gingerbread
...
Merge commit '729503c280e0d5b2621a8b7a6c93dd20fe1f5d0f'
* commit '729503c280e0d5b2621a8b7a6c93dd20fe1f5d0f':
MinGW/Cygwin requires open() in O_BINARY mode.
2010-10-15 14:28:15 -07:00
Mathias Agopian
3577e98ffa
am 3d4a9774: am b0e020ab: Merge "may fix 3097381 and 3097482. don\'t abort on/off if the animation fails" into gingerbread
...
Merge commit '3d4a9774ced0c704da455c5bd9989127e90ba133'
* commit '3d4a9774ced0c704da455c5bd9989127e90ba133':
may fix 3097381 and 3097482. don't abort on/off if the animation fails
2010-10-15 14:28:07 -07:00
Jaikumar Ganesh
64144c4474
am 096a1e6c: am 8b525c07: Merge "Check for state before disconnecting." into gingerbread
...
Merge commit '096a1e6c83d3638788468dfb21a3b4662745d617'
* commit '096a1e6c83d3638788468dfb21a3b4662745d617':
Check for state before disconnecting.
2010-10-15 14:27:55 -07:00
Irfan Sheriff
84510802f1
fix build DO NOT MERGE
...
my local change and gerritt were out of sync
Change-Id: Ie581425f0290bb78b289584067b70507d82d5a57
2010-10-15 14:27:22 -07:00
Joe Malin
a79935afd0
am 439444d9: am 75d3591b: Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread
...
Merge commit '439444d9043c46669d2fe8694ed3db8f09d92282'
* commit '439444d9043c46669d2fe8694ed3db8f09d92282':
DOC CHANGE: Fix bug in Testing doc
2010-10-15 14:26:57 -07:00
John Wang
21420d6d84
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
2010-10-15 14:26:51 -07:00
Jeff Brown
a617fdc65b
am 567db077: am 2d441e14: Merge "Make sure EventHub reports added/removed devices immediately." into gingerbread
...
Merge commit '567db07702f851f2e7fb1fb0021ce2871469183e'
* commit '567db07702f851f2e7fb1fb0021ce2871469183e':
Make sure EventHub reports added/removed devices immediately.
2010-10-15 14:26:18 -07:00
Gil Dobjanschi
b9e9f6f7e9
Merge "Save the color for gradient effects"
2010-10-15 14:26:11 -07:00
Justin Ho
73dbdc35d4
Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread
2010-10-15 14:26:08 -07:00
Roy West
ecc105668c
am d23cc4b8: am 29f28cdc: Merge "Change storage names to match 10-13 decision" into gingerbread
...
Merge commit 'd23cc4b814c01675f6503c4dcab21655c56d0256'
* commit 'd23cc4b814c01675f6503c4dcab21655c56d0256':
Change storage names to match 10-13 decision
2010-10-15 14:26:08 -07:00
Joe Onorato
78fc85ce64
am 35d34c67: am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread
...
Merge commit '35d34c67b7e94639086f2392d674e59b82c26a42'
* commit '35d34c67b7e94639086f2392d674e59b82c26a42':
Do not build pbkdf2gen on non-Linux hosts
2010-10-15 14:25:59 -07:00
Gilles Debunne
672a2531ae
am 4fa7f4f4: am 53ea7f58: Merge "Really leave text selection mode when using the trackball." into gingerbread
...
Merge commit '4fa7f4f4963568258a6b4179176de8386cb5d3db'
* commit '4fa7f4f4963568258a6b4179176de8386cb5d3db':
Really leave text selection mode when using the trackball.
2010-10-15 14:25:48 -07:00
Shimeng (Simon) Wang
bf9cf4d80d
DO NOT MERGE
...
Add wrapper method for native JNI call.
This is to check whether a given mimeType is supported in Android media
framework.
issue: 3101402
Change-Id: Ic8b412c045c36113c830296dacb42ed5f7371c9d
2010-10-15 14:18:01 -07:00
Stephen Hines
6568896117
Add support for rsDebug with 64-bit types.
...
Bug: 3099081
Change-Id: Ieb3af7757489876ef951be8527aa73f69e1481fd
2010-10-15 14:17:55 -07:00
Ben Komalo
c1d71003fc
Merge "Fix Spinners that don't have a hard pixel width set. getDimensionPixelSize -> getLayoutDimension"
2010-10-15 14:10:57 -07:00
Shimeng (Simon) Wang
31e4d66ada
Merge "DO NOT MERGE" into gingerbread
2010-10-15 14:07:29 -07:00
Justin Ho
ff14aa16ba
DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
...
Change-Id: I9b91c4bc13909017f433724e7c21de0db690eff6
2010-10-15 14:03:57 -07:00
Hung-ying Tyan
0601be0803
am 4f5eb955: am bd57eeaf: SipService: add wake lock for multiple components.
...
Merge commit '4f5eb9550ba2cc037c4aa81613574a38a956dd5c'
* commit '4f5eb9550ba2cc037c4aa81613574a38a956dd5c':
SipService: add wake lock for multiple components.
2010-10-15 14:01:39 -07:00
Hung-ying Tyan
61312df607
am f3a935f6: am 3bb10442: Merge "Make SipService listen to WIFI state change events." into gingerbread
...
Merge commit 'f3a935f6aa421110c7b6f36f922223c195f751bc'
* commit 'f3a935f6aa421110c7b6f36f922223c195f751bc':
Make SipService listen to WIFI state change events.
2010-10-15 14:01:10 -07:00
Kenny Root
fcab0f5502
am 8fda1636: am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread
...
Merge commit '8fda1636e3e35f060b9046294efd3c062a1fdb84'
* commit '8fda1636e3e35f060b9046294efd3c062a1fdb84':
OBB: use PBKDF2 for key generation.
2010-10-15 14:00:58 -07:00
Romain Guy
10aca41e51
Merge "Fix clipping issue in StackView."
2010-10-15 14:00:17 -07:00
Leon Scroggins
36cb18cf06
Merge "Line up textfield with WebTextView more often." into gingerbread
2010-10-15 13:58:38 -07:00
Romain Guy
e5ebcb0107
Fix clipping issue in StackView.
...
Change-Id: I7ec28f25c3993a2bd7ef6399ba1923839d239905
2010-10-15 13:57:28 -07:00
Irfan Sheriff
f8834f878f
Merge "fetch macaddr right after supplicant connection" into gingerbread
2010-10-15 13:42:38 -07:00
David Brown
97d88927f2
am e3c50a54: am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread
...
Merge commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a'
* commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a':
Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
2010-10-15 13:40:16 -07:00
Justin Ho
fb8058e946
am d9fdcfda: (-s ours) am c9110970: Merge "Updated media transport controls" into gingerbread
...
Merge commit 'd9fdcfdaad2f8177f8fa2bed2d6bd978a28d7559'
* commit 'd9fdcfdaad2f8177f8fa2bed2d6bd978a28d7559':
Updated media transport controls
2010-10-15 13:39:31 -07:00
Gil Dobjanschi
f958f0fe9d
Save the color for gradient effects
...
Change-Id: I21e14344aa7410b5c99102ab41b4ec94db2fbe61
2010-10-15 13:38:03 -07:00
Shimeng (Simon) Wang
9f547a8ca8
DO NOT MERGE
...
Avoid sending false orientation event to webkit.
issue: 3101311
Change-Id: I819f046a119ad108256d6cece3f2e6ec1d643145
2010-10-15 13:34:49 -07:00
Justin Ho
23f786a9da
am 31e5901e: (-s ours) am b6634127: Merge "Updating popup center asset (v5)" into gingerbread
...
Merge commit '31e5901e4c1b753787bfc3c2aef3463c38f2d0eb'
* commit '31e5901e4c1b753787bfc3c2aef3463c38f2d0eb':
Updating popup center asset (v5)
2010-10-15 13:32:21 -07:00
Andreas Huber
a4f391c9bf
Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
...
Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6
related-to-bug: 3101573
2010-10-15 13:31:29 -07:00
Andreas Huber
6ac35f0597
Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
...
Change-Id: Ie2ecf9558d4ee80cb5a2bbe66ad49f2165a7b09c
related-to-bug: 3101573
2010-10-15 13:30:27 -07:00
Ben Komalo
bdaa34c670
Fix Spinners that don't have a hard pixel width set.
...
getDimensionPixelSize -> getLayoutDimension
Change-Id: Ic126955ad7c7cee3aea423c43fc16da02ec9664e
2010-10-15 13:27:11 -07:00
Kenny Root
f25d24b2c7
resolved conflicts for merge of 8b1082bb to master
...
Change-Id: If9d898123894c53bf83ac28cc7c03cd849c8ef17
2010-10-15 13:10:01 -07:00
Jaikumar Ganesh
db3694d030
am a905d955: am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread
...
Merge commit 'a905d9551103c5be465429ffeb0352b78058457e'
* commit 'a905d9551103c5be465429ffeb0352b78058457e':
Remove STOPSHIP and reduce log spam.
2010-10-15 12:44:39 -07:00
Scott Main
2c1dab4483
am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
...
Merge commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c' into gingerbread
* commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c':
docs: fix typo; surface dev guide link in package description
2010-10-15 12:35:04 -07:00
Scott Main
7f3addf37f
am 09da9609: docs: fix code snippet errors
...
Merge commit '09da96099917141f2b90d53f61baa822bdd434d7' into gingerbread
* commit '09da96099917141f2b90d53f61baa822bdd434d7':
docs: fix code snippet errors
2010-10-15 12:34:50 -07:00
Eric Laurent
0e7a4d9edc
Fix issue 3098880.
...
Test value returned by getJNIEnv() in android_media_AudioSystem_error_callback()
and exit if NULL.
Change-Id: If30e5a05c585f34c66e6ad8cece3f7b46ef4be8e
2010-10-15 12:33:16 -07:00
Ben Komalo
4138b33826
Merge "Apply values set in "dropDownWidth" attribute of Spinner styles."
2010-10-15 11:55:52 -07:00