864 Commits

Author SHA1 Message Date
Joe Onorato
0b6232da89 These are not javadoc tags, they are annotations in sample code. Escape them properly. 2010-09-16 12:57:18 -04:00
Adam Powell
0b2d306e70 Style new popup widgets.
Change-Id: I208ed292afd9919071778baa9ea61d7ca9e7743c
2010-09-15 14:39:48 -07:00
Daisuke Miyakawa
88b7349125 Take apart LocalePicker#onListItemClick() into two
It takes some time when Locale is actually switched by the system,
which looks "system halt". Previous implementation doesn't allow
developers to cope with the situation and they just had to let
users wait for a moment.

This change allows the LocalePicker users (developers) to hook
the item change and delay the actual halt. If they don't want it,
calling updateLocale() immediately works fine.

Related
- I29685118467bd2a68b80abcf234f91098839be0b
- Iba7378e51e6d5318e901045ebeda63ea954a0647

Change-Id: I4062a70e11600d87e889b40d30796387c7069e21
2010-09-15 09:21:25 -07:00
Dianne Hackborn
e746f03c6c resolved conflicts for merge of 53686433 to master
Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d
2010-09-13 16:56:10 -07:00
Dianne Hackborn
53686433a9 am 7e9f4eb2: Track client requests through location manager.
Merge commit '7e9f4eb2608148436cef36c9969bf8a599b39e72' into gingerbread-plus-aosp

* commit '7e9f4eb2608148436cef36c9969bf8a599b39e72':
  Track client requests through location manager.
2010-09-13 14:34:22 -07:00
Dianne Hackborn
7e9f4eb260 Track client requests through location manager.
This fixes a problem where applications could ask the location
manager to do very heavy-weight things (like...  say... update
location every minute), which would get accounted against the
system instead of the application because ultimately it is the
system making the heavy calls (wake locks, etc).

To solve this, we introduce a new class WorkSource representing
the source of some work.  Wake locks and Wifi locks allow you
to set the source to use (but only if you are system code and thus
can get the permission to do so), which is what will be reported
to the battery stats until the actual caller.

For the initial implementation, the location manager keeps track
of all clients requesting periodic updates, and tells its providers
about them as a WorkSource param when setting their min update time.
The network location provider uses this to set the source on the
wake and wifi locks it acquires, when doing work because of the
update period.

This should also be used elsewhere, such as in the GPS provider,
but this is a good start.

Change-Id: I2b6ffafad9e90ecf15d7c502e2db675fd52ae3cf
2010-09-13 14:20:48 -07:00
Jeff Brown
19c9c7cc6d am fb8116f7: am c891d2b3: Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread
Merge commit 'fb8116f736f2df6d1b2f8044541390a9fd9953cb'

* commit 'fb8116f736f2df6d1b2f8044541390a9fd9953cb':
  Fix PointerLocationView when pointer ids are not zero-based.
2010-09-12 20:50:16 -07:00
Jeff Brown
fb8116f736 am c891d2b3: Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread
Merge commit 'c891d2b3529b9cf24ef4781a585cd4784815e711' into gingerbread-plus-aosp

* commit 'c891d2b3529b9cf24ef4781a585cd4784815e711':
  Fix PointerLocationView when pointer ids are not zero-based.
2010-09-12 20:47:50 -07:00
Jeff Brown
d1e0c371a6 Fix PointerLocationView when pointer ids are not zero-based.
Since we support using driver-provided pointer ids (ABS_MT_TRACKING_ID)
there is no guarantee that pointer ids will necessarily start from 0
or be contiguous.

Change-Id: I9609b7a3bb238d7edbcbd68cc839dd6d14baf9df
2010-09-12 20:40:51 -07:00
Adam Powell
cf78b3e510 Add support for custom action views in ActionBar menus
Change-Id: Ic7850bc00fcfe95d805dd6a1b15cb5d413942475
2010-09-12 18:33:44 -07:00
Kenny Root
5d8b320428 am 1361a5bd: am 07a9e8d3: Merge changes Ie3648509,I53db73c3 into gingerbread
Merge commit '1361a5bd1eba1cae16c301622324153c3d50b84c'

* commit '1361a5bd1eba1cae16c301622324153c3d50b84c':
  Move native library removal function to helper
  Initialize native library path in PackageSetting
2010-09-12 18:06:07 -07:00
Kenny Root
1361a5bd1e am 07a9e8d3: Merge changes Ie3648509,I53db73c3 into gingerbread
Merge commit '07a9e8d39f818e54f0feccff10c99b9629007a64' into gingerbread-plus-aosp

* commit '07a9e8d39f818e54f0feccff10c99b9629007a64':
  Move native library removal function to helper
  Initialize native library path in PackageSetting
2010-09-12 18:02:47 -07:00
Adam Powell
2a5a53709e Fix broken ActionMode close button styling
Change-Id: I425df1433d43c1b2bd392464ed10142532640f81
2010-09-12 15:51:18 -07:00
Joe Onorato
f63b0f44eb Connect my plumbing to dsandler's awesome lights out mode.
It took a little bit of refactoring to move the authoritative state
about whether the lights are on or not into the StatusBarManagerService,
so that if the system ui process crashes, the bar comes up in the
right mode.

Change-Id: I95cfaf8f78ca4443ded5262272ea755d44dc5d17
2010-09-12 17:06:01 -04:00
Joe Onorato
9305647eb6 Plumb lights out mode through from the window manager to the status bar running in the system ui process.
Lights out mode itself isn't implemented.

Change-Id: Ieeef0eb9ae5be23000f770e74e8ee66472f4c673
2010-09-12 13:25:06 -04:00
Kenny Root
8f7cc02c7c Move native library removal function to helper
Moves the remoteNativeLibrariesLI call to NativeLibraryHelper to prepare
for being able to symlink the /data/data/<package>/lib dir to the ASEC
container.

Change-Id: Ie3648509c6b6293a8d9bdd815610ab408df5047f
2010-09-12 09:04:56 -07:00
Adam Powell
b3f245c30c Allow the theme to affect action bar menus
Change-Id: Ie914881de626415886289e830fb1ff166ce13159
2010-09-10 15:40:49 -07:00
Adam Powell
bc234a19f4 Clean up action bar styles
Change-Id: Ib19698e08d643994c4416aac29a43e9197bbe1f3
2010-09-10 11:51:10 -07:00
Dianne Hackborn
8615fdc151 am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread
Merge commit '506d724cc356a7ba73995ef2929c65062277c83d' into gingerbread-plus-aosp

* commit '506d724cc356a7ba73995ef2929c65062277c83d':
  DO NOT MERGE.  I like'd ctate's change so much I'm doin it myself!
2010-09-09 23:14:46 -07:00
Dianne Hackborn
618b8c1e98 DO NOT MERGE. I like'd ctate's change so much I'm doin it myself!
Change-Id: If571d3ff5e73252a0653c30ec40178ec1591ddd9
2010-09-09 23:10:38 -07:00
Dianne Hackborn
c6ded1ba46 am 195dc210: am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread
Merge commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c'

* commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c':
  Small fixes to battery stats.
2010-09-09 21:39:13 -07:00
Dianne Hackborn
195dc210cb am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread
Merge commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2' into gingerbread-plus-aosp

* commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2':
  Small fixes to battery stats.
2010-09-09 21:34:33 -07:00
Dianne Hackborn
a4ce31f5e0 Merge "Small fixes to battery stats." into gingerbread 2010-09-09 21:30:52 -07:00
Dianne Hackborn
b8071d790a Small fixes to battery stats.
Change-Id: Ibbf7c548a8e787a046de3659094cea64908e3deb
2010-09-09 16:45:15 -07:00
Christopher Tate
c32e3275fe Merge "Don't crash in batterystats" 2010-09-09 15:53:09 -07:00
Christopher Tate
898c4dc59f Don't crash in batterystats
The number of timers to allocate time shares to is calculated by
disregarding system-UID execution.  However, the actual allocation
of time *was* considering system-UID locks as well.  This wound up
trying to share time across more timers than had been counted in the
first pass, leading to divide-by-zero exceptions.

This patch changes the logic to account the time slice only to
non-system-UID entities, in keeping with the commentary.

Change-Id: I7384a3c269aea44e52bc983927f9417e11613ad5
2010-09-09 13:09:36 -07:00
Adam Powell
079fd1c0a3 Make action buttons more style-based
Change-Id: Ia7ef4da8d8004f1b3809b4883aafc541695d235a
2010-09-08 21:40:54 -07:00
Mathias Agopian
62ecf53538 am 3fa7d8af: am 9bfb060a: Merge "Force wallpaper surface to 565." into gingerbread
Merge commit '3fa7d8af6560de07ef673f73308f7e51de64e4ec'

* commit '3fa7d8af6560de07ef673f73308f7e51de64e4ec':
  Force wallpaper surface to 565.
2010-09-08 16:50:13 -07:00
Mathias Agopian
3fa7d8af65 am 9bfb060a: Merge "Force wallpaper surface to 565." into gingerbread
Merge commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8' into gingerbread-plus-aosp

* commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8':
  Force wallpaper surface to 565.
2010-09-08 16:46:46 -07:00
Mathias Agopian
9bfb060ac4 Merge "Force wallpaper surface to 565." into gingerbread 2010-09-08 16:43:42 -07:00
Mathias Agopian
62bf4a0283 Force wallpaper surface to 565.
This is to maintain backward compatibility with badly programmed
GL wallpapers. Wallpapers can call SurfaceHolder.setFormat() to
request a different format.

Change-Id: Ib42b0cf6c7040d1300cad239c3acfd5c4c6cd326
2010-09-08 16:32:27 -07:00
Adam Powell
75c923e3ec Merge "Added resources and styles for ActionBar tabs" 2010-09-08 16:14:47 -07:00
Adam Powell
ca259f4081 Added resources and styles for ActionBar tabs
Change-Id: I7ba5502146dec2d71b3e9ff57d90e7b5bd2bc2a0
2010-09-08 16:13:48 -07:00
Dianne Hackborn
467e8e1332 am 5fdacb8a: am ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread
Merge commit '5fdacb8a2818136218afdea4308ad1b10049a201'

* commit '5fdacb8a2818136218afdea4308ad1b10049a201':
  People holding partial wake locks now get blamed for CPU usage.
2010-09-08 14:38:20 -07:00
Dianne Hackborn
5fdacb8a28 am ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread
Merge commit 'ee455f5a9572bc0d23c3328f6c22da91dc109a50' into gingerbread-plus-aosp

* commit 'ee455f5a9572bc0d23c3328f6c22da91dc109a50':
  People holding partial wake locks now get blamed for CPU usage.
2010-09-08 14:34:41 -07:00
Dianne Hackborn
0d903a84d0 People holding partial wake locks now get blamed for CPU usage.
For the duration of the wake lock, 50% of all CPU usage is now
accounted against the app(s) holding partial wake locks, evenly
distributed between them.  This is only while the device is on
battery and screen off.

Change-Id: I3e5c978b792b6ef17bf8540705bfe8343dadd464
2010-09-08 12:41:24 -07:00
Chet Haase
a18a86b43e Rename several animation classes
Change-Id: I6a4544875090db485163c8d56de8718f56d267c7
2010-09-08 09:41:21 -07:00
Adam Powell
2b6230e0de Reworking the ActionBar tab API
Change-Id: Ifbcdc61b4a24633cc1a329c73923b95b03e9ecf0
2010-09-07 21:02:12 -07:00
Dianne Hackborn
d0438da05c am 75f0024c: am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread
Merge commit '75f0024cf40eadb2cdaa6ae53409c515b68f21c1'

* commit '75f0024cf40eadb2cdaa6ae53409c515b68f21c1':
  Fixes to battery stats debug output.
2010-09-07 15:16:38 -07:00
Dianne Hackborn
75f0024cf4 am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread
Merge commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026' into gingerbread-plus-aosp

* commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026':
  Fixes to battery stats debug output.
2010-09-07 14:15:17 -07:00
Dianne Hackborn
b5e3165129 Fixes to battery stats debug output.
Change-Id: I32e7cad9633b8c517a74573069e426d9f835a83d
2010-09-07 14:09:36 -07:00
Jim Miller
783cb60ddb Update RecentApplications to use shared Carousel widget.
Change-Id: I5ca7389aeca9ee6f03f48317f9d1034f9fb8c1ca
2010-09-03 17:44:57 -07:00
Adam Powell
00df32d439 Handle disabled state for action menu items
Change-Id: Id80926aef5f8f2f47703a7b1e3da38e6117edb30
2010-09-02 13:58:35 -07:00
Brian Carlstrom
c9ad7c6dbb resolved conflicts for merge of 41e99538 to master
Change-Id: Idddb72e369f127cd74322c3c7385701c2412e343
2010-09-01 12:41:36 -07:00
Brian Carlstrom
41e9953863 am 17510863: New Java-based SamplingProfiler
Merge commit '1751086360056bc60d00f2ed2988bc82be9e7bd9' into gingerbread-plus-aosp

* commit '1751086360056bc60d00f2ed2988bc82be9e7bd9':
  New Java-based SamplingProfiler
2010-09-01 10:44:56 -07:00
Brian Carlstrom
1751086360 New Java-based SamplingProfiler
Summary:
- libcore: new Java based SamplingProfiler
- dalvik: remove old SamplingProfiler native bits
- frameworks/base: New placeholder SamplingProfilerIntegration
- vendor/google: remove old profiler snapshot parsing code

Details:

libcore

   A new 100% Java SamplingProfiler. While it has more overhead that
   the old native one, the new one can actually collect more than the
   current PC and frame pointer, so you can get useful context of
   where your app is spending time. It currently provides ASCII hprof
   format output for use with tools like PerfAnal
	dalvik/src/main/java/dalvik/system/SamplingProfiler.java

    Unit test for the new SamplingProfiler
	dalvik/src/test/java/dalvik/system/SamplingProfilerTest.java

    Add core-tests-dalvik
	JavaLibrary.mk

dalvik

    Removing native code that supported the old SamplingProfiler
	vm/Dvm.mk
	vm/native/InternalNative.c
	vm/native/dalvik_system_SamplingProfiler.c

frameworks/base

  Placeholder SamplingProfilerIntegration. Later plans include
  generating EventStackTrace protobufs.

    New SamplingProfiler does not have a global instance, so
    SamplingProfilerIntegration provides one in INSTANCE. Old binary
    snapshot format is temporily replaced with ASCII hprof data.
	core/java/com/android/internal/os/SamplingProfilerIntegration.java

    Simplified interface for zygote profile snapshotting
	core/java/com/android/internal/os/ZygoteInit.java

    Current SamplingProfilerIntegration does not track event loop
    explicitly, but hprof information does include thread information.
	core/java/android/app/ActivityThread.java

vendor/google

    Removing code for parsing old SamplingProfiler snapshot format
	tools/samplingprofiler/Android.mk
	tools/samplingprofiler/NOTICE
	tools/samplingprofiler/profiler.iml
	tools/samplingprofiler/profiler.ipr
	tools/samplingprofiler/pull-snapshots.sh
	tools/samplingprofiler/sorttable.js
	tools/samplingprofiler/src/com/android/profiler/PrintHtml.java
2010-09-01 10:17:25 -07:00
Daisuke Miyakawa
a43b74a4ef Add LocalePicker fragment as one of internal components.
LocalePicker is in Settings, but we want this in framework
so that we are able to use it from other Setting-like
applications.

Also brings two string-arrays for descripting Chinise locales, which
have been in Settings app.

See also I1364c4810a115958662ca5d6e6e7f29c0c9b2569, for example.

Change-Id: I8a398b9b77601cf88ea8a3840b92dcf7441e6103
2010-08-31 16:22:40 -07:00
Jeff Brown
22f5ee9374 am 36f0cb26: am 8d60866e: Input device calibration and capabilities.
Merge commit '36f0cb26cbb4ef62995ff2e5a540cf8814e7f030'

* commit '36f0cb26cbb4ef62995ff2e5a540cf8814e7f030':
  Input device calibration and capabilities.
2010-08-30 18:29:12 -07:00
Jeff Brown
36f0cb26cb am 8d60866e: Input device calibration and capabilities.
Merge commit '8d60866e2100db70ecf0502c14768a384514d7e9' into gingerbread-plus-aosp

* commit '8d60866e2100db70ecf0502c14768a384514d7e9':
  Input device calibration and capabilities.
2010-08-30 18:22:32 -07:00
Jeff Brown
8d60866e21 Input device calibration and capabilities.
Finished the input device capability API.
Added a mechanism for calibrating touch devices to obtain more
accurate information about the touch contact area.
Improved pointer location to show new coordinates and capabilities.
Optimized pointer location display and formatting to avoid allocating large
numbers of temporary objects.  The GC churn was causing the application to
stutter very badly when more than a couple of fingers were down).
Added more diagnostics.

Change-Id: Ie25380278ed6f16c5b04cd9df848015850383498
2010-08-30 18:16:43 -07:00