39003 Commits

Author SHA1 Message Date
Jason parks
609dca2cc5 Merge "Add a method enable encryption." 2011-01-07 11:47:11 -08:00
Adam Powell
dbba746628 am 26c0c772: Merge "Fix bug 3330223 - onCreateOptionsMenu() unable to getActionView() immediately after orientation change" into honeycomb
* commit '26c0c772204f0962ae7a1d888a5aeadd13350008':
  Fix bug 3330223 - onCreateOptionsMenu() unable to getActionView() immediately after orientation change
2011-01-07 11:38:45 -08:00
Xavier Ducrohet
ae621e1911 am fe75027c: Merge "LayoutLib: Finish the matrix delegate." into honeycomb
* commit 'fe75027c5c2bbb53f008ae5382de94ed8d37317b':
  LayoutLib: Finish the matrix delegate.
2011-01-07 11:36:48 -08:00
Adam Powell
26c0c77220 Merge "Fix bug 3330223 - onCreateOptionsMenu() unable to getActionView() immediately after orientation change" into honeycomb 2011-01-07 11:35:15 -08:00
Adam Powell
d16c9884bb Fix bug 3330223 - onCreateOptionsMenu() unable to getActionView()
immediately after orientation change

Inflate action view layout resource earlier so that calls to
getActionView are valid immediately after menu inflation.

Change-Id: I8023328b1a77670ac42a783f6e4b46aa5c2a798e
2011-01-07 11:33:41 -08:00
Xavier Ducrohet
fe75027c5c Merge "LayoutLib: Finish the matrix delegate." into honeycomb 2011-01-07 11:32:00 -08:00
Wink Saville
a78060345b am 81f573de: Merge "Add telephony.sms.receive and telephony.sms.send properties." into honeycomb
* commit '81f573de6361b0420b22c857afa7e03df125d1a5':
  Add telephony.sms.receive and telephony.sms.send properties.
2011-01-07 11:04:26 -08:00
Romain Guy
cf65322357 am 3c38e0a2: Merge "Fix typo bug in FrameLayout\'s measurement code. Bug #3327185" into honeycomb
* commit '3c38e0a2a617f87a43d3647b532e3b493b7dae6d':
  Fix typo bug in FrameLayout's measurement code. Bug #3327185
2011-01-07 11:04:23 -08:00
Wink Saville
81f573de63 Merge "Add telephony.sms.receive and telephony.sms.send properties." into honeycomb 2011-01-07 11:00:42 -08:00
Romain Guy
3c38e0a2a6 Merge "Fix typo bug in FrameLayout's measurement code. Bug #3327185" into honeycomb 2011-01-07 11:00:20 -08:00
Romain Guy
cf70dcb0f7 Fix typo bug in FrameLayout's measurement code.
Bug #3327185

Change-Id: If9a897efd8766b158749d053dabee3477bf1b053
2011-01-07 11:03:20 -08:00
Wink Saville
97afc5e097 am 077490f5: Merge "For Cdma a blank plmn is valid to show in some cases." into honeycomb
* commit '077490f567028c9d02f9dbaeff80eba38e39e8a2':
  For Cdma a blank plmn is valid to show in some cases.
2011-01-07 10:51:54 -08:00
Eric Fischer
b279a0a701 am 483f2c27: Merge "Mark the status bar configuration string untranslatable." into honeycomb
* commit '483f2c277250278722f1a056124c608cc1bb3cc2':
  Mark the status bar configuration string untranslatable.
2011-01-07 10:51:50 -08:00
Wink Saville
077490f567 Merge "For Cdma a blank plmn is valid to show in some cases." into honeycomb 2011-01-07 10:44:20 -08:00
Eric Fischer
483f2c2772 Merge "Mark the status bar configuration string untranslatable." into honeycomb 2011-01-07 10:41:50 -08:00
Irfan Sheriff
73746fa9ce am 60525c82: Merge "Use BluetoothAdapter broadcast for coex settings" into honeycomb
* commit '60525c824ccf11302a9b8343e72eba259485edea':
  Use BluetoothAdapter broadcast for coex settings
2011-01-07 09:40:51 -08:00
Irfan Sheriff
60525c824c Merge "Use BluetoothAdapter broadcast for coex settings" into honeycomb 2011-01-07 09:37:01 -08:00
Dmitri Plotnikov
5edd2a2f27 am cd3676e7: Adding AsyncTaskLoader.waitForLoader() for testing
* commit 'cd3676e7b835653b04d4f66251a63749e7603f5b':
  Adding AsyncTaskLoader.waitForLoader() for testing
2011-01-07 09:36:43 -08:00
Irfan Sheriff
65eaec88f3 Use BluetoothAdapter broadcast for coex settings
Use the bluetooth adapter broadcast so that we capture
various bluetooth profiles for both scan coex settings
and coex settings during DHCP

Change-Id: Idec41940514efe7ea9927f67b6199b4893794e2a
2011-01-07 09:26:59 -08:00
Daniel Sandler
fe6a6fdb5e am 100744fa: Merge "Fix stuck-open notification shade." into honeycomb
* commit '100744fa54e14be62abd211996b5dfed60de1fa4':
  Fix stuck-open notification shade.
2011-01-07 09:24:44 -08:00
Dmitri Plotnikov
cd3676e7b8 Adding AsyncTaskLoader.waitForLoader() for testing
Change-Id: I8a4c13d48c9deca70594be58beafb68f08da65ea
2011-01-07 09:23:10 -08:00
Daniel Sandler
100744fa54 Merge "Fix stuck-open notification shade." into honeycomb 2011-01-07 09:20:09 -08:00
Steve Block
473e017cf1 am 808751fe: Avoid superfluous calls to CacheManager with the Chromium HTTP stack
* commit '808751fe7ac16bf7224cba284a318695d8093355':
  Avoid superfluous calls to CacheManager with the Chromium HTTP stack
2011-01-07 08:56:02 -08:00
Steve Block
808751fe7a Avoid superfluous calls to CacheManager with the Chromium HTTP stack
When using the Chromium HTTP stack, most of the calls to CacheManager
methods are not required, as we're not using its cache. These methods
are now marked with asserts to make this clear.

Also avoid creating the cache database in WebViewDatabase.

This will avoid creating the database databases/webviewCache.db and
the directory cache/webviewCache.

Bug: 3270236
Change-Id: I68f94dde16830ed817454d5e1af961f41b71d018
2011-01-07 16:50:09 +00:00
Daniel Sandler
6869c1876b Fix stuck-open notification shade.
Reversing the animations isn't working well, but re-creating
them in the correct direction is, so we'll use that for now.

Bug: 3326529
Change-Id: I40fdbd1d02bb8028d4d1f1bceb15f2c335366063
2011-01-07 11:38:12 -05:00
Wink Saville
f4871b686f For Cdma a blank plmn is valid to show in some cases.
When roaming the plmn might be blank but we want to have
showPlmn true otherwise "No Service" is displayed.

bug: 3265611
Change-Id: Iaed8997ab0bb336c79cef1fc848526ca7a73f9a1
2011-01-07 08:37:18 -08:00
Daniel Sandler
5b5e46bdf3 am b3b98d9b: Merge "Remove obsolete strings (rather than fix l10n guidelines)." into honeycomb
* commit 'b3b98d9b700ac0ae038a63b734287b4d3aad950d':
  Remove obsolete strings (rather than fix l10n guidelines).
2011-01-07 07:44:48 -08:00
Steve Block
77929fddea am 5f6bcc17: Merge "Remove some superfluous null-checks when constructing a CacheResult" into honeycomb
* commit '5f6bcc17e94e53af155570bb4a1c774eada7ec4e':
  Remove some superfluous null-checks when constructing a CacheResult
2011-01-07 07:44:42 -08:00
Jason parks
d633255276 Add a method enable encryption.
This is for testing and needs to be cleaned up.

Change-Id: I71cd5412f7096dc13d9ab61229ee9846c6f0006a
2011-01-07 09:01:56 -06:00
Daniel Sandler
b3b98d9b70 Merge "Remove obsolete strings (rather than fix l10n guidelines)." into honeycomb 2011-01-07 06:34:55 -08:00
Steve Block
5f6bcc17e9 Merge "Remove some superfluous null-checks when constructing a CacheResult" into honeycomb 2011-01-07 06:12:08 -08:00
Vasu Nori
a085ef3e35 am a270bd59: Merge "fix a long-standing \'typo\' bug" into honeycomb
* commit 'a270bd59a8e6d291af8c1cfcf13af5260ec0ed5a':
  fix a long-standing 'typo' bug
2011-01-07 00:29:38 -08:00
Romain Guy
c7715def4c am 424a1bb0: Merge "New layers API for Views." into honeycomb
* commit '424a1bb09b763de298ff9141a45403dc76857c10':
  New layers API for Views.
2011-01-07 00:29:26 -08:00
Justin Ho
7d8ce15d16 am 646897cb: Merge "Updated flightmode stat_sys icon" into honeycomb
* commit '646897cb07d62f9111a0a0d88e698ddaef0fd150':
  Updated flightmode stat_sys icon
2011-01-07 00:29:23 -08:00
Xavier Ducrohet
348f778b04 am f0fe6d31: Merge "LayoutLib: fix clipping issues." into honeycomb
* commit 'f0fe6d311d183c5fcf45d5e3e995fc8f9ed12f8b':
  LayoutLib: fix clipping issues.
2011-01-07 00:29:19 -08:00
Svetoslav Ganov
4aeb8795f3 am 8303dccf: Merge "(cherrypick from master) 3322879 Device soft reboots on enabling and disabling accessibility settings" into honeycomb
* commit '8303dccf2b3c91b80afa44836185173ff39016ac':
  (cherrypick from master) 3322879 Device soft reboots on enabling and disabling accessibility settings
2011-01-07 00:29:15 -08:00
Dianne Hackborn
560eb3e7b9 am 32846944: Merge "We are now Honeycomb." into honeycomb
* commit '32846944e90108a8f5f8f467a087086e5b770b27':
  We are now Honeycomb.
2011-01-07 00:29:11 -08:00
Andreas Huber
cf7903e702 am 0d1e1550: Merge "Fix typo." into honeycomb
* commit '0d1e15509bb29e2688ccd72e984b63a874b62195':
  Fix typo.
2011-01-07 00:29:06 -08:00
Jamie Gennis
ab4cdb9255 am 0c43f0be: Merge "Add SurfaceTexture JNI registration." into honeycomb
* commit '0c43f0bee78a2b89c06cfb2b67badfca01d2f1ba':
  Add SurfaceTexture JNI registration.
2011-01-07 00:29:02 -08:00
Robert Greenwalt
31ff309f2f am 89c8f755: Merge "Fix handling of multiple possible default networks" into honeycomb
* commit '89c8f7554bbec5d62ebeddddc2ef2460265a80c5':
  Fix handling of multiple possible default networks
2011-01-07 00:28:55 -08:00
Vasu Nori
9898d05000 am c1ca07ee: Merge "in GB requery() didn\'t throw exceptions (mostly). replicate that in HC" into honeycomb
* commit 'c1ca07eebb2730a4cbef5f6ba2d98abb881a85d9':
  in GB requery() didn't throw exceptions (mostly). replicate that in HC
2011-01-07 00:28:49 -08:00
Joe Onorato
7f98217c48 am b9a12d7b: Merge changes Ib809d4c5,I05d69da4 into honeycomb
* commit 'b9a12d7b87e39e3f1588eb8d8d28129ae5449039':
  This makes the events at the edge of the screen find the button.
  some touch event debugging
2011-01-07 00:28:44 -08:00
Jamie Gennis
85c83b4d87 am e861d00f: Merge "Update api/current.xml for SurfaceTexture." into honeycomb
* commit 'e861d00fc30ecf5feab8b05c054e294a601573ee':
  Update api/current.xml for SurfaceTexture.
2011-01-07 00:28:38 -08:00
Andreas Huber
63d674c3ff am ca808ae2: Merge "If the stream for the new bandwidth doesn\'t have the segment we\'re looking for..." into honeycomb
* commit 'ca808ae207a95750d0f34752a7ad5313a2c2b446':
  If the stream for the new bandwidth doesn't have the segment we're looking for...
2011-01-07 00:28:32 -08:00
Jaikumar Ganesh
d01b9be9c3 am c173b76a: Merge "Remove auto connection on ACL connection." into honeycomb
* commit 'c173b76a46880e99fae598b0862ae2b8c4084770':
  Remove auto connection on ACL connection.
2011-01-07 00:28:23 -08:00
Jamie Gennis
f22c1708d7 am d559ebbc: Merge "Add the SurfaceTexture java class." into honeycomb
* commit 'd559ebbc3dd1a6b4b1bbecd30dd381b0b0328361':
  Add the SurfaceTexture java class.
2011-01-07 00:28:15 -08:00
Adam Powell
570cc1834f am 5dd6e9a9: Merge "Fix bug 3212471 - Widget.Holo.ActionButton style and friends now 76% more useful" into honeycomb
* commit '5dd6e9a9aa9f0b22b827253be89a909f05d5b3c1':
  Fix bug 3212471 - Widget.Holo.ActionButton style and friends now 76% more useful
2011-01-07 00:28:09 -08:00
Shimeng (Simon) Wang
590db03eae am adba8021: Merge "Make sure the reading level scale is within min/max limits." into honeycomb
* commit 'adba8021cd2fd0d20856fb4fbfed2cb000f3f1d5':
  Make sure the reading level scale is within min/max limits.
2011-01-07 00:28:02 -08:00
Chet Haase
2e2608742e am de69817b: Merge "Reuse of native display list objects" into honeycomb
* commit 'de69817b3c713069cc37e22a97b9d3238e7a52b1':
  Reuse of native display list objects
2011-01-07 00:27:54 -08:00
Andreas Huber
43b9401d67 am f25410ed: Merge "Use NuPlayer for HTTP live streaming playback by default." into honeycomb
* commit 'f25410ed9695f3f07ce0302232fa6e1985ffffd7':
  Use NuPlayer for HTTP live streaming playback by default.
2011-01-07 00:27:47 -08:00