74094 Commits

Author SHA1 Message Date
Irfan Sheriff
5b86de1e6b Merge "Fix build" 2012-04-04 13:22:19 -07:00
Irfan Sheriff
fa291e6691 Fix build
Add missing file

Change-Id: I5ed1827e1183c37741675ce4d198d3e200c5fb94
2012-04-04 13:20:20 -07:00
Chia-chi Yeh
870085cce0 Merge "SIP: push the logic of finding local address down to SipSessionGroup." 2012-04-04 13:13:57 -07:00
Chia-chi Yeh
2dd9134c6b SIP: push the logic of finding local address down to SipSessionGroup.
This allows different accounts binding on different IP addresses,
such as one on IPv4 and another on IPv6.

Bug: 4169057
Change-Id: I0bb36669394c281330091673fa338adea8f782cd
2012-04-04 13:04:26 -07:00
Irfan Sheriff
689b741abc Merge "Add initial framework for DNS service discovery" 2012-04-04 12:34:52 -07:00
Irfan Sheriff
271cb5c0d4 Merge "Original DnsSd TxtRecord file" 2012-04-04 12:34:47 -07:00
Irfan Sheriff
227dde2be4 Merge "Fix key handling" 2012-04-04 12:29:26 -07:00
Irfan Sheriff
7d024d3724 Add initial framework for DNS service discovery
Change-Id: I53c0b7ebfd75e520ebb7553612f1aa8413b6b79b
2012-04-04 12:24:56 -07:00
Daniel Sandler
74e642bae0 Merge "Fix vertical alignment of notification contents." 2012-04-04 12:03:49 -07:00
Daniel Sandler
ea7593ce0f Fix vertical alignment of notification contents.
Change-Id: Ibbb237f1b892cb0605417cdef17a9e59316ecb1f
2012-04-04 15:00:55 -04:00
Craig Mautner
c3a6cf79e3 Merge "First separation of animation from AppWindowToken." 2012-04-04 12:00:48 -07:00
Craig Mautner
0048dc9d55 Merge "Move more items between layout and animate sides." 2012-04-04 11:58:50 -07:00
Craig Mautner
594316361d First separation of animation from AppWindowToken.
New class AppWindowAnimator pulls animation out of AppWindowToken.

Change-Id: Ic1ccb6ec2bf091f1f901fe3c20cbeb242376ae6b
2012-04-04 11:56:44 -07:00
Yoshihiko Ikenaga
b5e00bda40 Fix key handling
putListener() returns 0 when the argument is null. And The key value of listener
registered first is always 0. For this reason, if the p2p functions are called continuously
and first call is without listener and the second call is with listener, then the message
against first call wrongly pick up the second call's listener because the key value is
the same. In order to avoid this issue, we don't use 0 as the valid listener key.

Change-Id: I0cc960b2ad37f17cf7f528d839b39aa272b83670
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2012-04-04 11:55:06 -07:00
Fred Chung
6153ddc8f1 am 2adda2d5: am 99b44fdc: am f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1
* commit '2adda2d594954d338993f579503ab3e5f339ac8a':
  Updated sample app for Android Training class: Making Your App Location Aware.
2012-04-04 11:54:04 -07:00
Romain Guy
fda531c9e4 Merge "Disable AA lines vertex attrib arrays after rendering" 2012-04-04 11:53:28 -07:00
Fred Chung
2adda2d594 am 99b44fdc: am f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1
* commit '99b44fdc87d3eac2feb17ab2409b0b66ca9333ba':
  Updated sample app for Android Training class: Making Your App Location Aware.
2012-04-04 11:51:12 -07:00
Fred Chung
99b44fdc87 am f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1
* commit 'f336b9fce8b11c70b633bd71612544eaf2b9298b':
  Updated sample app for Android Training class: Making Your App Location Aware.
2012-04-04 11:48:01 -07:00
Fred Chung
f336b9fce8 Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1 2012-04-04 11:45:21 -07:00
Romain Guy
7b63142d2f Disable AA lines vertex attrib arrays after rendering
Change-Id: I2f035e9d87f4f97bc1e37355c84570fd58df0374
2012-04-04 11:38:54 -07:00
Irfan Sheriff
26d4452a08 Original DnsSd TxtRecord file
Change-Id: I4aa308a3b417d6bdce50567fb66c7119b048140a
2012-04-04 11:37:35 -07:00
Martijn Coenen
30bd284cca Merge "Add API for querying extended length APDU support." 2012-04-04 11:19:08 -07:00
Martijn Coenen
1899b73110 Merge "Document "disable default Beam" meta-data entry." 2012-04-04 11:12:52 -07:00
Roman Nurik
970abd9b04 am 6644efe6: am 7dc67f51: am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit '6644efe63c86d25ecaf54d88cf15336f53baa369':
2012-04-04 11:05:40 -07:00
Roman Nurik
63e29b0de0 am b328cc3e: am 32a035d1: am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit 'b328cc3e813f38917860aff3b85e045de835856c':
  docs: Android Design: v3 update (settings, navigation)
2012-04-04 11:02:37 -07:00
Roman Nurik
6644efe63c am 7dc67f51: am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit '7dc67f51272de42112d51a912c352ff2dc3aaf9c':
2012-04-04 11:01:27 -07:00
Roman Nurik
b328cc3e81 am 32a035d1: am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit '32a035d165f43b72d961a71192c902eba581dd0e':
  docs: Android Design: v3 update (settings, navigation)
2012-04-04 10:58:53 -07:00
Roman Nurik
7dc67f5127 am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit 'fa840e2b9f7e8b5655fa262cd063800188dec216':
  docs: Android Design: v3 update (settings, navigation)
2012-04-04 10:57:24 -07:00
Roman Nurik
32a035d165 am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit 'fa840e2b9f7e8b5655fa262cd063800188dec216':
  docs: Android Design: v3 update (settings, navigation)
2012-04-04 10:55:55 -07:00
Roman Nurik
fa840e2b9f Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1 2012-04-04 10:53:58 -07:00
Fred Chung
20f64fab8d Updated sample app for Android Training class: Making Your App Location Aware.
Change-Id: I819a79b337bbdc33948c17cc5456e6406eb3bf98
2012-04-04 10:53:34 -07:00
Martijn Coenen
854e077555 Document "disable default Beam" meta-data entry.
Change-Id: Icaa767ee37fcca08b1ff5143eb94cf8e66be840c
2012-04-04 10:48:04 -07:00
Martijn Coenen
fa98cf0573 Add API for querying extended length APDU support.
Bug: 5813943
Change-Id: Iffb415f318e095bde9ed6677b22613d210f8a39c
2012-04-04 10:43:06 -07:00
Chet Haase
5e63d99ca5 Merge "Enhanced frame profiling from gfxinfo" 2012-04-04 10:39:33 -07:00
Roman Nurik
b20f1201fd docs: Android Design: v3 update (settings, navigation)
Change-Id: I351e82561432f4357b52d2b7d99ae0fafdf79688
2012-04-04 10:31:11 -07:00
Craig Mautner
d09cc4ba24 Move more items between layout and animate sides.
- Isolate DimAnimator animation from the layout side.
- Isolate mWallpaperForceHidingChanged and mOrientationChangeComplete
  from the animation side.
- Eliminate a redundant setting of mOrientationChangeComplete to true.
  It was already true at that point.
- Synchronize changes to mWindows and mAppTokens on mAnimator. This is
  a nop until we go to multiple threads.
- Synchronize AppWindowToken.freezingScreen on mAnimator.
- Modification to repeat layout debugging including temporary enabling
  of spew on layout repeats.

Change-Id: Ic8d82b1c197144aaf6957caa5f71e175288220f2
2012-04-04 10:23:31 -07:00
Gilles Debunne
935a15ebed Merge "Removed spurious log about blinking cursor" 2012-04-04 10:14:13 -07:00
Gilles Debunne
cfbf0e0296 Removed spurious log about blinking cursor
Change-Id: I940c3847bb6e461178575480c82e7dd6739277cf
2012-04-04 10:12:05 -07:00
Stephen Hines
cf15200ddb Merge "Revert "Build /system/bin/asan/app_process."" 2012-04-04 08:12:56 -07:00
Stephen Hines
5bb508fac6 Revert "Build /system/bin/asan/app_process."
This reverts commit cb5c734790e1e3d8496b4c75c57e8a537784c056
2012-04-04 08:12:46 -07:00
Stephen Hines
78b3825009 Merge "Build /system/bin/asan/app_process." 2012-04-04 08:03:21 -07:00
Chet Haase
09280606dc Enhanced frame profiling from gfxinfo
You can now set the max number of frames being tracked by the gfxinfo
profiling data by doing 'adb shell setprop hwui.profil.maxframes #'.
Also, running gfxinfo automatically resets the data so that any set of
frame data always starts from the beginning.

Change-Id: I87ae3fb4d580741a1b2fba75be4ec540de7c52a4
2012-04-04 07:49:06 -07:00
Michael Jurka
16ad29d508 Merge "Fix bugs with popup menu in Recent Applications" 2012-04-04 01:55:00 -07:00
Michael Jurka
e16c93a5a3 Merge "Reducing height of scroll fade in Recents on phone" 2012-04-04 01:54:40 -07:00
Romain Guy
0a1cbc5f7d Merge "New libhwui test activity" 2012-04-03 21:17:34 -07:00
Jeff Sharkey
4dfdf4d629 Merge "Hide Preference title when empty." 2012-04-03 21:15:34 -07:00
Romain Guy
2946445b56 New libhwui test activity
Change-Id: I0ce4bc665f117d7c0ed47670ceb4ed6f9b54d85c
2012-04-03 21:15:12 -07:00
Jeff Sharkey
0f1c3af76b Hide Preference title when empty.
Change-Id: I1c1d73f5a4647657c7da65c72192fbac061fe259
2012-04-03 20:46:42 -07:00
Romain Guy
8c8c240092 Merge "Optimize FBOs composition" 2012-04-03 19:33:06 -07:00
Romain Guy
e0aa84b7dc Optimize FBOs composition
Change-Id: Ifc8eada8922509373c0e4c3b2ed75b6f08d098de
2012-04-03 19:30:26 -07:00