Joe Onorato
a7ade8266d
Merge "Touching the blue glow should close the system and notification panels."
2010-09-26 14:41:42 -07:00
Chris Palmer
797256f53e
Merge "Clarify the explanation of Android's security design."
2010-09-26 14:17:32 -07:00
John Wang
33b5830ece
am becc9148: am 8f5a1211: Merge "Add debug functions." into gingerbread
...
Merge commit 'becc9148e3698eeaf6ea854dabf2808490cd8f62'
* commit 'becc9148e3698eeaf6ea854dabf2808490cd8f62':
Add debug functions.
2010-09-26 14:16:29 -07:00
Daisuke Miyakawa
051c6dba16
am b643cbe5: (-s ours) am e0998604: Add necessary logic removed during backport
...
Merge commit 'b643cbe55852b01f1ab81da76d841b58d890276a'
* commit 'b643cbe55852b01f1ab81da76d841b58d890276a':
Add necessary logic removed during backport
2010-09-26 14:15:40 -07:00
Joe Onorato
ddf680bff5
Touching the blue glow should close the system and notification panels.
...
Bug: 3029373
Change-Id: I96760656dcda20ab238305900f9964083a8e5273
2010-09-26 13:59:40 -07:00
John Wang
becc9148e3
am 8f5a1211: Merge "Add debug functions." into gingerbread
...
Merge commit '8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e' into gingerbread-plus-aosp
* commit '8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e':
Add debug functions.
2010-09-26 13:58:02 -07:00
John Wang
8f5a1211dc
Merge "Add debug functions." into gingerbread
2010-09-26 13:53:33 -07:00
Amith Yamasani
68c3099922
Merge "Make the headers pane disappear in no-headers mode, not just the ListView."
2010-09-26 13:51:59 -07:00
Chet Haase
7aa414048f
Merge "bug fixes in animation classes"
2010-09-26 13:51:30 -07:00
John Wang
55bc084bf4
Add debug functions.
...
Enable more debug in CallManager.
Change-Id: Iaf66e31dc67f7ca9123fe5d8b351a21b1ec8b987
2010-09-26 13:39:55 -07:00
Amith Yamasani
05fbc31ed9
Make the headers pane disappear in no-headers mode, not just the ListView.
2010-09-26 13:29:01 -07:00
Daisuke Miyakawa
b643cbe558
am e0998604: Add necessary logic removed during backport
...
Merge commit 'e0998604df4ddfcd5c87ea097dcc0950a9518ed1' into gingerbread-plus-aosp
* commit 'e0998604df4ddfcd5c87ea097dcc0950a9518ed1':
Add necessary logic removed during backport
2010-09-26 13:12:55 -07:00
Joe Onorato
30a31ef6e5
Merge "Notification updates."
2010-09-26 13:05:15 -07:00
Chet Haase
0e0590bf3c
bug fixes in animation classes
...
Change-Id: I5465bc95032c94851b8cf4e4db3477f546e8b0d1
2010-09-26 13:05:09 -07:00
Joe Onorato
55d2d7646b
Notification updates.
...
When the drawer is open, hide the icons & toasts.
Move Clear button to the bottom and add DND button.
Change-Id: I8b3253eb8f2ff3b1e11a819d58b202e023f00710
2010-09-26 13:02:01 -07:00
Daisuke Miyakawa
e0998604df
Add necessary logic removed during backport
...
Makes importer import contcats into an appropriate group.
Without this logic, all imported contacts are stored in
"Other Groups".
This logic is removed in my previous submit, while
it shouldn't be.
Bug: 3036599
Change-Id: Ic1dc7253d807fbde4352afe2082984c3b7227267
2010-09-26 12:21:33 -07:00
jsh
dbb9ad8206
Add line break between PLMN and SPN in windowshade.
...
bug: 2994598
Change-Id: Id588e18e78e0adcc6a0a4e40599f60c57a40170d
2010-09-26 11:47:12 -07:00
Kenny Root
9f306d78a4
Use buffered output during packages.xml write
...
FileOutputStream writes data one byte at a time, so use the
BufferedOutputStream to wrap it and write once all the XML serialization
is done.
Change-Id: I419a6fcac2ac9a72a6cf41d4ca6e7ab6c7505618
2010-09-26 11:19:47 -07:00
Mike Lockwood
cc64c5dbfb
Merge changes I1302cacd,I05125c79,I8d9653ce
...
* changes:
MTP: Fix some warnings
MTP: Include current property value in GetDevicePropDesc
MTP: Fix reading and writing device property descriptors
2010-09-26 09:42:06 -07:00
Sonia Serafimova
e8374502b4
am f023c4dc: am d45a3355: Prevent unhandled exception in NinePatchDrawable
...
Merge commit 'f023c4dceb9cf112dd621b52b364211e2e549a06'
* commit 'f023c4dceb9cf112dd621b52b364211e2e549a06':
Prevent unhandled exception in NinePatchDrawable
2010-09-26 09:36:10 -07:00
Sonia Serafimova
f023c4dceb
am d45a3355: Prevent unhandled exception in NinePatchDrawable
...
Merge commit 'd45a33554ca6c18ed81e45320998b9e4f4680379' into gingerbread-plus-aosp
* commit 'd45a33554ca6c18ed81e45320998b9e4f4680379':
Prevent unhandled exception in NinePatchDrawable
2010-09-26 09:33:31 -07:00
Sonia Serafimova
d45a33554c
Prevent unhandled exception in NinePatchDrawable
...
Added null check in computeBitmapSize() to avoid unhandled
exception "java.lang.NullPointerException" at
android.graphics.Rect.<init>(Rect.java:72).
This problem was discovered in the wild.
Change-Id: I9d40629a052f1390e1811288af6209d8cc3f679b
2010-09-26 09:07:02 -07:00
Jean-Baptiste Queru
81859bc3d4
am ca3f968c: am 7d9c73fb: Merge "Prevent unhandled exception in NinePatchDrawable"
...
Merge commit 'ca3f968c6f0acbf94988d00bf21a82a2e8f49b86'
* commit 'ca3f968c6f0acbf94988d00bf21a82a2e8f49b86':
Prevent unhandled exception in NinePatchDrawable
2010-09-26 08:44:16 -07:00
Jean-Baptiste Queru
79d716f7de
am 74a8df20: am dcfb271b: Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."
...
Merge commit '74a8df2026514025b186aba80a810a03377a80e9'
* commit '74a8df2026514025b186aba80a810a03377a80e9':
Fix if ACTION_DOWN and lost focus time too close, it will become long press.
2010-09-26 08:44:07 -07:00
Jean-Baptiste Queru
ca3f968c6f
am 7d9c73fb: Merge "Prevent unhandled exception in NinePatchDrawable"
...
Merge commit '7d9c73fb6f6f79f7f92b77482a0edbd7b89f2564' into gingerbread-plus-aosp
* commit '7d9c73fb6f6f79f7f92b77482a0edbd7b89f2564':
Prevent unhandled exception in NinePatchDrawable
2010-09-26 08:39:03 -07:00
Jean-Baptiste Queru
74a8df2026
am dcfb271b: Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."
...
Merge commit 'dcfb271b7fa364d567ffd7c495b2baa28a755251' into gingerbread-plus-aosp
* commit 'dcfb271b7fa364d567ffd7c495b2baa28a755251':
Fix if ACTION_DOWN and lost focus time too close, it will become long press.
2010-09-26 08:38:59 -07:00
Jean-Baptiste Queru
7d9c73fb6f
Merge "Prevent unhandled exception in NinePatchDrawable"
2010-09-26 08:22:15 -07:00
Jean-Baptiste Queru
dcfb271b7f
Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."
2010-09-26 08:16:26 -07:00
Mike Lockwood
ac745c1c6b
MTP: Fix some warnings
...
Change-Id: I1302cacd1df885c770332cecaaea9f7c8ab97b88
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-09-25 21:38:13 -04:00
Mike Lockwood
a2a2128423
MTP: Include current property value in GetDevicePropDesc
...
Change-Id: I05125c79ad58b6f75734fcedcc8af9b689fa9ff3
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-09-25 21:21:05 -04:00
Jamie Gennis
ba2bbcdcbc
Fix the CameraHardwareInterface::setPreviewWindow comment.
...
Change-Id: Ied7eb7872e581e23d9f6f02a551320cdd675e51e
2010-09-25 17:58:15 -07:00
Mike Lockwood
564ff84321
MTP: Fix reading and writing device property descriptors
...
Change-Id: I8d9653ceedfed688addd6c4194c097d7090c3468
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-09-25 08:37:59 -04:00
Romain Guy
1c1797acff
Merge "Add debug mode to measure performance."
2010-09-24 18:45:13 -07:00
Romain Guy
e2d345ea67
Add debug mode to measure performance.
...
Change-Id: I9d4c84034dc200b99c8266165942a7cdbcb5c0c5
2010-09-24 18:39:22 -07:00
Mathias Agopian
d95fec0891
am 495ad4f2: am beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread
...
Merge commit '495ad4f22096aa172d025c16c25497e7dad8f2bd'
* commit '495ad4f22096aa172d025c16c25497e7dad8f2bd':
simple test app for screen capture API
add support for [1974164] Be able to take a screen shot on the device
2010-09-24 18:13:22 -07:00
Dianne Hackborn
960099572d
am c388844d: (-s ours) am 234e42df: DO NOT MERGE. Fix issue #3000764 : API REVIEW: android.R.*
...
Merge commit 'c388844d50a67ecd8eb93d29d618bae1fa3a3c5d'
* commit 'c388844d50a67ecd8eb93d29d618bae1fa3a3c5d':
DO NOT MERGE. Fix issue #3000764 : API REVIEW: android.R.*
2010-09-24 18:10:18 -07:00
Gil Dobjanschi
d66a3fe171
Merge "Adjust the duration of transitions if needed."
2010-09-24 18:08:02 -07:00
Mathias Agopian
495ad4f220
am beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread
...
Merge commit 'beabe75a842d521b005999460d3a6361ab32108e' into gingerbread-plus-aosp
* commit 'beabe75a842d521b005999460d3a6361ab32108e':
simple test app for screen capture API
add support for [1974164] Be able to take a screen shot on the device
2010-09-24 18:07:41 -07:00
Dianne Hackborn
c388844d50
am 234e42df: DO NOT MERGE. Fix issue #3000764 : API REVIEW: android.R.*
...
Merge commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a' into gingerbread-plus-aosp
* commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a':
DO NOT MERGE. Fix issue #3000764 : API REVIEW: android.R.*
2010-09-24 18:05:14 -07:00
Mathias Agopian
beabe75a84
Merge changes I1f7c4535,I741c68a2 into gingerbread
...
* changes:
simple test app for screen capture API
add support for [1974164] Be able to take a screen shot on the device
2010-09-24 18:02:10 -07:00
Dianne Hackborn
234e42df5f
DO NOT MERGE. Fix issue #3000764 : API REVIEW: android.R.*
...
Not going out in GB.
Change-Id: I9d4f5938ec7d2a54c0f72b8eb5a177ee66f12146
2010-09-24 18:00:47 -07:00
Patrick Dubroy
36b113cbbc
am a9cf4494: (-s ours) am 88aa072a: Merge "do not merge - Asset update (pass #3 )" into gingerbread
...
Merge commit 'a9cf44942b8dbdc5bb00b80725ea15d176ebecc8'
* commit 'a9cf44942b8dbdc5bb00b80725ea15d176ebecc8':
do not merge - Asset update (pass #3 )
2010-09-24 17:14:43 -07:00
Winson Chung
086b1e9fc2
Merge "Re-architecting RemoteViewsAdapter internals due to new constraints."
2010-09-24 17:03:16 -07:00
Raphael
dcc9dced33
am cb7c5498: am 91512f57: Layoutlib_create: Unittest for ClassHasNativeVisitor.
...
Merge commit 'cb7c5498709526e2a2367a7f36f83caf05be5f1a'
* commit 'cb7c5498709526e2a2367a7f36f83caf05be5f1a':
Layoutlib_create: Unittest for ClassHasNativeVisitor.
2010-09-24 17:02:00 -07:00
Winson Chung
3ec9a45c36
Re-architecting RemoteViewsAdapter internals due to new constraints.
...
- Respecting the AdapterView/Adapter contract using FrameLayout notification to update individual items
- Initial changes to allow for keeping (currently bitmap only) memory in check when loading numerous RemoteViews
- Fixing issue with leaking activities due to extra service connection references
- Fixing issue with multiple RemoteViewsAdapters being set on the same AdapterView
- Fixing small issue with StackView sometimes requesting indices out of bounds
- Removing background loading, reverting to previous message-queuing method (seems to be performant now)
Change-Id: I42313767aa791dfe35c247c97ae5d64389e6bb4c
2010-09-24 17:00:30 -07:00
Patrick Dubroy
a9cf44942b
am 88aa072a: Merge "do not merge - Asset update (pass #3 )" into gingerbread
...
Merge commit '88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f' into gingerbread-plus-aosp
* commit '88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f':
do not merge - Asset update (pass #3 )
2010-09-24 17:00:19 -07:00
Patrick Dubroy
88aa072aab
Merge "do not merge - Asset update (pass #3 )" into gingerbread
2010-09-24 16:57:46 -07:00
Patrick Dubroy
cc7239b008
do not merge - Asset update (pass #3 )
...
- Updated network status icons & unlock screen
Change-Id: I429ea4bb6090acde1949023e82897712d9fdc924
2010-09-24 16:53:18 -07:00
Raphael
cb7c549870
am 91512f57: Layoutlib_create: Unittest for ClassHasNativeVisitor.
...
Merge commit '91512f579e7a1bf91d23254471ee47d3a88d342f' into gingerbread-plus-aosp
* commit '91512f579e7a1bf91d23254471ee47d3a88d342f':
Layoutlib_create: Unittest for ClassHasNativeVisitor.
2010-09-24 16:43:28 -07:00
Jeff Brown
22ba86cfaf
am ca25d2c3: am 4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.
...
Merge commit 'ca25d2c31dc20f69597be8f34d6da9167d53b4d0'
* commit 'ca25d2c31dc20f69597be8f34d6da9167d53b4d0':
Fixed some timeout and lock reentrance issues with broadcasts.
2010-09-24 16:14:08 -07:00