13702 Commits

Author SHA1 Message Date
Dianne Hackborn
03f3cb083d resolved conflicts for merge of 1f377298 to master
Change-Id: I0d92abae3a86792b47777f795143acc0489adfe4
2010-09-17 23:12:26 -07:00
Adam Powell
61241ad42a Merge "resolved conflicts for merge of b39470b5 to master" 2010-09-17 18:00:23 -07:00
Adam Powell
f37df070ea resolved conflicts for merge of b39470b5 to master
Change-Id: If441c8684c576b6cbc485a37088d6869ad3fb23f
2010-09-17 17:59:06 -07:00
Robert Greenwalt
d192dad69e Enhance http proxy support
Make it read proxys the correct way from CS so it works for all network types.
Add utility class for apache http client support.

bug:2700664
Change-Id: If81917b19b5f0636247a6519a1ec78bd8dbf3596
2010-09-17 16:14:10 -07:00
Dianne Hackborn
1f377298e2 am 58e0eefe: Improve power tracking of WIFI use.
Merge commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5' into gingerbread-plus-aosp

* commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5':
  Improve power tracking of WIFI use.
2010-09-17 15:20:10 -07:00
Dianne Hackborn
58e0eefeb5 Improve power tracking of WIFI use.
We now distribute "wifi started" time across all apps that are
holding WIFI locks that cause it to be started.  But only when
WIFI would not normally be running.  Also have a mechanism to
distribute other WIFI work that has happened across those processes
based on their use.

Also fixed a bug where we were not retaining the CPU speed step
stats across boots...!

Change-Id: I00e3153b98429166273750512cc37e7975211ab9
2010-09-17 15:14:57 -07:00
Adam Powell
b39470b57d am b08013c3: Added overlay support for drawing/responding to text anchors.
Merge commit 'b08013c312e3d849029a2f4c11889274c00f438d' into gingerbread-plus-aosp

* commit 'b08013c312e3d849029a2f4c11889274c00f438d':
  Added overlay support for drawing/responding to text anchors.
2010-09-17 14:53:43 -07:00
Adam Powell
b08013c312 Added overlay support for drawing/responding to text anchors.
Overlays let views draw and respond to touch events outside of their
bounds. This allows selection anchors to be friendlier and easier to
grab. This is currently private API, pending further evaluation.

Added themes/styles for text selection anchors.

Added assets for text selection anchors as provided by UX. The
left/right anchors are currently not suitable for use. They are here
for bookkeeping and replacement later. The theme currently uses the
'middle' anchor asset for all three. This will be changed once assets
are ready.

Change-Id: I01b21e5ae90cab201f86f38f2f5eeaf2bd7f6bcd
2010-09-17 13:31:33 -07:00
Chet Haase
6dcffb434f am 4a2b3ef1: Merge "new assets" into gingerbread
Merge commit '4a2b3ef1810135bea25a827d7c52767f50c528b6' into gingerbread-plus-aosp

* commit '4a2b3ef1810135bea25a827d7c52767f50c528b6':
  new assets
2010-09-17 13:14:58 -07:00
Chet Haase
657028c293 new assets
Change-Id: I077fd2162e0901b6f31b815459873586f813a753
2010-09-17 12:55:03 -07:00
Shimeng (Simon) Wang
3fed1bd49a Merge "Use website preferred width as the fixed viewport." 2010-09-17 11:31:45 -07:00
Shimeng (Simon) Wang
14bcc0e7fe Use website preferred width as the fixed viewport.
This preferred width will be set between the default viewport width and
the max fixed viewport width.  The default viewport width serves as the
minimum fixed viewport width, so it's lowered to 980.

This change will make the shirt.woot.com/blog site works better, since it's using
1080 as the preferred width, so user needs not to scroll in overview mode.

issue: 3003933
Change-Id: Ie3eed44a54d277f5bc5f63cd394d463012a80d80
2010-09-17 10:54:48 -07:00
Jeff Hamilton
bfb619a12a Merge "Convert Numbers to Booleans when calling getAsBoolean()." 2010-09-17 10:21:55 -07:00
Vasu Nori
4e874edf69 don't compile statement for certain SQL statements
SQL statements such as Create table, Pragma, Begin, Commit, Rollback
etc don't need a compiled statement.

Change-Id: I55f5e4e6cbb41cbe83e592e25ba852fe23e2b39f
2010-09-17 10:15:40 -07:00
Shimeng (Simon) Wang
71579f97f8 Merge "Use website specified viewport." 2010-09-17 09:00:40 -07:00
Jeff Hamilton
d208c3a68b Convert Numbers to Booleans when calling getAsBoolean().
Change-Id: I31ad0bccd422f8e76cf37d500a93744cc23d4859
2010-09-17 08:12:19 -05:00
Tadashi G. Takaoka
2c7ab0854e am a79433cb: am ecd43cca: Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
Merge commit 'a79433cb66c83b3a27e94e42aef95cbae752bcc5'

* commit 'a79433cb66c83b3a27e94e42aef95cbae752bcc5':
  Initialize Keyboard.Key attributes from parent Keyboard.Row
2010-09-17 00:05:52 -07:00
Tadashi G. Takaoka
a79433cb66 am ecd43cca: Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
Merge commit 'ecd43cca4205a3c32a5e2ee4000bdc31d28e22be' into gingerbread-plus-aosp

* commit 'ecd43cca4205a3c32a5e2ee4000bdc31d28e22be':
  Initialize Keyboard.Key attributes from parent Keyboard.Row
2010-09-17 00:03:32 -07:00
Tadashi G. Takaoka
b65b7cb580 Initialize Keyboard.Key attributes from parent Keyboard.Row
Bug: 3009940
Change-Id: I22ef3e507c31e46b7581e20bcdd6b5ebc750adfe
2010-09-17 15:40:35 +09:00
Jake Hamby
14769a8690 am eb3b40af: am 0f584306: Fix Bluetooth Javadoc to clarify the maximum device name length.
Merge commit 'eb3b40af974d818cab66bf0a728c8bdec4f6f715'

* commit 'eb3b40af974d818cab66bf0a728c8bdec4f6f715':
  Fix Bluetooth Javadoc to clarify the maximum device name length.
2010-09-16 23:25:59 -07:00
Jake Hamby
eb3b40af97 am 0f584306: Fix Bluetooth Javadoc to clarify the maximum device name length.
Merge commit '0f5843069bd419fba4fb253986645dfbca0784b7' into gingerbread-plus-aosp

* commit '0f5843069bd419fba4fb253986645dfbca0784b7':
  Fix Bluetooth Javadoc to clarify the maximum device name length.
2010-09-16 22:15:55 -07:00
Wink Saville
00cfe112b4 Add LinkSocket API
Restructuring ConnectivityService to handle multiple connections.

Change-Id: Ia993fbb120bebb844fd0d603dc76fbc700b31fd1
2010-09-16 21:27:39 -07:00
Wink Saville
f61101f626 Add LinkCapabilities
Change-Id: Ia1599ade936b79f12526252c0a2e6b453abb136e
2010-09-16 21:26:59 -07:00
Romain Guy
a977120681 Merge "Add support for drawLines(), with anti-aliasing" 2010-09-16 20:51:45 -07:00
Romain Guy
759ea80dca Add support for drawLines(), with anti-aliasing
Change-Id: I16c0593c5671490909dec13a85df601e1428a1a6
2010-09-16 20:49:46 -07:00
Adam Cohen
ca6fd84794 Modifying API for setting on-click intents for items
in widget collections.

Change-Id: I0ad1f1241b7a40f0790ecd9fd3228f204d2c8499
2010-09-16 19:24:20 -07:00
Dianne Hackborn
c6669ca632 Add API for showing breadcrumbs of fragment back stack.
This adds a simple API to have your back stack automatically
shown as bread crumbs in the action bar.  Introduces some APIs
to retrieve the current back stack.

Also fix a little bug in the "activated" state where it was
being propagated down the hierarchy as "selected". :p  And from
that, fix the standard colors to be reasonable when in the
activated state.

Finally PreferenceActivity is updated to take advantage of
bread crumbs to show your place in the preferences.

Change-Id: I9d633bedf8d7c6e4ed9b25cb9698faa66c7dd9a4
2010-09-16 18:36:04 -07:00
Mathias Agopian
99ce457320 am 8f476407: am 08710dcd: Merge "part of fix for [3004226] Cannot end the call - Proximity sensor doesn\'t work" into gingerbread
Merge commit '8f476407bf4e6283b128532d594d44cc527e8204'

* commit '8f476407bf4e6283b128532d594d44cc527e8204':
  part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work
2010-09-16 18:26:13 -07:00
Mathias Agopian
7bb3e78ff3 am 3a35f078: am 079ed615: Merge "fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors" into gingerbread
Merge commit '3a35f078e75cd3f63e57b0fffbac486e12a0a933'

* commit '3a35f078e75cd3f63e57b0fffbac486e12a0a933':
  fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors
2010-09-16 18:26:09 -07:00
Jake Hamby
0f5843069b Fix Bluetooth Javadoc to clarify the maximum device name length.
The maximum length of a Bluetooth device name is 248 bytes using
UTF-8 encoding. Updated the Javadoc to clarify that the length is
limited by the number of UTF-8 bytes and not the number of characters.

Change-Id: I135671f5ee6c5eb6372f3fbbc5fccb02de65e6c4
2010-09-16 18:21:07 -07:00
Mathias Agopian
8f476407bf am 08710dcd: Merge "part of fix for [3004226] Cannot end the call - Proximity sensor doesn\'t work" into gingerbread
Merge commit '08710dcd589432c5828cefce25e4b565b15de9a6' into gingerbread-plus-aosp

* commit '08710dcd589432c5828cefce25e4b565b15de9a6':
  part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work
2010-09-16 17:57:29 -07:00
Mathias Agopian
3a35f078e7 am 079ed615: Merge "fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors" into gingerbread
Merge commit '079ed61579c3c42d78bb20cbcb11e6ffdb2aff34' into gingerbread-plus-aosp

* commit '079ed61579c3c42d78bb20cbcb11e6ffdb2aff34':
  fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors
2010-09-16 17:57:25 -07:00
Mathias Agopian
4d3cb63b9b part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work
- In SensorEventQueue, only bail on errors from Looper::loopOnce
- Improve sensor error logging

Change-Id: Ib3cf8d5d9fdac8513a3d753155827e0feeda1662
2010-09-16 17:33:48 -07:00
Carl Shapiro
3bf23a7b9f am b0abf3ea: am 4b164c1b: Kill off the remaining GC-specific system properties.
Merge commit 'b0abf3ea47b74296fd790843e789cfd101f58a00'

* commit 'b0abf3ea47b74296fd790843e789cfd101f58a00':
  Kill off the remaining GC-specific system properties.
2010-09-16 17:29:41 -07:00
Mathias Agopian
ec33b82c42 fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors
- Sensor handle can now be arbitrary instead of being limited to 0-31
- make sure to disable sensors only when no listener uses them anymore

Change-Id: If656c8c24d9827a7db1de3b3aa89961abb7def0c
2010-09-16 17:21:08 -07:00
Adam Cohen
15e9145477 Merge "Fixing StackView rendering bug exposed by recent Launcher change" 2010-09-16 17:05:16 -07:00
Winson Chung
9b3a2cf2a0 Prevent multiple RemoteViewAdapters from being set for the same intent.
Fixing issue where we were comparing and storing intents incorrectly in the RemoteViewsService reference counting scheme.

Change-Id: Iedf5997ed3a3ee7f8729cf8689121913196571f8
2010-09-16 16:59:56 -07:00
Carl Shapiro
b0abf3ea47 am 4b164c1b: Kill off the remaining GC-specific system properties.
Merge commit '4b164c1bf3592d4d83d93a5de58bb09676f1462c' into gingerbread-plus-aosp

* commit '4b164c1bf3592d4d83d93a5de58bb09676f1462c':
  Kill off the remaining GC-specific system properties.
2010-09-16 16:57:37 -07:00
Carl Shapiro
4b164c1bf3 Kill off the remaining GC-specific system properties.
Change-Id: Ib09ef132c6fb99b9eb22ecfd75a910c9c0f01e25
2010-09-16 16:48:21 -07:00
Shimeng (Simon) Wang
a8f99bbbbc Use website specified viewport.
In fixed viewport mode, use website specified viewport to override
the default fixed viewport.

issue: 3007588
Change-Id: I0ed86a2f829d18bf35dba47f766b23be1ace8ff5
2010-09-16 15:37:03 -07:00
Adam Cohen
b7f4d030a2 Fixing StackView rendering bug exposed by recent Launcher change
Change-Id: Ic8aad699afb75842d63be39e6586a6b23997aef8
2010-09-16 15:27:20 -07:00
Romain Guy
885b1f21d9 Merge "Better error handling in the OpenGL renderer." 2010-09-16 14:18:22 -07:00
Romain Guy
b025b9c8b4 Better error handling in the OpenGL renderer.
Add a glGetError() check on every frame
Don't attempt to create textures larger than the maximum size allowed

Change-Id: Iee4afae16089406dbe8bf10fc93b674f1271a0ca
2010-09-16 14:16:48 -07:00
Vasu Nori
6ca404d521 Merge "change error message on cl I392875b62ed270741633f5bffa519932e4a9f985" 2010-09-16 14:01:12 -07:00
Vasu Nori
23221192a0 change error message on cl I392875b62ed270741633f5bffa519932e4a9f985
Change-Id: I9eaf201822a9efd8afbdf5cd0e7ef2f01749b955
2010-09-16 13:59:31 -07:00
Steve Howard
0b57650666 am 4cd34abe: am 47874718: Merge "Support new URI structure for download provider." into gingerbread
Merge commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b'

* commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b':
  Support new URI structure for download provider.
2010-09-16 13:56:06 -07:00
Joe Onorato
8fca21d0fa Merge "Fix broken javadoc." 2010-09-16 13:55:45 -07:00
Steve Howard
4cd34abe53 am 47874718: Merge "Support new URI structure for download provider." into gingerbread
Merge commit '478747181e0414d703076d4786b201718cd93d5b' into gingerbread-plus-aosp

* commit '478747181e0414d703076d4786b201718cd93d5b':
  Support new URI structure for download provider.
2010-09-16 13:45:51 -07:00
Steve Howard
478747181e Merge "Support new URI structure for download provider." into gingerbread 2010-09-16 13:42:34 -07:00
Jeff Brown
707929d6f8 am 61cf67a2: am 24326f72: Merge "Input API review." into gingerbread
Merge commit '61cf67a220ba3205737c646c1c836a92074220de'

* commit '61cf67a220ba3205737c646c1c836a92074220de':
  Input API review.
2010-09-16 13:05:50 -07:00