21101 Commits

Author SHA1 Message Date
Irfan Sheriff
2b7f63887e Add support for supplicant SCAN_INTERVAL
Also, allow scan interval for framework and supplicant
to be configured at build time or run time

Bug: 4144882
Change-Id: I877f4bcc872597b44d3f4da85cf2bc0f16e09444
2011-04-06 09:11:15 -07:00
Jim Miller
27e61e454f Merge "Get LockScreen working on phones." 2011-03-30 20:07:50 -07:00
Jim Miller
ad32bf4844 Get LockScreen working on phones.
Not the final UI, but it works.

Change-Id: Ia31d23069b2c365f711cb9d0a664648623554768
2011-03-30 18:53:18 -07:00
Fabrice Di Meglio
0fb1ac0038 Merge "Code cleaning - suppress non useful code" 2011-03-30 18:39:38 -07:00
Fabrice Di Meglio
99e95b0e12 Code cleaning - suppress non useful code
Change-Id: I3f3bffdd1f5d64a6b601d56bee3b5fc8147086bd
2011-03-30 17:59:19 -07:00
Dianne Hackborn
47015057b1 am fd10e6ac: am a5b308e7: am 53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
* commit 'fd10e6ac5811f716954afdb91f9231d7fbaa0718':
  Expand screen documentation with explicit screen size dimensions.
2011-03-30 17:55:38 -07:00
Dianne Hackborn
fd10e6ac58 am a5b308e7: am 53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
* commit 'a5b308e74c44722b9414fa9be52eabacd23029b2':
  Expand screen documentation with explicit screen size dimensions.
2011-03-30 17:53:44 -07:00
Dianne Hackborn
a5b308e74c am 53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
* commit '53df89c74fb3a31a874ad575467c5d498a53646e':
  Expand screen documentation with explicit screen size dimensions.
2011-03-30 17:50:29 -07:00
Dianne Hackborn
53df89c74f Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1 2011-03-30 17:43:17 -07:00
Fabrice Di Meglio
70896f0535 Merge "Update TextLayoutCache key for supporting more SkPaint properties" 2011-03-30 17:34:42 -07:00
Jeff Brown
e028290d01 Merge "Add input filter mechanism for accessibility." 2011-03-30 17:20:56 -07:00
Jeff Brown
0029c66203 Add input filter mechanism for accessibility.
This patch adds a mechanism for capturing, filtering, transforming
and injecting input events at a very low level before the input
dispatcher attempts to deliver them to applications.  At this time,
the mechanism is only intended to be used by the accessibility
system to implement built-in system-level accessibility affordances.

The accessibility input filter is currently just a stub.
It logs the input events receives and reinjects them unchanged,
except that it transforms KEYCODE_Q into KEYCODE_Z.

Currently, the accessibility input filter is installed whenever
accessibility is enabled.  We'll probably want to change that
so it only enables the input filter when a screen reader is
installed and we want touch exploration.

Change-Id: I35764fdf75522b69d09ebd78c9766eb7593c1afe
2011-03-30 16:55:15 -07:00
Justin Ho
bacdc8108a am 0b397314: am 0b251aec: am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
* commit '0b3973143191962d3c4372523ed450f6a5bf0863':
  Replacing browser playback controls for inactive videos Bug: 4136024
2011-03-30 16:41:41 -07:00
Jeff Hamilton
284f965a59 am 016f8847: am b9896794: am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
* commit '016f8847471a9d4ffe6a03c29e0600529d51d929':
  Make STOP_APP_SWITCHES signatureOrSystem.
2011-03-30 16:40:34 -07:00
Brad Fitzpatrick
d117428bf9 am 5db7fd6b: am f7a9b869: am 1e7fb7ae: Merge "Error in compound cache-control header."
* commit '5db7fd6b70f47f31fbc59f92907b9807f9c4e64d':
  Error in compound cache-control header.
2011-03-30 16:38:18 -07:00
Jeff Hamilton
f9fb0abbd6 am 0c691f0e: am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID.
* commit '0c691f0eb3bc844e778f9a61e777076658879dfd':
  Update the value for the NFC shared UID.
2011-03-30 16:31:27 -07:00
Teng-Hui Zhu
29c7ae5c60 Merge "Buffering in full screen mode will show progressView" 2011-03-30 16:19:07 -07:00
Dianne Hackborn
2f98f26708 Expand screen documentation with explicit screen size dimensions.
This updates the various documentation on screen sizes to discuss
the exact screen dimensions that are now associated with each size.
In addition, the screen sizes vs. densities table is updated to
include a number of additional representative screens.

Change-Id: Id07491148b1857e0265cef7139e564e190f38e03
2011-03-30 16:19:02 -07:00
Fabrice Di Meglio
aabe537f1e Update TextLayoutCache key for supporting more SkPaint properties
Change-Id: I35bb991e536e662c1a0724ab7e311fba3d52487a
2011-03-30 16:06:02 -07:00
Teng-Hui Zhu
f4d4e9e05f Buffering in full screen mode will show progressView
bug:4187252
Change-Id: Ieb7ae26b5bfa9abc79556e2fc063b7e3ef17ab52
2011-03-30 16:05:27 -07:00
Justin Ho
0b39731431 am 0b251aec: am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
* commit '0b251aec4307d566ebb1a95f8b1136d6d5b8d5a6':
  Replacing browser playback controls for inactive videos Bug: 4136024
2011-03-30 16:00:50 -07:00
Justin Ho
0b251aec43 am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
* commit '01b13a11e6492ebba66c496eaefdb008f2638870':
  Replacing browser playback controls for inactive videos Bug: 4136024
2011-03-30 15:59:19 -07:00
Jeff Hamilton
016f884747 am b9896794: am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
* commit 'b98967942e9a764b80abc8ff1c6f6f2d620c0f7a':
  Make STOP_APP_SWITCHES signatureOrSystem.
2011-03-30 15:18:30 -07:00
Justin Ho
c7de6dd483 Replacing browser playback controls for inactive videos
Bug: 4136024

Change-Id: I1c48023005d711d5080fa17a695f709705e362b6
2011-03-30 14:21:28 -07:00
Daniel Sandler
5317509129 Merge "Add missing dimension resource." 2011-03-30 12:56:09 -07:00
Daniel Sandler
bdf37690f3 Add missing dimension resource.
Bug: 4192397
Change-Id: I1912fffc8800ef522063bf42ffe08e752ae1350f
2011-03-30 15:25:38 -04:00
Fabrice Di Meglio
4111bec3b6 Merge "Fix text redering issue where the text was sometimes truncated" 2011-03-30 12:01:52 -07:00
Adam Powell
5251940341 Merge "Fix public issue 15862: Theme Theme.Holo.Light.NoActionBar not available for use" 2011-03-30 11:48:58 -07:00
Winson Chung
53ecd4f5cf Merge "Deprecating old RemoteViews API which takes appWidgetId when setting the RemoteViewsAdapter intent." 2011-03-30 11:44:08 -07:00
Adam Powell
54ab310e60 Fix public issue 15862: Theme Theme.Holo.Light.NoActionBar not available for use
Change-Id: Ieb8127772cd62663d11ef893b47f9b2c7068391c
2011-03-30 11:34:00 -07:00
Winson Chung
037300bba5 Deprecating old RemoteViews API which takes appWidgetId when setting the RemoteViewsAdapter intent.
Change-Id: I72edaa839ae0633a1a24d8f69f5f8c664832ed30
2011-03-30 09:37:09 -07:00
Jeff Hamilton
b98967942e am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
* commit '96cf34d362a1666683e813af915e4f6e0d1b38a0':
  Make STOP_APP_SWITCHES signatureOrSystem.
2011-03-30 09:30:40 -07:00
Irfan Sheriff
11ebb6f502 am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
* commit '05f14e2bcf78be62b35e85902408ea66103a3881':
  DO NOT MERGE Pick upstream intf with valid IP conf
2011-03-30 09:30:32 -07:00
Robert Greenwalt
ce6766ea51 am 568845a7: Merge "Fix some alt-network issues." into gingerbread
* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
  Fix some alt-network issues.
2011-03-30 09:30:15 -07:00
Brad Fitzpatrick
5db7fd6b70 am f7a9b869: am 1e7fb7ae: Merge "Error in compound cache-control header."
* commit 'f7a9b8691918642db74a667a71028c0a77b527ff':
  Error in compound cache-control header.
2011-03-30 08:21:23 -07:00
Brian Carlstrom
07fe409787 Merge "SamplingProfilerIntegration and SamplingProfiler improvements (3/3)" 2011-03-29 22:35:40 -07:00
Fabrice Di Meglio
eee49c699c Fix text redering issue where the text was sometimes truncated
- mostly was visible in Settings apps / Wi-Fi networks summary info for each network
- correctly setup the local SkPaint for advances computation
- improve test app for adding live resizing

Change-Id: Ia031fe1b115b521ba55c7e68f2a26300f02e48ca
2011-03-29 19:44:33 -07:00
Teng-Hui Zhu
1ef63fd2ed Merge "Add the loading progress UI when buffering" 2011-03-29 16:58:19 -07:00
Jeff Hamilton
0c691f0eb3 am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID.
* commit 'ad91eee2774e18204a14d473242efe5640b91152':
  Update the value for the NFC shared UID.
2011-03-29 16:28:49 -07:00
Christopher Tate
3d4bf17f49 Add view/drawable states for drag-accepting / drag-hovered
Added new drag_can_accept and drag_hovered XML attributes and the View
logic to support them.  Drawable states are now refreshed automatically
when a drag starts/ends and when a drag crosses the boundary of a
participating view.

Change-Id: I25f8ee02c83b3fa4f27201997d7eabf4be653fd8
2011-03-29 15:27:58 -07:00
Teng-Hui Zhu
c0fccd1292 Add the loading progress UI when buffering
bug:4187252
Change-Id: I0f9f2c659303b391b1be896b9a30cc6bf7455da5
2011-03-29 15:07:35 -07:00
Eric Fischer
7d5ae75378 am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'bc2489e4c55ca7ae06afe1f3449135aa48359165':
  Import revised translations.  DO NOT MERGE
2011-03-29 12:27:29 -07:00
Eric Fischer
bc2489e4c5 am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'f5cedbe508c46c27a6ce1554aed919bfbfc6fc4e':
  Import revised translations.  DO NOT MERGE
2011-03-29 12:20:42 -07:00
Eric Fischer
627e59ad08 Import revised translations. DO NOT MERGE
Change-Id: I962bb9917aa3f3d4b911c1ad7fdfbcda94afa0c7
2011-03-29 11:58:23 -07:00
Brian Carlstrom
ed7e00729f SamplingProfilerIntegration and SamplingProfiler improvements (3/3)
Summary:

frameworks/base
- fix profiling to collect data beyond the first snapshot
- avoid many small files, accumulate data over process lifetime

libcore:
- add support for VM specific sampling, trying to cut down overhead
- added support for converting snapshot files to text format
- fixed race in profiler when stopping

dalvik
- added VMStack.setThreadStackTrace interface for filling a stack
  trace into an existing StackTraceElement[]

Details:

frameworks/base

    Changed snapshots from text to binary hprof format (bumping version to 3)
    Changed from one file per snapshot to one file per process lifetime.
    Restart profiling after snapshot.

	core/java/com/android/internal/os/SamplingProfilerIntegration.java

    Add quick test in maybeSnapshot to avoid doing work when the
    SamplingProfilerIntegration is disabled. Make maybeSnapshot
    private. Remove unneeded memory allocation in handleLowMemory.

	core/java/android/app/ActivityThread.java

libcore

    Added ThreadSampler interface. This allows VM specific thread
    sampling optimizations. The portable version continues to use
    Thread.getStackTrace().

	dalvik/src/main/java/dalvik/system/profiler/ThreadSampler.java
	dalvik/src/main/java/dalvik/system/profiler/PortableThreadSampler.java
	dalvik/src/main/java/dalvik/system/profiler/SamplingProfiler.java

    Add VMStack.setThreadStackTrace and use in new DalvikThreadSampler
    to avoid allocating a full stack trace when only a limited depth
    is desired.

	dalvik/src/main/java/dalvik/system/profiler/DalvikThreadSampler.java
	dalvik/src/main/java/dalvik/system/VMStack.java

    Refactored BinaryHprof.readMagic out of BinaryHprofReader so it
    can be used by HprofBinaryToAscii converter to probing file
    types. Added magic number constant to be shared between readMagic
    and BinaryHprofWriter.

	dalvik/src/main/java/dalvik/system/profiler/BinaryHprof.java
	dalvik/src/main/java/dalvik/system/profiler/BinaryHprofReader.java
	dalvik/src/main/java/dalvik/system/profiler/BinaryHprofWriter.java
	dalvik/src/main/java/dalvik/system/profiler/HprofBinaryToAscii.java

    Removed unneeded HprofWriter interface. Changed to simpler static
    interface to write HprofData to binary and text formats.

	dalvik/src/main/java/dalvik/system/profiler/HprofWriter.java
	dalvik/src/main/java/dalvik/system/profiler/AsciiHprofWriter.java
	dalvik/src/main/java/dalvik/system/profiler/BinaryHprofWriter.java
	dalvik/src/test/java/dalvik/system/profiler/SamplingProfilerTest.java

    Added support for reading snapshot files created by
    SamplingProfilerIntegration by stripping the text header to allow
    easier conversion to the text format.

	dalvik/src/main/java/dalvik/system/profiler/HprofBinaryToAscii.java

    Fixed race between Sampler and
    SamplingProfiler.stop. SamplingProfiler.stop previously simply
    called the Sampler's TimerTask.cancel method, but this does not
    wait for a currently running Sampler to finish. The TimerTask
    documentation says the only reliable way to do this is to have the
    run() cancel itself, so that is what is now done, with new code to
    ensure that SamplingProfiler.stop does not return until the
    Sampler has been terminated.

	dalvik/src/main/java/dalvik/system/profiler/SamplingProfiler.java

dalvik

   Refactored VMStack_getThreadStackTrace to create helper getTraceBuf
   used to implement new VMStack_setThreadStackTrace. The new version
   interface fills an existing StackTraceElement[], avoid allocating
   unnecessary StackTraceElements.

	vm/native/dalvik_system_VMStack.c

   Refactor dvmGetStackTraceRaw to create dvmSetStackTraceRaw which
   fills in an existing, potentially smaller, StackTraceElement[].

	vm/Exception.c
	vm/Exception.h

   Change stack depths to be unsigned to avoid signed/unsigned comparison warnings.

	vm/Ddm.c
	vm/Exception.c
	vm/Exception.h

Change-Id: I4b90255e4e1d33ea2b569321c4968b0f3369f251
2011-03-29 11:24:37 -07:00
Brad Fitzpatrick
f7a9b86919 am 1e7fb7ae: Merge "Error in compound cache-control header."
* commit '1e7fb7aed7b00cebc8f0e501c911727af6527523':
  Error in compound cache-control header.
2011-03-29 09:27:16 -07:00
Henrik Baard
eb0ced7a09 Error in compound cache-control header.
A cache control header containing both no-cache and max-age attribute does not
behave as expected.

Cache-Control: no-cache, max-age=200000

Will set expired to 20000ms seconds, ignoring the no-cache header. My
interpretation is that the no-cache header should not be ignored in
this case.

Change-Id: Iadd1900e4d2c6c0dacc6bb3e7b944cf78ca9b266
2011-03-29 08:54:09 +02:00
Jeff Sharkey
67bcd82b40 Merge "Support Ctrl-based EditText movement." 2011-03-28 19:57:10 -07:00
Matthew Xie
571a24bfe3 Merge "Use mask_eighth_bit function to replace is_ascii check." 2011-03-28 18:13:59 -07:00
Jack Palevich
73108675c9 Add Java support for a few accidentally omitted OpenGL ES APIs.
Fixes 3491494 Support OpenGL APIs: glBlendEquationSeparate and friends

Change-Id: I8fdc94b6ea14e9a7e3d402a965d500790a3d8f77
2011-03-28 14:49:12 -07:00