Gilles Debunne
8ed491b75b
Merge "API fix, AutoCompleteTextView" into jb-dev
2012-05-01 11:58:35 -07:00
Gilles Debunne
1dcd2bfcab
Merge "API fix in TextView" into jb-dev
2012-05-01 11:58:26 -07:00
Michael Jurka
38abb6bdab
am c81a0751: Merge "Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"" into jb-dev
...
* commit 'c81a075196a6e0feed452b689ef523e156701f95':
Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"
2012-05-01 11:50:22 -07:00
Michael Jurka
c81a075196
Merge "Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"" into jb-dev
2012-05-01 11:47:36 -07:00
Winson Chung
0b3d3a3a56
Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"
...
This reverts commit 7ced8f9cabfed2e11c125a1a6b4ff18f1cc50060
2012-05-01 11:46:09 -07:00
Chris Craik
92bc5d086a
Revert "Add header for forward compatibility"
...
GPL build fix mistakenly merged into master
This reverts commit fd862e9828d544f593a622f2914d1257366ae802.
2012-05-01 11:20:20 -07:00
Dianne Hackborn
6d01aea3ef
am a25c8a97: Merge "Add new APIs for permission group flags and priorities." into jb-dev
...
* commit 'a25c8a97aff5f67a70857e6776bba8b4c517a286':
Add new APIs for permission group flags and priorities.
2012-05-01 11:18:16 -07:00
Dianne Hackborn
a25c8a97af
Merge "Add new APIs for permission group flags and priorities." into jb-dev
2012-05-01 11:15:51 -07:00
Chet Haase
2bee5f4f1a
am 3b83dc42: Merge "Fix launcher invisibility bug" into jb-dev
...
* commit '3b83dc42df8d2d2b97bfa63a00f2d0c742fe8dfc':
Fix launcher invisibility bug
2012-05-01 11:14:28 -07:00
Chet Haase
3b83dc42df
Merge "Fix launcher invisibility bug" into jb-dev
2012-05-01 11:11:52 -07:00
Winson Chung
aa43480538
am 7e400cfb: Merge "Adding getters/setters for StackView xml attrs. (Bug 6104219)" into jb-dev
...
* commit '7e400cfb715858a168add7fa6eaa262ab8ad0695':
Adding getters/setters for StackView xml attrs. (Bug 6104219)
2012-05-01 10:58:56 -07:00
Winson Chung
7e400cfb71
Merge "Adding getters/setters for StackView xml attrs. (Bug 6104219)" into jb-dev
2012-05-01 10:55:14 -07:00
Eric Laurent
60420e14e2
am 94affdd8: Merge "fix unmute from volume panel on tablets" into jb-dev
...
* commit '94affdd80e20c334dd5bfff170aee878992195ad':
fix unmute from volume panel on tablets
2012-05-01 10:50:30 -07:00
Daniel Sandler
4f85eb5872
Move legacy menu key to bottom right on sw600dp.
...
It's too easy to press if it's *all* the way to the right,
though, so there a 2dp margin separating it from the bezel.
Bug: 6399312
Change-Id: If4ebcd4cfcee0c667bcc6142af86c04445f41fea
2012-05-01 13:50:29 -04:00
Eric Laurent
94affdd80e
Merge "fix unmute from volume panel on tablets" into jb-dev
2012-05-01 10:47:57 -07:00
James Dong
e481686464
am 59eaa907: Merge "Fix a race condition in Camera API for handling focus" into jb-dev
...
* commit '59eaa907fef9454f6f5ff2ab727eef43bdf7f88d':
Fix a race condition in Camera API for handling focus
2012-05-01 10:27:59 -07:00
Amith Yamasani
a6a7e53bf3
am 2d25d467: Merge "Fixes PreferenceScreen padding and scrollbar position." into jb-dev
...
* commit '2d25d467e651048da0dece22c94c0e7e28d0e529':
Fixes PreferenceScreen padding and scrollbar position.
2012-05-01 10:25:22 -07:00
James Dong
59eaa907fe
Merge "Fix a race condition in Camera API for handling focus" into jb-dev
2012-05-01 10:24:46 -07:00
Amith Yamasani
2d25d467e6
Merge "Fixes PreferenceScreen padding and scrollbar position." into jb-dev
2012-05-01 10:22:01 -07:00
George Mount
e563b19a82
am 91901aeb: Merge "Fix flicker while selecting text." into jb-dev
...
* commit '91901aeb66cf140f50a55e5a8a191585f336432b':
Fix flicker while selecting text.
2012-05-01 10:13:20 -07:00
George Mount
91901aeb66
Merge "Fix flicker while selecting text." into jb-dev
2012-05-01 10:10:16 -07:00
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
Eric Laurent
f740664cd8
fix unmute from volume panel on tablets
...
Changing STREAM_MUSIC from volume panel on tablets should exit silent
mode as does changing STREAM_RING on phones.
Issue 5970208.
Change-Id: Ia8ed62033da07a5d4dfcfa84b0b47b27414bdd9a
2012-05-01 10:05:21 -07:00
Chet Haase
6f9ad204cc
Fix launcher invisibility bug
...
There was a bug in the DisplayList code for layers where we would
set the alpha value for a layer only if the alpha were non-1. This works
most of the time (since the value is usually 1 and doesn't need to
be set at all, and if the value is non-1, it is set correctly). But when
the value has been set to a non-1 value, setting alpha back to 1 cannot happen
due to this logic. This caused launcher to have some invisible pages when
returning to Home because those pages previously had an alpha value of 0, and
setting the alpha to 1 had no effect due to this DisplayList code.
The fix is to simply remove the check for non-1 values; we should
always set the alpha value of layers to handle all cases.
Issue #6413892 alpha value is messed up after AlphaAnimation
Change-Id: Ia51acb2eaaf0609ea7189998ed449bdd9ea7e05f
2012-05-01 10:05:13 -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
George Mount
8072976d7a
Fix flicker while selecting text.
...
Bug 6413113
Change-Id: I5c8d2cda1eae9d5670c757711c49ccc9e47b4127
2012-05-01 08:56:24 -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