Jean-Baptiste Queru
647867ad5a
am 63d944d6: am 93a8225e: Merge "Improve robustness of resource overlay test suite."
...
* commit '63d944d62e9c85e2b2aa611be1a8d5a6c6ff973f':
Improve robustness of resource overlay test suite.
2012-05-01 10:09:21 -07:00
Jean-Baptiste Queru
3e2d59146d
resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp
...
Change-Id: Ib7aa5a768f4606beb2a4387811cfed7c00cbc111
2012-05-01 10:02:02 -07:00
Jean-Baptiste Queru
39b58ba2b2
resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp
...
Change-Id: I5386585e473201268c6ed8b05e0a16569d434ea2
2012-05-01 09:54:38 -07:00
Jean-Baptiste Queru
63d944d62e
am 93a8225e: Merge "Improve robustness of resource overlay test suite."
...
* commit '93a8225e54da124807734ff8e4c7790158d06b7c':
Improve robustness of resource overlay test suite.
2012-05-01 09:43:31 -07:00
Jean-Baptiste Queru
13c04786ce
am b2228eb7: Merge "Runtime resource overlay: clean-up."
...
* commit 'b2228eb7141354089f974a4db3b5224a0ad75fd4':
Runtime resource overlay: clean-up.
2012-05-01 09:43:28 -07:00
Jean-Baptiste Queru
bc2fb7b92e
am 9e3bc3f6: Merge "Build overlay packages just like regular packages."
...
* commit '9e3bc3f61df541271c8a1dfc5564cab853951aec':
Build overlay packages just like regular packages.
2012-05-01 09:43:25 -07:00
Jean-Baptiste Queru
93a8225e54
Merge "Improve robustness of resource overlay test suite."
2012-05-01 09:20:47 -07:00
Jean-Baptiste Queru
b2228eb714
Merge "Runtime resource overlay: clean-up."
2012-05-01 09:20:32 -07:00
Jean-Michel Trivi
a43d2589b1
am 8ccfbddd: Merge "Optimize how AudioService receives media button events" into jb-dev
...
* commit '8ccfbdddabf3387a1ac9d46bd057bea64eb30ef3':
Optimize how AudioService receives media button events
2012-05-01 08:59:19 -07:00
Jean-Michel Trivi
8ccfbdddab
Merge "Optimize how AudioService receives media button events" into jb-dev
2012-05-01 08:57:18 -07:00
Jean-Baptiste Queru
16e24dd88e
am ede38b5c: am 6a8186fb: Merge "Fixed group and child view caching in SimpleExpandableListAdapter."
...
* commit 'ede38b5c6c93bfd64522357d2075398c79431e1b':
Fixed group and child view caching in SimpleExpandableListAdapter.
2012-05-01 08:53:10 -07:00
Jean-Baptiste Queru
bf65cc3bb6
am 8f2e753b: am cbc71bd7: Merge "Fix off-by-one error when filtering application UIDs"
...
* commit '8f2e753be2343b41f7233e9e0eb79077c8f9a732':
Fix off-by-one error when filtering application UIDs
2012-05-01 08:53:07 -07:00
Jean-Baptiste Queru
c6eda48e0a
am e28ccbab: am 7a082985: Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"."
...
* commit 'e28ccbab9a5634b6d9557240161310451c660e47':
Fixes an issue that occured unexpected exception "pointerIndex out of range".
2012-05-01 08:53:05 -07:00
Jean-Baptiste Queru
ede38b5c6c
am 6a8186fb: Merge "Fixed group and child view caching in SimpleExpandableListAdapter."
...
* commit '6a8186fb88455fcc418def0650b7b9f8f3573153':
Fixed group and child view caching in SimpleExpandableListAdapter.
2012-05-01 08:50:24 -07:00
Jean-Baptiste Queru
8f2e753be2
am cbc71bd7: Merge "Fix off-by-one error when filtering application UIDs"
...
* commit 'cbc71bd73fb5eb674e0213b8713d330501d4cec7':
Fix off-by-one error when filtering application UIDs
2012-05-01 08:50:21 -07:00
Jean-Baptiste Queru
e28ccbab9a
am 7a082985: Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"."
...
* commit '7a0829850ee8d1ee2f436c40c8a5af2ff7d96533':
Fixes an issue that occured unexpected exception "pointerIndex out of range".
2012-05-01 08:50:18 -07:00
Jean-Baptiste Queru
9e3bc3f61d
Merge "Build overlay packages just like regular packages."
2012-05-01 08:49:38 -07:00
Jean-Baptiste Queru
f6d8e0cafd
am 50bd9d61: am 4426961e: Merge "Avoiding horizontal keypad navigation trapping within gallery."
...
* commit '50bd9d616695b2162b84a204bc678b83a14f59c9':
Avoiding horizontal keypad navigation trapping within gallery.
2012-05-01 06:47:24 -07:00
Jean-Baptiste Queru
2d28f53514
am 31ab51a3: am 2066f7d9: Merge "Prevent empty overflow popup when there are no overflow items."
...
* commit '31ab51a369ab57c82d0271115ba31b3b20ce6e6b':
Prevent empty overflow popup when there are no overflow items.
2012-05-01 06:47:21 -07:00
Jean-Baptiste Queru
a3c6d8cfd6
am 415b8125: am d805c677: Merge "Possible NullPointerException in restorePanelState"
...
* commit '415b812569cb78e560f9d3a2a4d8944680669318':
Possible NullPointerException in restorePanelState
2012-05-01 06:47:18 -07:00
Jean-Baptiste Queru
5e4f01f02d
am f59d2912: am bfe71c35: Merge "statistics from some cpus don\'t fit"
...
* commit 'f59d2912354a6be6f6181ec945f6f657a5469fb8':
statistics from some cpus don't fit
2012-05-01 06:47:15 -07:00
Jean-Baptiste Queru
50bd9d6166
am 4426961e: Merge "Avoiding horizontal keypad navigation trapping within gallery."
...
* commit '4426961e7b2eb7733dbb0661c47c6aea2f2f7e75':
Avoiding horizontal keypad navigation trapping within gallery.
2012-05-01 06:44:11 -07:00
Jean-Baptiste Queru
31ab51a369
am 2066f7d9: Merge "Prevent empty overflow popup when there are no overflow items."
...
* commit '2066f7d9864d46858588a839a7f39a1526c737bc':
Prevent empty overflow popup when there are no overflow items.
2012-05-01 06:44:08 -07:00
Jean-Baptiste Queru
415b812569
am d805c677: Merge "Possible NullPointerException in restorePanelState"
...
* commit 'd805c67749e7bc80d77028ffa3b58de3b04f621b':
Possible NullPointerException in restorePanelState
2012-05-01 06:44:05 -07:00
Jean-Baptiste Queru
f59d291235
am bfe71c35: Merge "statistics from some cpus don\'t fit"
...
* commit 'bfe71c35a836e14b7a9f58d90f26fd187df82b06':
statistics from some cpus don't fit
2012-05-01 06:44:01 -07:00
Jean-Baptiste Queru
6a8186fb88
Merge "Fixed group and child view caching in SimpleExpandableListAdapter."
2012-05-01 06:43:03 -07:00
Jean-Baptiste Queru
cbc71bd73f
Merge "Fix off-by-one error when filtering application UIDs"
2012-05-01 06:42:36 -07:00
Jean-Baptiste Queru
7a0829850e
Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"."
2012-05-01 06:42:12 -07:00
Jean-Baptiste Queru
4426961e7b
Merge "Avoiding horizontal keypad navigation trapping within gallery."
2012-05-01 05:52:22 -07:00
Jean-Baptiste Queru
2066f7d986
Merge "Prevent empty overflow popup when there are no overflow items."
2012-05-01 05:52:12 -07:00
Jean-Baptiste Queru
d805c67749
Merge "Possible NullPointerException in restorePanelState"
2012-05-01 05:52:00 -07:00
Jean-Baptiste Queru
bfe71c35a8
Merge "statistics from some cpus don't fit"
2012-05-01 05:51:49 -07:00
Jeff Brown
755d379761
am 29836177: am c5b755cd: Merge "Modify getState to prefer AKEY_STATE_DOWN and AKEY_STATE_UP over AKEY_STATE_UNKNOWN."
...
* commit '298361775b0d1938aa5fddb834c2f668fbb1fa27':
Modify getState to prefer AKEY_STATE_DOWN and AKEY_STATE_UP over AKEY_STATE_UNKNOWN.
2012-04-30 22:54:34 -07:00
satok
bc8d800d2f
am 6dbac379: Merge "Show ongoing ime switch icon on sw600" into jb-dev
...
* commit '6dbac3798128574accff64a9a2b00b2176058898':
Show ongoing ime switch icon on sw600
2012-04-30 22:04:38 -07:00
satok
6dbac37981
Merge "Show ongoing ime switch icon on sw600" into jb-dev
2012-04-30 22:02:07 -07:00
Jeff Brown
298361775b
am c5b755cd: Merge "Modify getState to prefer AKEY_STATE_DOWN and AKEY_STATE_UP over AKEY_STATE_UNKNOWN."
...
* commit 'c5b755cd5d0718e6b45f2d5a88171d66f0e4e497':
Modify getState to prefer AKEY_STATE_DOWN and AKEY_STATE_UP over AKEY_STATE_UNKNOWN.
2012-04-30 21:12:30 -07:00
satok
c861b68a52
Show ongoing ime switch icon on sw600
...
Bug: 6422307
Change-Id: If10758e0d4ca59da4f3ab07d52dda6673af9c0a8
2012-05-01 12:05:12 +09:00
Dianne Hackborn
8b86cb6a26
am 414d50bc: Merge "Fix issue #6234928 : android.app.IntentReceiverLeaked:" into jb-dev
...
* commit '414d50bce61be36dac88a6aaad138f99e2e26513':
Fix issue #6234928 : android.app.IntentReceiverLeaked:
2012-04-30 18:31:17 -07:00
Dianne Hackborn
414d50bce6
Merge "Fix issue #6234928 : android.app.IntentReceiverLeaked:" into jb-dev
2012-04-30 18:29:20 -07:00
Adam Powell
ee84950020
am 5703bbfa: Merge "Fix a bug in ListView where touch scrolling could skip a data set change" into jb-dev
...
* commit '5703bbfa3d119ee4643983422f9dfeb23b20f446':
Fix a bug in ListView where touch scrolling could skip a data set change
2012-04-30 18:25:36 -07:00
Adam Powell
5703bbfa3d
Merge "Fix a bug in ListView where touch scrolling could skip a data set change" into jb-dev
2012-04-30 18:23:49 -07:00
Ruei-sung Lin
b4863691f5
am 56ce3c00: Merge "Fix b/5821633: Could not activate GLEnvironment" into jb-dev
...
* commit '56ce3c00fb120133dbd706da8f550bc6ed9c3722':
Fix b/5821633: Could not activate GLEnvironment
2012-04-30 17:58:13 -07:00
Ruei-sung Lin
56ce3c00fb
Merge "Fix b/5821633: Could not activate GLEnvironment" into jb-dev
2012-04-30 17:55:09 -07:00
Jean-Michel Trivi
c68022258e
Optimize how AudioService receives media button events
...
AudioService maintains a stack of registered media button event
receivers.
This change modifies the broadcasters of ACTION_MEDIA_BUTTON intents
let AudioService directly handle the corresponding key event instead
of trapping the intent sent by PhoneWindowManager, KeyguardViewBase
and PhoneFallbackEventHandler.
Because the key event may be sent through a PendingIntent,
AudioService now also implements the OnFinished interface to be
notified when the event was consumed so it can release the wake
lock held if it was held when the key event needed to be sent
(see where PassHeadsetKey was instanciated in PhoneWindowManager).
Change-Id: I2e8614df94af9d54edbf714ef443cc372d21827a
2012-04-30 17:46:19 -07:00
Svetoslav Ganov
1c08d68f25
am af897822: Merge "AccessibilityNodeInfo.getActionSymbolicName() is missing A11y focus actions." into jb-dev
...
* commit 'af8978226f5e929bd5d4dab04edd11218e8ac6ce':
AccessibilityNodeInfo.getActionSymbolicName() is missing A11y focus actions.
2012-04-30 17:44:03 -07:00
Svetoslav Ganov
63ef8272b5
am fb68fdb9: Merge "Accessibility should not change input focus behavior." into jb-dev
...
* commit 'fb68fdb9c6e915e38ec5c7f4b0d526b613e4ea8b':
Accessibility should not change input focus behavior.
2012-04-30 17:41:24 -07:00
Svetoslav Ganov
af8978226f
Merge "AccessibilityNodeInfo.getActionSymbolicName() is missing A11y focus actions." into jb-dev
2012-04-30 17:39:47 -07:00
Svetoslav Ganov
fb68fdb9c6
Merge "Accessibility should not change input focus behavior." into jb-dev
2012-04-30 17:39:24 -07:00
Jeff Brown
52501786e4
am f2dc6fc4: Merge "Fix Javadoc." into jb-dev
...
* commit 'f2dc6fc442385e08745762fcc2468ad89e2c78dc':
Fix Javadoc.
2012-04-30 17:31:23 -07:00
Jeff Brown
f2dc6fc442
Merge "Fix Javadoc." into jb-dev
2012-04-30 17:28:49 -07:00