59240 Commits

Author SHA1 Message Date
Daniel Sandler
c2ea58b4d6 am aeb11675: Merge "Hide navigation buttons when they are DISABLEd."
* commit 'aeb116750110cf9cc1ef82d208f3a8ba3b8be009':
  Hide navigation buttons when they are DISABLEd.
2011-09-12 10:08:15 -07:00
Daniel Sandler
aeb1167501 Merge "Hide navigation buttons when they are DISABLEd." 2011-09-12 10:06:53 -07:00
Mangesh Ghiware
c031597180 am fa0d2316: Merge "On zoom to overview, reflow text, if necessary."
* commit 'fa0d2316f98ab787ff26383ff651dc31aac60ffd':
  On zoom to overview, reflow text, if necessary.
2011-09-12 09:50:06 -07:00
Jaikumar Ganesh
44c828e7ca am 049f5cc3: Merge "Don\'t override the hash code for the channel."
* commit '049f5cc3de8e30d05a26e135ab0978b3e1fe62b4':
  Don't override the hash code for the channel.
2011-09-12 09:48:06 -07:00
Mangesh Ghiware
fa0d2316f9 Merge "On zoom to overview, reflow text, if necessary." 2011-09-12 09:46:49 -07:00
Jaikumar Ganesh
049f5cc3de Merge "Don't override the hash code for the channel." 2011-09-12 09:45:20 -07:00
The Android Open Source Project
be13575959 am 92bda84b: Reconcile with gingerbread-release
* commit '92bda84b11ba2aec98036313784444d9f5aebc9a':
  one more api missed
  missed part of https://android-git.corp.google.com/g/#/c/104540/
  missed aidl change in previous merge
  bring nfc-extras up to date (same as gingerbread)
2011-09-12 07:49:53 -07:00
The Android Open Source Project
92bda84b11 Reconcile with gingerbread-release
Change-Id: I4b6c483135fc0cb50e6de6c2fde845842c29e25c
2011-09-12 07:46:51 -07:00
satok
ad05f6be86 am d2deee1e: Merge "Fix the visiblity of the ime switcher icon."
* commit 'd2deee1eeb4de93b2d5158dcfc79b1bb68accf79':
  Fix the visiblity of the ime switcher icon.
2011-09-12 00:28:35 -07:00
satok
d2deee1eeb Merge "Fix the visiblity of the ime switcher icon." 2011-09-12 00:25:41 -07:00
satok
9747f8977c Fix the visiblity of the ime switcher icon.
Bug: 5288866
Change-Id: I99b4aee36c337b2fab1116e9245ddecd826c840c
2011-09-12 15:56:40 +09:00
Daniel Sandler
029d5877b0 Hide navigation buttons when they are DISABLEd.
Back is hidden by DISABLE_BACK; Home, Recents, and Menu are
hidden by DISABLE_NAVIGATION.

Bug: 5261576
Bug: 5284740 (confusion about visible inactive icons)
Change-Id: I410c133b737cc11d61bac0318dc24458353ee7b3
2011-09-12 01:02:30 -04:00
Ken Wakasa
be5f2081d6 am e00633e4: Fix NPE
* commit 'e00633e49a7136e14da8ce9938cf6a3333f28498':
  Fix NPE
2011-09-11 20:37:43 -07:00
Ken Wakasa
e00633e49a Fix NPE
bug: 5290369
Change-Id: Ica450c49fc0bc89b1697eaa1086707f481f6be7e
2011-09-12 12:18:09 +09:00
Daniel Sandler
4aa614ea56 am f4b783f8: Merge "Exit the keyguard when the user clicks a notification."
* commit 'f4b783f8a7f7ba56a879b0fce075257659e9f909':
  Exit the keyguard when the user clicks a notification.
2011-09-11 17:10:33 -07:00
Daniel Sandler
2d2e97bdb1 am 8dbdee5b: Merge "Fix bug swiping away NO_CLEAR notifications."
* commit '8dbdee5b167b066f8306a43db4e2a8d410b0370b':
  Fix bug swiping away NO_CLEAR notifications.
2011-09-11 17:10:30 -07:00
Daniel Sandler
f4b783f8a7 Merge "Exit the keyguard when the user clicks a notification." 2011-09-11 17:08:50 -07:00
Daniel Sandler
8dbdee5b16 Merge "Fix bug swiping away NO_CLEAR notifications." 2011-09-11 17:08:41 -07:00
Ben Komalo
4b2efcb26f am 6c048260: Merge "Revert encryption mapping for device wipes."
* commit '6c048260f30d9bba1a83c4f79388cd6b3109be7d':
  Revert encryption mapping for device wipes.
2011-09-11 16:53:00 -07:00
Ben Komalo
6c048260f3 Merge "Revert encryption mapping for device wipes." 2011-09-11 16:48:32 -07:00
Amith Yamasani
da286299f4 am 48b39148: Merge "Fix preference screen padding for legacy apps (non Holo)."
* commit '48b391480519c5d6cb4428af6b29b1e3405e4601':
  Fix preference screen padding for legacy apps (non Holo).
2011-09-11 15:59:47 -07:00
Amith Yamasani
48b3914805 Merge "Fix preference screen padding for legacy apps (non Holo)." 2011-09-11 15:58:31 -07:00
Neal Nguyen
eaa24ce9aa am e1e0613a: Merge "Fixing DownloadManager Test app."
* commit 'e1e0613aa17df7eb8c148dff57b0e6ceec383d5c':
  Fixing DownloadManager Test app.
2011-09-11 15:00:21 -07:00
Neal Nguyen
e1e0613aa1 Merge "Fixing DownloadManager Test app." 2011-09-11 14:58:02 -07:00
Tsu Chiang Chuang
b894677bd4 am 6f0b2ed3: Merge "aggregating test results when reporting to instrumentation out."
* commit '6f0b2ed37db6d959225cf136ef793213bd2a18d9':
  aggregating test results when reporting to instrumentation out.
2011-09-11 14:12:35 -07:00
Tsu Chiang Chuang
6f0b2ed37d Merge "aggregating test results when reporting to instrumentation out." 2011-09-11 14:10:00 -07:00
Daniel Sandler
92d331883a Exit the keyguard when the user clicks a notification.
(This only works if the keyguard is not secure, but then
again, the user can't access the notification panel in that
case anyway.)

Bug: 5173952
Change-Id: I8a6081d26c52843822b381d8ebe0fae94a03bef9
2011-09-11 16:30:03 -04:00
Amith Yamasani
5691c7a2d6 Fix preference screen padding for legacy apps (non Holo).
Also fixes the right margin for single pane preferences on phones, so the
scrollbar is fully visible.

Bug: 5262868
Bug: 5263470
Change-Id: Ifbbe22744bd42ab33578d1f01daecdea4d59f5cc
2011-09-11 13:19:14 -07:00
Dianne Hackborn
54869071db am fe75cb34: Merge "Fix inflating of animations."
* commit 'fe75cb342e33e7c465709bb34ab7abae9e9871f6':
  Fix inflating of animations.
2011-09-11 13:09:40 -07:00
Daniel Sandler
113045ab9c Fix bug swiping away NO_CLEAR notifications.
Bug: 5121507
Change-Id: I798686cfc8506805298e1481a3d603ce700e12f4
2011-09-11 16:08:14 -04:00
Dianne Hackborn
fe75cb342e Merge "Fix inflating of animations." 2011-09-11 13:07:24 -07:00
Chet Haase
245b919119 am 6a6977e8: Merge "Fix 5266335: bad DIRTY/invalidation logic"
* commit '6a6977e8728f3a3d209daadf587079dc7369050b':
  Fix 5266335: bad DIRTY/invalidation logic
2011-09-11 13:00:38 -07:00
Chet Haase
6a6977e872 Merge "Fix 5266335: bad DIRTY/invalidation logic" 2011-09-11 12:58:45 -07:00
Dianne Hackborn
8962028b6e Fix inflating of animations.
Need to define attributes for animation set, to have correct indices.

Also small fixes elsewhere.

Change-Id: If596147e8aee4ebffe4e184872070341eff6df73
2011-09-11 12:47:45 -07:00
Tsu Chiang Chuang
a14d20f60c aggregating test results when reporting to instrumentation out.
Change-Id: Ic652f893d7cfd469a912bd71a094f337166a6aa5
2011-09-11 12:26:29 -07:00
Dianne Hackborn
999cf805a4 am 8a48a2b9: Merge "Fix build."
* commit '8a48a2b96adb718f351ca3b6c3f25c74fef52a03':
  Fix build.
2011-09-11 11:22:40 -07:00
Dianne Hackborn
8a48a2b96a Merge "Fix build." 2011-09-11 11:21:09 -07:00
Dianne Hackborn
b7fd61ee81 Fix build.
Change-Id: I8f0f137649ae69100a2b94706ad9b3861d8dbac0
2011-09-11 11:20:21 -07:00
John Huang
3ae2df52c3 am 3eff066c: Merge "Handle HSPAP."
* commit '3eff066c75d50ebc8b9f40d79853d5c926220463':
  Handle HSPAP.
2011-09-11 11:14:39 -07:00
John Huang
3eff066c75 Merge "Handle HSPAP." 2011-09-11 11:13:29 -07:00
Chet Haase
f186f30a7c Fix 5266335: bad DIRTY/invalidation logic
The DIRTY flag is used to track which elements of the view hierarchy need
to be redrawn on the next drawing operation. This flag is set on the parent
hierarchy of a view when that view is invalidated. There is an optimization for
opaque views that tells the parent that it is dirty, but that it need not
redraw its own content because the view will cover it (since it is opaque).

This dirty-opaque logic breaks down in the current code because we only set
these dirty flags on the parent hierarchy, not on the view itself. In the situation
raised by this bug, we would invalidate the parent container directly (which does
not case the dirty flag to be set), then we would invalidate a child of that view.
Because the child is opaque, the DIRTY_OPAQUE flag would be set on the parent
container. This would cause us, in the later rendering process, to skip the
drawing on that parent container, assuming that it was only asked to be redrawn
because of its opaque child's invalidation.

The fix is to now set the DIRTY flag on an invalidated view, not just on its parent
hierarchy. The DIRTY_OPAQUE logic will avoid setting the opaque flag on views/parents
that are already marked DIRTY, thus an invalidated parent will be correctly drawn
during the drawing process.

Change-Id: Ib5e014a125a4f5168f6a5a3166e941474659aca5
2011-09-11 11:06:06 -07:00
Dianne Hackborn
4819eaab20 am 1a9c6c97: Merge "The wave view attributes should not be public."
* commit '1a9c6c97fa9f156d16190e519ae4faa13371fa72':
  The wave view attributes should not be public.
2011-09-11 10:58:27 -07:00
Dianne Hackborn
1a9c6c97fa Merge "The wave view attributes should not be public." 2011-09-11 10:56:01 -07:00
Svetoslav Ganov
a008efb8f7 am fd19906b: Merge "Inter process interrogation ocassionally gets stuck."
* commit 'fd19906b50927834787403ca984f6fda93b53410':
  Inter process interrogation ocassionally gets stuck.
2011-09-09 18:59:26 -07:00
Svetoslav Ganov
fd19906b50 Merge "Inter process interrogation ocassionally gets stuck." 2011-09-09 18:57:35 -07:00
Svetoslav Ganov
6bc5e53001 Inter process interrogation ocassionally gets stuck.
1. There was a bug that was not handling correctly the
   case for which the interrogator requests an accessibility
   node info and the message describing how to fetch the
   latter for the same process case was delivered after the
   code that checks whether the message is there in order to
   dispatch it is executed. Now the message handling is done
   correctly - the caller checks if the message is present and
   if so processes it, otherwise the caller sleeps and is
   interrupted if such a message arrives.

bug:5138933

Change-Id: I4c2940b46c9a52a51c5ee48b83ca6811489765d6
2011-09-09 18:52:26 -07:00
Dianne Hackborn
acc3012cd0 The wave view attributes should not be public.
Change-Id: I7f021fc79385f5cf2e252389cc5f672f334ee4c4
2011-09-09 18:35:23 -07:00
android-merger
1524cad7f7 one more api missed
Change-Id: Ibfcb9155974edc96b4c98742d8d89987d3b176b6
2011-09-09 18:35:13 -07:00
Adam Powell
99c3297505 am dbed0722: Fix build
* commit 'dbed072251306bb1d8d9cdca46eed491539f92c0':
  Fix build
2011-09-09 18:14:17 -07:00
Adam Powell
dbed072251 Fix build
Change-Id: I2b1ad9f057367873554ca4df0c93050bbbc9ebb7
2011-09-09 18:09:51 -07:00