13332 Commits

Author SHA1 Message Date
Adam Cohen
3bdc7209b1 Merge "AdapterViewAnimator now properly handles notifyDataSetChanged" 2010-09-08 17:43:17 -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
Gilles Debunne
fd1a8945be am de5cfcb6: am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Merge commit 'de5cfcb608f3432d98ae17e0febb6e726df79e90'

* commit 'de5cfcb608f3432d98ae17e0febb6e726df79e90':
  Fix for a memory leak in TextKeyListener.
2010-09-08 15:50:50 -07:00
Robert Greenwalt
fa01889064 Merge "Some cleanup of Proxy class." 2010-09-08 15:35:40 -07:00
Romain Guy
53e7ae9065 Merge "Fix possible infinite loop when purging textures." 2010-09-08 15:16:13 -07:00
Romain Guy
9aaa8269a3 Fix possible infinite loop when purging textures.
Change-Id: Ib05b398ae03e734da2dab0496df416fed4570b1c
2010-09-08 15:15:43 -07:00
Gilles Debunne
de5cfcb608 am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Merge commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050' into gingerbread-plus-aosp

* commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050':
  Fix for a memory leak in TextKeyListener.
2010-09-08 15:02:20 -07:00
Gilles Debunne
d9c80ab31a Merge "Fix for a memory leak in TextKeyListener." into gingerbread 2010-09-08 14:58:23 -07:00
Adam Cohen
bd0136a2fd AdapterViewAnimator now properly handles notifyDataSetChanged
Change-Id: Icc22671b76d49c4229f118f77a5c269253a07b84
2010-09-08 14:58:16 -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
Jake Hamby
94bf9431e5 am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Merge commit 'e75783440a55fb0a5ef75066be94a11898f652f0'

* commit 'e75783440a55fb0a5ef75066be94a11898f652f0':
  Allow incoming SMS until internal storage is almost full.
2010-09-08 14:38:15 -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
Jake Hamby
e75783440a am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Merge commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78' into gingerbread-plus-aosp

* commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78':
  Allow incoming SMS until internal storage is almost full.
2010-09-08 14:34:31 -07:00
Joe Onorato
de6386b8a6 Merge "move recent apps around, attempting to make it not crash." 2010-09-08 14:30:05 -07:00
Joe Onorato
013cfc1116 move recent apps around, attempting to make it not crash.
I think the problem is some kind of Context mismatch because the resource was in the framework but
referencing an app class.

Change-Id: Ia6b37c9c8be5dddc836331859e779cd80dd32596
2010-09-08 17:27:41 -04:00
Dianne Hackborn
ee455f5a95 Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread 2010-09-08 14:15:35 -07:00
Jeff Brown
b380c4d7ed resolved conflicts for merge of a05088c1 to master
Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521
2010-09-08 13:02:55 -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
Jake Hamby
bb37163323 Allow incoming SMS until internal storage is almost full.
Fix for bug 2382830: new incoming SMS should not be rejected when
running low on internal phone storage.

Testing revealed that the /data partition should have at least 256 KiB
available in order to prevent random app crashes (including system apps)
due to SQLite transaction failures. With 256 KiB free, the device should
safely boot without storage full errors. This takes into account the
36-40 KiB that the YAFFS2 filesystem reports as available even after
the partition has been completely filled. I've set the default full
threshold to 1 MiB to provide a generous safety margin.

For this bug, I changed the DeviceStorageMonitorService demon to send
two new hidden notifications for device storage "full" and "not full",
when the free space falls below the full threshold (default 1 MiB,
but configurable as a system setting), in addition to the existing
storage low/okay notifications sent when the storage crosses the threshold
of 90% full (also configurable).

The SMS code was changed to use these new notifications so that it can
accept messages until the data partition has been filled to the maximum
safe capacity rather than stopping when it hits 90% full. There should
be no negative impact on battery life because the additional check in
the storage polling service should be offset by an optimization to cache
the free threshold values which were previously being computed every time
through the loop.

While testing this change, I discovered that SMSDispatcher was being
instantiated twice, the first time in GSMPhone/CDMAPhone, and the second
time in SimSmsInterfaceManager / RuimSmsInterfaceManager. Changed the code
to pass the original SMSDispatcher to the Sim/RuimSmsInterfaceManager
constructor.

Change-Id: Ie0c6d05294778ab6ee42e0fa01313af96d824c77
2010-09-08 12:37:18 -07:00
Jeff Brown
a05088c18d am 85a31767: Add support for secure views.
Merge commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6' into gingerbread-plus-aosp

* commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6':
  Add support for secure views.
2010-09-08 11:55:24 -07:00
Jeff Brown
85a3176704 Add support for secure views.
Added the MotionEvent.FLAG_WINDOW_IS_OBSCURED flag which is set by the
input manager whenever another visible window is partly or wholly obscured
the target of a touch event so that applications can filter touches
accordingly.

Added a "filterTouchesWhenObscured" attribute to View which can be used to
enable filtering of touches when the view's window is obscured.

Change-Id: I936d9c85013fd2d77fb296a600528d30a29027d2
2010-09-08 11:50:55 -07:00
Gilles Debunne
d35180cf52 Fix for a memory leak in TextKeyListener.
Open source contribution https://review.source.android.com/#change,16985

Change-Id: Iebf09e147dd26575ca1a3f02180a678583671a68
2010-09-08 11:26:55 -07:00
Jean-Baptiste Queru
cf67abbc48 am 6ffee9bb: Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp
Merge commit '6ffee9bbba53700d33456261b986ac8a3f333b9e'

* commit '6ffee9bbba53700d33456261b986ac8a3f333b9e':
  Revert "resolve conflicts"
2010-09-08 11:07:30 -07:00
Erik
d41b037c6b am c4f628a1: am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Merge commit 'c4f628a1ba359926cf53ed7652d9abba6ea29123'

* commit 'c4f628a1ba359926cf53ed7652d9abba6ea29123':
  Adds a time zone parameter to formatDateRange
2010-09-08 11:04:41 -07:00
Jean-Baptiste Queru
6ffee9bbba Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp 2010-09-08 11:03:22 -07:00
Jean-Baptiste Queru
2cc595af65 Revert "resolve conflicts"
This reverts commit 84f992a249491b9f755e879bf096baac3f9472f5.
2010-09-08 11:01:40 -07:00
Erik
c4f628a1ba am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Merge commit 'c0b4f6d30d962d75125628317b5f5ea622531dfe' into gingerbread-plus-aosp

* commit 'c0b4f6d30d962d75125628317b5f5ea622531dfe':
  Adds a time zone parameter to formatDateRange
2010-09-08 11:01:27 -07:00
Erik
c0b4f6d30d Merge "Adds a time zone parameter to formatDateRange" into gingerbread 2010-09-08 10:58:12 -07:00
Erik
577ec9eb3a Adds a time zone parameter to formatDateRange
For a critical feature request in Calendar we need the ability
to format a date range in a time zone other than the local tz.
This adds a new method signature to formatDateRange to allow for
a tz to be specified and maintains the old behavior if the parameter
is not used. Also deprecates the FORMAT_UTC flag.

Change-Id: I16b3e939760ec86c954b51a318d01b7bbf86acc9
2010-09-08 10:53:40 -07:00
Mike Lockwood
33788f9fb5 Merge changes Ib18b93bf,I4c86d7e3
* changes:
  MTP: Allow transfering arbitrary file types.
  Rename the media database's "objects" table to "files"
2010-09-08 10:52:44 -07:00
Elliott Hughes
cfa5903926 am 664c48e9: am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread
Merge commit '664c48e991a70d07646d54125e97f579f3a33be4'

* commit '664c48e991a70d07646d54125e97f579f3a33be4':
  Remove dead code: NIOBuffer.
2010-09-08 10:38:41 -07:00
Gilles Debunne
d4fd86d19a am 468394fc: Text Selection: smart word detection. DO NOT MERGE.
Merge commit '468394fc6d1cb0c9078c2f98aa056860f7e0d743' into gingerbread-plus-aosp

* commit '468394fc6d1cb0c9078c2f98aa056860f7e0d743':
  Text Selection: smart word detection. DO NOT MERGE.
2010-09-08 10:32:42 -07:00
Elliott Hughes
664c48e991 am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread
Merge commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f' into gingerbread-plus-aosp

* commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f':
  Remove dead code: NIOBuffer.
2010-09-08 10:32:38 -07:00
Jean-Baptiste Queru
980bd4a12d am 84f992a2: resolve conflicts
Merge commit '84f992a249491b9f755e879bf096baac3f9472f5'

* commit '84f992a249491b9f755e879bf096baac3f9472f5':
  Adding Download Manager Integration, stress, and hosts-based tests.
2010-09-08 10:28:41 -07:00
Chet Haase
e6fac0df11 Merge "Rename several animation classes" 2010-09-08 10:25:19 -07:00
Makoto Onuki
c794d4ba19 Merge "Added "Memory observability" to javadoc." 2010-09-08 10:14:01 -07:00
Makoto Onuki
aa60a02f79 Added "Memory observability" to javadoc.
Change-Id: I4fba91922f033af408903cc4b455daa291e3f6ac
2010-09-08 10:06:19 -07:00
Jean-Baptiste Queru
84f992a249 resolve conflicts
Change-Id: I87f854430f7083cd2f2e28b4ec4a7112ef6fe4f1
2010-09-08 10:02:35 -07:00
Mike Lockwood
3b2a62e5b3 Rename the media database's "objects" table to "files"
We will be using this table for more than just MTP,
so it deserves a more general name.

Change-Id: I4c86d7e37ebe778e39699245b0e08af059e677ea
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-08 12:47:57 -04:00
Gilles Debunne
468394fc6d Text Selection: smart word detection. DO NOT MERGE.
Selecting between words selects the spaces instead of the closest word, facilitating
paste insertion vs word replacement.

Pasting adds/removes space before and after if needed so that pasted text is not appended to
existing text.

Cut and copy not available when selection is empty.

Change-Id: I331413bdef341a4eceffe76fa2957f388d540b6e
2010-09-08 09:43:46 -07:00
Chet Haase
a18a86b43e Rename several animation classes
Change-Id: I6a4544875090db485163c8d56de8718f56d267c7
2010-09-08 09:41:21 -07:00
Gilles Debunne
64e54a6e1f Made text selection work in ExtractEditText. Manual merge of Gingerbread 64947.
Change-Id: I2bbd4cd7abbc77212fb4df256c345f95232de127
2010-09-08 09:38:47 -07:00
Elliott Hughes
4c7d3f2889 Merge "Remove dead code: NIOBuffer." into gingerbread 2010-09-08 09:30:41 -07:00
Mike Lockwood
789a47488c Merge "Fix Intent.ACTION_REBOOT" 2010-09-08 06:52:51 -07:00
Mike Lockwood
b8a8a578c2 Fix Intent.ACTION_REBOOT
Turns out this would be useful for automated testing.

Change-Id: Idd5e35a8d4a354447b17a77fe0b606f78df844d0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-08 07:47:03 -04:00