13344 Commits

Author SHA1 Message Date
Adam Powell
00df32d439 Handle disabled state for action menu items
Change-Id: Id80926aef5f8f2f47703a7b1e3da38e6117edb30
2010-09-02 13:58:35 -07:00
Daisuke Miyakawa
fa5a46a08e am 3010713f: Fix again.
Merge commit '3010713f50aa6ac189b1990421cfab1d426bc601' into gingerbread-plus-aosp

* commit '3010713f50aa6ac189b1990421cfab1d426bc601':
  Fix again.
2010-09-02 13:54:48 -07:00
Daisuke Miyakawa
3010713f50 Fix again.
Change-Id: I7393e1e9e9aa3f8612d143840109f1c5193f692f
2010-09-02 13:48:09 -07:00
Daisuke Miyakawa
b2b973d13e am 3bd9b8f0: Fix build breakage.
Merge commit '3bd9b8f04cece37ab4405abc382e2810006b9f97' into gingerbread-plus-aosp

* commit '3bd9b8f04cece37ab4405abc382e2810006b9f97':
  Fix build breakage.
2010-09-02 13:46:55 -07:00
Daisuke Miyakawa
3bd9b8f04c Fix build breakage.
Change-Id: If519f1730266f10a7852af209127aa4754a7ef9d
2010-09-02 13:42:22 -07:00
Leon Scroggins III
6366248017 Merge "Only close the IME if it is Active on the WebView." 2010-09-02 13:10:30 -07:00
Daisuke Miyakawa
22a17ce60b am b1f5a54a: Merge "VCard refactoring backport." into gingerbread
Merge commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7' into gingerbread-plus-aosp

* commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7':
  VCard refactoring backport.
2010-09-02 12:59:36 -07:00
Daisuke Miyakawa
b1f5a54a2a Merge "VCard refactoring backport." into gingerbread 2010-09-02 12:56:15 -07:00
Irfan Sheriff
25c9bf2396 Add set/get band in WifiNative
Add support for set and get band and set the default
to 2GHz for now till we get a fix on issues
with 11A

Change-Id: Icb9bddc353e4bf013bdb8a08d9b4ee3451c282f4
2010-09-02 12:48:20 -07:00
Romain Guy
482948bd94 Merge "Correctly apply alpha on TextView. Bug #2969691" 2010-09-02 11:47:48 -07:00
Romain Guy
9b34d45c8f Correctly apply alpha on TextView.
Bug #2969691

Change-Id: Ied46e9a38718cb37df10f9dc79b48fbc3a8bd237
2010-09-02 11:47:30 -07:00
Jaikumar Ganesh
33570c8bf6 Merge "Use the new signals sent by Bluez for PAN." 2010-09-02 11:40:36 -07:00
Eric Rowe
6aa717e4a1 am 97e58ef4: Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread
Merge commit '97e58ef444da53165caab2a7be4fe44c154d5a0e' into gingerbread-plus-aosp

* commit '97e58ef444da53165caab2a7be4fe44c154d5a0e':
  DO NOT MERGE Separate utility methods into utility class.
2010-09-02 11:37:51 -07:00
Jaikumar Ganesh
c1520ecb41 Use the new signals sent by Bluez for PAN.
Change-Id: I092b5d6b23bacb37a5bc2ca6d8c47bc6a99467ec
2010-09-02 11:36:58 -07:00
Eric Rowe
27a912a393 Merge "Separate utility methods into utility class." 2010-09-02 11:35:29 -07:00
Eric Rowe
97e58ef444 Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread 2010-09-02 11:35:20 -07:00
Eric Rowe
13438b0205 DO NOT MERGE Separate utility methods into utility class.
Methods in BluetoothTestUtils remain the same as they were in
BluetoothStressTest except for the constructor and close().  The constructor
is derived from setUp() and close() from tearDown().

Change-Id: Ifce16346f30eccdcc10ab846800e8a6fd2a24361
2010-09-02 11:29:59 -07:00
Dmitri Plotnikov
1ecf551b80 Contacts API clean-up (mostly documentation)
- Fixing column list for the Photo table.
- Fixing column list for the AggregationSuggestions table.
- Allowing CONTENT_LOOKUP_URI to be used with directories:
Data, AggregationSuggestions and Photo.

Change-Id: I3dbcc28df0029e1fcb2140efd2047707a0cdd947
2010-09-02 11:00:04 -07:00
Daisuke Miyakawa
69831d9dc1 VCard refactoring backport.
Change-Id: Icf265ce7f83c1e2bd5db0c3d9bd4c142afd6db34
2010-09-02 10:39:00 -07:00
Jeff Hamilton
6d8fe9b40b Merge "Move the searches helpers over to the new provider." 2010-09-02 10:37:28 -07:00
Jeff Hamilton
88697b5a33 Move the searches helpers over to the new provider.
Change-Id: I92030a50193a66edc4364345c9411c0f2d7c2d43
2010-09-02 12:36:04 -05:00
Cyrus Master
dcfd5d784c Merge "Adds creation and last-modified timestamps to the bookmarks contract for the browser provider." 2010-09-02 10:12:45 -07:00
Leon Scroggins III
71d17e4071 Only close the IME if it is Active on the WebView.
Bug: 2955391

Some applications want to leave the IME open even though
the WebView is loading a page.  Only hide the IME if it
is Active on the WebView or the WebTextView.

Change-Id: I1e7f973f649d78561bd8585c628a83c9b18a66ad
2010-09-02 12:53:08 -04:00
Vasu Nori
8eb1bfe0f6 Merge "fix isIntegrityCheck() & add a sample impl class and test for DatabaseErrorHandler" 2010-09-02 09:42:11 -07:00
Dmitri Plotnikov
9a9ce6067f Fixing an issue with convert... utility methods.
All these methods promise to do nothing
if the requested column is not present,
but in fact throw exception.

Change-Id: I0e528d53a0425b831b0083ba82c75ba5b41bfdfd
2010-09-02 09:21:28 -07:00
Daniel Sandler
d39e388e6d Redesigned system bar and quick settings panel.
Change-Id: Ie26767a8c25af64809cf2fd1d8364791cb7e55ed
2010-09-02 11:34:20 -04:00
Adam Powell
0358def776 am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread
Merge commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211' into gingerbread-plus-aosp

* commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211':
  DO NOT MERGE Overscroll continues; asset and behavior tweaks.
2010-09-02 00:31:03 -07:00
Adam Powell
79492a0d75 Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread 2010-09-02 00:28:14 -07:00
Adam Powell
5916882c3f DO NOT MERGE Overscroll continues; asset and behavior tweaks.
Change-Id: I367643877a397e7b4fa9bd8c40639ff69436e7f0
2010-09-02 00:14:53 -07:00
Dianne Hackborn
8f5edc93b6 am 840f0fec: am d3efa392: Clean up some permissions.
Merge commit '840f0fecd87357cadf4b2a0ae96d30b457f89729'

* commit '840f0fecd87357cadf4b2a0ae96d30b457f89729':
  Clean up some permissions.
2010-09-01 22:55:04 -07:00
Dianne Hackborn
840f0fecd8 am d3efa392: Clean up some permissions.
Merge commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986' into gingerbread-plus-aosp

* commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986':
  Clean up some permissions.
2010-09-01 22:51:35 -07:00
Jim Miller
0ed0221e9c Merge "Fix 2579224: Add a separate timeout for lockscreen vs display" 2010-09-01 21:41:51 -07:00
Dianne Hackborn
949498de66 am 14d56840: am bc5ec2f9: Merge "Improve messages when java process is starting." into gingerbread
Merge commit '14d56840eeec537c037bebaeaebf1b37f48d8dad'

* commit '14d56840eeec537c037bebaeaebf1b37f48d8dad':
  Improve messages when java process is starting.
2010-09-01 21:21:42 -07:00
Dianne Hackborn
d3efa39244 Clean up some permissions.
Note that WRITE_OWNER_DATA and READ_OWNER_DATA don't actually appear
to be associated with anything or used by anyone, so they are just
deleted.

Also deprecate the activity API to go in the foreground.  I didn't
realize that was released in the SDK.  It needs to go away.

Change-Id: I96f53702c2c79e4999b6b2c498abb770bd27e03a
2010-09-01 21:19:40 -07:00
Dianne Hackborn
14d56840ee am bc5ec2f9: Merge "Improve messages when java process is starting." into gingerbread
Merge commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1' into gingerbread-plus-aosp

* commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1':
  Improve messages when java process is starting.
2010-09-01 21:18:31 -07:00
Dianne Hackborn
bc5ec2f91a Merge "Improve messages when java process is starting." into gingerbread 2010-09-01 21:15:17 -07:00
Jim Miller
bc4603b0b1 Fix 2579224: Add a separate timeout for lockscreen vs display
This change adds a second timeout to the SecuritySettings page
separate from the standard display timeout.

Change-Id: I41fe10e31688308f52695ad3ee30a4b0507112bd
2010-09-01 21:00:30 -07:00
Dianne Hackborn
08e60f2a16 Improve messages when java process is starting.
Change-Id: I33e401eb240a454845987c10d44e3520e419721b
2010-09-01 19:17:47 -07:00
Jason Chen
9dc2e75e27 Add Deprecated annotation to getPluginsPath/setPluginsPath
Javadoc annotations aren't enough to properly mark an API
as deprecated. This change adds the @Deprecated annotation
to the source and updates current.xml.

Change-Id: I04a398fc04ad99979c674789af5af994fbd25be0
2010-09-01 19:17:22 -07:00
Jason Chen
9fadca71e4 am b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Merge commit 'b766ab830a714c0b79f64265e681f454865ffe65' into gingerbread-plus-aosp

* commit 'b766ab830a714c0b79f64265e681f454865ffe65':
  DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
2010-09-01 19:16:41 -07:00
Jason Chen
b766ab830a DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Previous changes only added javadoc annotation, but didn't apply
annotation to the source. Fixing this and updating current.xml.

Change-Id: I52aabd6485a3972fc360f24c2e86cc342a5101ab
2010-09-01 19:04:18 -07:00
Hung-ying Tyan
f83d4f1779 resolved conflicts for merge of 3e4975a5 to master
Change-Id: Icd382fc43c8a1975801ab42eb184b633520149c7
2010-09-02 09:56:04 +08:00
Hung-ying Tyan
3e4975a52c am 3424c02e: Add software features for SIP and VOIP
Merge commit '3424c02e6b931a8bbd651ae75217bebd008b2605' into gingerbread-plus-aosp

* commit '3424c02e6b931a8bbd651ae75217bebd008b2605':
  Add software features for SIP and VOIP
2010-09-01 18:01:31 -07:00
Hung-ying Tyan
3424c02e6b Add software features for SIP and VOIP
and block SipService creation and SIP API if the feature is not available.

Change-Id: Icf780af1ac20dda4d8180cea3e5b20e21a8350bc
2010-09-02 08:10:13 +08:00
Dan Morrill
90324669f2 am 61f1cbdd: am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread
Merge commit '61f1cbdd71942433ce1515b614ec3d9c259ea037'

* commit '61f1cbdd71942433ce1515b614ec3d9c259ea037':
  Adding a feature definition corresponding to support for Near-Field
2010-09-01 17:03:33 -07:00
Robert Greenwalt
21e7844967 Merge "Remember mobile nets availability" 2010-09-01 16:20:09 -07:00
Robert Greenwalt
d3afa8f8ff Merge "Fix NPE in toString" 2010-09-01 16:18:01 -07:00
Robert Greenwalt
0dd89664c0 Merge "Add a default dns entry if none is provided" 2010-09-01 16:11:04 -07:00
Romain Guy
2b9a92a80b Merge "Add support for Canvas flags on save." 2010-09-01 15:52:59 -07:00
Romain Guy
8aef54fa17 Add support for Canvas flags on save.
This is required for the rewrite of layers support.

Change-Id: I5c0867dcf5aeb0392c8d0fbab05febb0eaff70d9
2010-09-01 15:49:25 -07:00