The Android Open Source Project
2455c4916e
Reconcile with jb-release
...
Change-Id: Idb05db9a3cd879261a0ea9ed96a433531e0441b4
2012-05-22 13:04:57 -07:00
The Android Automerger
07e7a1f45c
merge in jb-release history after reset to jb-dev
2012-05-22 07:00:23 -07:00
Svetoslav Ganov
ef03d1bae6
am 84710bb8: Merge "Updating the accessibility sample due to a security fix." into jb-dev
...
* commit '84710bb8b0f3b149feb72d4c29dec35a4ccf327d':
Updating the accessibility sample due to a security fix.
2012-05-21 13:17:13 -07:00
Svetoslav Ganov
84710bb8b0
Merge "Updating the accessibility sample due to a security fix." into jb-dev
2012-05-21 13:13:41 -07:00
The Android Automerger
7a68eb9bc1
merge in jb-release history after reset to jb-dev
2012-05-21 07:00:31 -07:00
Dianne Hackborn
03239663fc
am 7d7d2fb6: Merge "A few little tweaks to system ui flag demos." into jb-dev
...
* commit '7d7d2fb6d6b8c30cd6549b9cb35e9a0d36f87981':
A few little tweaks to system ui flag demos.
2012-05-20 21:53:24 -07:00
Dianne Hackborn
7d7d2fb6d6
Merge "A few little tweaks to system ui flag demos." into jb-dev
2012-05-20 10:17:58 -07:00
The Android Automerger
66641b03ad
merge in jb-release history after reset to jb-dev
2012-05-20 07:39:37 -07:00
The Android Automerger
091f5c3043
merge in jb-release history after reset to jb-dev
2012-05-19 11:42:46 -07:00
The Android Automerger
967d0604a3
merge in jb-release history after reset to jb-dev
2012-05-19 10:05:42 -07:00
Dianne Hackborn
58ce6f06a1
A few little tweaks to system ui flag demos.
...
Change-Id: Ib4c3b45e8d67200a2b4f3a8b0daee198b24bad0f
2012-05-18 19:43:57 -07:00
The Android Open Source Project
65e6090418
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I049767beb7309d00aca6793a9a67d5191c6c53bc
2012-05-18 18:42:01 -07:00
Xia Wang
08eafbb0cf
am d699ad18: Merge "Remove the WaitEvent added in Tap and Drag." into jb-dev
...
* commit 'd699ad187756b1138e6c697c285dd476c2d0c449':
Remove the WaitEvent added in Tap and Drag.
2012-05-18 17:55:38 -07:00
Xia Wang
d699ad1877
Merge "Remove the WaitEvent added in Tap and Drag." into jb-dev
2012-05-18 17:52:58 -07:00
Xia Wang
5e20670c0b
Remove the WaitEvent added in Tap and Drag.
...
As the delay is added as WaitEvent, throttle time is applied after
the WaitEvent. This cause problem for Tap and Drag. The thorrle time
is then inserted between ACTION_DOWN and ACTION_UP, or ACTION_DOWN
and ACTION_MOVE. This broke the two actions.
Change-Id: I5a122d6cb3d99e38d9442c3de50e0360652c4baf
2012-05-18 17:04:02 -07:00
Svetoslav Ganov
7947d9fb6a
Updating the accessibility sample due to a security fix.
...
1. We have fixed a security issue in the framework and
this patch is updating the sample.
Change-Id: Icc266ceaf0064cf8d9a00d7ad48746e1f0fbbbf1
2012-05-18 12:52:33 -07:00
The Android Automerger
2c57249f22
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-18 10:46:12 -07:00
The Android Automerger
8e8838df34
merge in jb-release history after reset to jb-dev
2012-05-17 07:00:16 -07:00
Andy Stadler
8eb23596b7
am 285ee4b3: Merge "Fix .classpath for eclipse. DO NOT MERGE" into jb-dev
...
* commit '285ee4b3b009d80683a5188b71ba125dd94e6cf7':
Fix .classpath for eclipse. DO NOT MERGE
2012-05-16 16:12:02 -07:00
Andy Stadler
285ee4b3b0
Merge "Fix .classpath for eclipse. DO NOT MERGE" into jb-dev
2012-05-16 16:02:33 -07:00
Andy Stadler
c26d4211cc
Fix .classpath for eclipse. DO NOT MERGE
...
I've marked this do-not-merge because Email/Exchange are different
in master and this will probably break 'em.
Change-Id: I9f10bd41e143d7b9b6c784d503e79ec28e9f56c3
2012-05-16 15:58:26 -07:00
Jason Sams
edcc4754ee
am dd1b1981: Merge "Put the compute samples back in the SDK." into jb-dev
...
* commit 'dd1b1981c33fad38567d4d1e2d56f5ac89ad8101':
Put the compute samples back in the SDK.
2012-05-16 15:12:56 -07:00
Jason Sams
dd1b1981c3
Merge "Put the compute samples back in the SDK." into jb-dev
2012-05-16 15:08:11 -07:00
Jason Sams
8cb9623c6d
Put the compute samples back in the SDK.
...
Change-Id: Idda5b632750e52eecf3a16205a0ff14af17b2e1b
2012-05-16 13:00:38 -07:00
Raphael Moll
30298a6c26
am 91ab8ff8: am 69ce67b4: Merge "Fix Mac SDK: sed s/--in-place/-i/"
...
* commit '91ab8ff8260e2dd27a3537fdbb20720c0391e2ce':
Fix Mac SDK: sed s/--in-place/-i/
2012-05-16 09:14:27 -07:00
The Android Open Source Project
0e09ff0879
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I7609d4ca3f8fdfff4173ac67c0aa2b47c2210751
2012-05-16 08:40:02 -07:00
The Android Automerger
8d4e6ceead
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-16 07:43:34 -07:00
The Android Automerger
8e58a756b2
merge in jb-release history after reset to jb-dev
2012-05-16 07:00:24 -07:00
Raphael Moll
495f0c27a5
resolved conflicts for merge of cf390116 to jb-dev-plus-aosp
...
Change-Id: Ia215d78fbeefc59ccd1868fe1365f4260b561e24
2012-05-15 20:24:51 -07:00
Raphael Moll
91ab8ff826
am 69ce67b4: Merge "Fix Mac SDK: sed s/--in-place/-i/"
...
* commit '69ce67b42dca77762b18c3a1770a6a32e8c51bbf':
Fix Mac SDK: sed s/--in-place/-i/
2012-05-15 18:38:41 -07:00
Raphael Moll
69ce67b42d
Merge "Fix Mac SDK: sed s/--in-place/-i/"
2012-05-15 17:45:52 -07:00
Raphael Moll
cf3901168b
SDK: don't generate empty codename line in source.properties. DO NOT MERGE.
...
SDK Bug: b/6490860
Change-Id: I3fbc0b710db891a1649138c8badf4ad88d6e2507
2012-05-15 17:37:44 -07:00
Raphael Moll
877b365e36
Fix Mac SDK: sed s/--in-place/-i/
...
Change-Id: Idd6481fd86c62596e95647bd3acaedf1a7158640
2012-05-15 17:22:50 -07:00
Raphael Moll
c96a1dae1d
am c678e6a5: am d721f0e2: Merge "Fix SDK: don\'t generate empty codename line in source.properties."
...
* commit 'c678e6a5353126ec97d3db4911d8e630fdebe384':
Fix SDK: don't generate empty codename line in source.properties.
2012-05-15 13:38:07 -07:00
Raphael Moll
c678e6a535
am d721f0e2: Merge "Fix SDK: don\'t generate empty codename line in source.properties."
...
* commit 'd721f0e2c2d800743f315e39f29081db6362c850':
Fix SDK: don't generate empty codename line in source.properties.
2012-05-15 13:35:31 -07:00
Raphael Moll
d721f0e2c2
Merge "Fix SDK: don't generate empty codename line in source.properties."
2012-05-15 13:28:56 -07:00
Raphael Moll
c52a37f326
am f9f9ea96: am 66493c9e: Merge "SDK: don\'t generate empty codename line in source.properties."
...
* commit 'f9f9ea96c1ec64a4b3796c077714e1c100dc3be4':
SDK: don't generate empty codename line in source.properties.
2012-05-15 13:17:55 -07:00
Raphael Moll
f9f9ea96c1
am 66493c9e: Merge "SDK: don\'t generate empty codename line in source.properties."
...
* commit '66493c9e6ac3ec87f33347bea745b43b04519bd1':
SDK: don't generate empty codename line in source.properties.
2012-05-15 13:15:48 -07:00
Raphael Moll
8707207977
Fix SDK: don't generate empty codename line in source.properties.
...
This fixes commit 41a7acfa6b .
Change-Id: I3cc6ee0efea53fd0469c29fb0ffa87d727b15431
2012-05-15 12:26:37 -07:00
Raphael Moll
66493c9e6a
Merge "SDK: don't generate empty codename line in source.properties."
2012-05-15 10:37:04 -07:00
Raphael Moll
41a7acfa6b
SDK: don't generate empty codename line in source.properties.
...
SDK Bug: b/6490860
Change-Id: I1eb7090eedca961a2a71a18e5dcef68e6cbf7163
2012-05-14 21:00:01 -07:00
The Android Automerger
71423872ab
merge in jb-release history after reset to jb-dev
2012-05-14 07:00:16 -07:00
Dianne Hackborn
47c76a815c
am f2bc2a02: Work on issue #6475693 OnSystemUiVisibilityChangeListener reporting...
...
* commit 'f2bc2a024cbcf12500c598dc97f71cfcb0168007':
Work on issue #6475693 OnSystemUiVisibilityChangeListener reporting...
2012-05-10 15:36:09 -07:00
Dianne Hackborn
f2bc2a024c
Work on issue #6475693 OnSystemUiVisibilityChangeListener reporting...
...
...incorrect visibility when the ActionBar overflow menu is opened
Improve API demos.
Change-Id: I3e831152a0dbb56270a80cf58e9441b55059c884
2012-05-10 15:26:52 -07:00
Jean-Michel Trivi
3378371247
am f6b7dd7e: Merge "Add FLAC encoder to the list of media codecs." into jb-dev
...
* commit 'f6b7dd7e7d6cd9c8ee18f6b8c9fba2f26a50bd35':
Add FLAC encoder to the list of media codecs.
2012-05-10 10:45:17 -07:00
Jean-Michel Trivi
f6b7dd7e7d
Merge "Add FLAC encoder to the list of media codecs." into jb-dev
2012-05-10 09:55:15 -07:00
Jean-Michel Trivi
cb62e8bf28
Add FLAC encoder to the list of media codecs.
...
Bug 5525503
Change-Id: I2326bfec38dbbb641d8c32f5dee98da9da6c3a83
2012-05-09 15:54:27 -07:00
Xavier Ducrohet
1ccd581a94
am 6bd1ae5e: Fix skin.
...
* commit '6bd1ae5e75a7ac67a72d15d6f0900284eaa4ea51':
Fix skin.
2012-05-09 01:45:28 -07:00
The Android Automerger
d587082b9a
merge in jb-release history after reset to jb-dev
2012-05-08 08:14:21 -07:00
Xavier Ducrohet
6bd1ae5e75
Fix skin.
...
Bug: 6447905
Change-Id: I50779c5c343ed9f0bf432336b861153e9b047f07
2012-05-07 18:14:36 -07:00