Peter Ng
c72a495704
am 5a912ac8: am 31737eaa: am a8666422: Merge "moving accessibility image to callouts" into jb-dev
...
* commit '5a912ac8b9a7c289519572234a33129c584716a0':
moving accessibility image to callouts
2012-08-01 09:03:29 -07:00
Peter Ng
2c2291a046
am 5e07b6bd: am edd7873c: am c2eb7080: Merge "new extras section linking to design talks" into jb-dev
...
* commit '5e07b6bd2658fb993c32bdbb4a97384fe021a7a3':
new extras section linking to design talks
2012-08-01 09:03:20 -07:00
Peter Ng
5a912ac8b9
am 31737eaa: am a8666422: Merge "moving accessibility image to callouts" into jb-dev
...
* commit '31737eaa39bd0ef21a3cdc5470bbf124c70a6948':
moving accessibility image to callouts
2012-08-01 08:59:37 -07:00
Peter Ng
5e07b6bd26
am edd7873c: am c2eb7080: Merge "new extras section linking to design talks" into jb-dev
...
* commit 'edd7873c3475b871b6496e854e369c8f15c7e9a1':
new extras section linking to design talks
2012-08-01 08:59:33 -07:00
Peter Ng
31737eaa39
am a8666422: Merge "moving accessibility image to callouts" into jb-dev
...
* commit 'a86664223612ba8bfaded5a2ae2178b6482d9fd5':
moving accessibility image to callouts
2012-08-01 08:51:53 -07:00
Peter Ng
edd7873c34
am c2eb7080: Merge "new extras section linking to design talks" into jb-dev
...
* commit 'c2eb7080481096777660aa726d46c2ccf21aca0d':
new extras section linking to design talks
2012-08-01 08:51:42 -07:00
Raph Levien
38dcf95ad5
am 1ae49ab8: Merge "Fix bug 6892600 Font (character pairs) rendering issue" into jb-mr1-dev
...
* commit '1ae49ab8655baeb0ddf1944d0a66cd598122408a':
Fix bug 6892600 Font (character pairs) rendering issue
2012-07-31 19:29:24 -07:00
Raph Levien
1ae49ab865
Merge "Fix bug 6892600 Font (character pairs) rendering issue" into jb-mr1-dev
2012-07-31 19:26:55 -07:00
Romain Guy
5d89b70a5d
am 413ab3a5: Merge "Improve gradients" into jb-mr1-dev
...
* commit '413ab3a5a2065295080ae063a72a9a7e30f2d484':
Improve gradients
2012-07-31 18:58:18 -07:00
Romain Guy
413ab3a5a2
Merge "Improve gradients" into jb-mr1-dev
2012-07-31 18:55:44 -07:00
Romain Guy
42e1e0d482
Improve gradients
...
Avoid using textures for common gradients (two stops from 0.0 to 1.0)
Change-Id: Iff55d21b126c8cfc4cfb701669f2339c8f6b131a
2012-07-31 18:55:16 -07:00
Dianne Hackborn
740edf9470
am 3805e8ca: Merge "Optimize memory use of IntentResolver." into jb-mr1-dev
...
* commit '3805e8ca0a5ba05afd8e04e19e440bbbe3469b81':
Optimize memory use of IntentResolver.
2012-07-31 18:26:45 -07:00
Dianne Hackborn
3805e8ca0a
Merge "Optimize memory use of IntentResolver." into jb-mr1-dev
2012-07-31 18:24:25 -07:00
Dianne Hackborn
0084082779
am 40e5df95: Merge "Make AtomicFile a public API. It\'s about time!" into jb-mr1-dev
...
* commit '40e5df95ff9468cec0624ca7fb14e51c13e4b047':
Make AtomicFile a public API. It's about time!
2012-07-31 18:13:38 -07:00
Dianne Hackborn
40e5df95ff
Merge "Make AtomicFile a public API. It's about time!" into jb-mr1-dev
2012-07-31 18:11:03 -07:00
Dianne Hackborn
39606a007a
Make AtomicFile a public API. It's about time!
...
Change-Id: Ib34e294747405b7ab709cb0bbb2d9a0cc80ce86a
2012-07-31 17:54:52 -07:00
Jeff Sharkey
37f0fbf352
am 24d19fb6: Revert "API to adjust network stats."
...
* commit '24d19fb6ab94cc5fd23f1c9a1d7916948a7fd571':
Revert "API to adjust network stats."
2012-07-31 17:19:34 -07:00
Jeff Sharkey
24d19fb6ab
Revert "API to adjust network stats."
2012-07-31 17:11:07 -07:00
Adam Powell
015b2c1e0b
am 8ab8fbbf: Merge "Don\'t let ScrollView intercept touch events if it can\'t scroll." into jb-mr1-dev
...
* commit '8ab8fbbf46d8779f53301e7f706f97608eed7117':
Don't let ScrollView intercept touch events if it can't scroll.
2012-07-31 16:43:49 -07:00
Adam Powell
8ab8fbbf46
Merge "Don't let ScrollView intercept touch events if it can't scroll." into jb-mr1-dev
2012-07-31 16:41:37 -07:00
Adam Powell
0278c2fcba
Don't let ScrollView intercept touch events if it can't scroll.
...
Bug 6872104
Change-Id: Iee643e052acc37485a8ec45b7af8be0783fb1a95
2012-07-31 16:39:32 -07:00
Peter Ng
a866642236
Merge "moving accessibility image to callouts" into jb-dev
2012-07-31 16:08:33 -07:00
Peter Ng
353474c0ac
moving accessibility image to callouts
...
Change-Id: Ia67240a5eced57803d4593269a509b28fe2ecf9c
2012-07-31 16:02:33 -07:00
Peter Ng
c2eb708048
Merge "new extras section linking to design talks" into jb-dev
2012-07-31 16:01:13 -07:00
Peter Ng
6a681afd38
new extras section linking to design talks
...
Change-Id: Ia16fb1a90f4f8e3d42dea978e17cea0ed6cd107e
2012-07-31 15:47:38 -07:00
Jason Sams
1e6b7a6462
am a9fa7b25: Merge "save 2ms replace div with mul." into jb-mr1-dev
...
* commit 'a9fa7b25ddefc3ba4cbf30ce05453d5e3459dbe1':
save 2ms replace div with mul.
2012-07-31 15:32:05 -07:00
Jason Sams
a9fa7b25dd
Merge "save 2ms replace div with mul." into jb-mr1-dev
2012-07-31 15:30:29 -07:00
The Android Open Source Project
d5b7c9551b
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ic4f7a305b2a135879e19d4c7e517e7f1b02005b8
2012-07-31 15:08:13 -07:00
Scott Main
d6d0fb3232
am 22a7b9de: am ba751a0a: am f284d492: docs: fix broken links
...
* commit '22a7b9de5e7037edfa2b9df9f33974ea0a8e718a':
docs: fix broken links
2012-07-31 15:02:35 -07:00
Scott Main
22a7b9de5e
am ba751a0a: am f284d492: docs: fix broken links
...
* commit 'ba751a0adef55059a2ff6d64903d97309983c536':
docs: fix broken links
2012-07-31 14:59:53 -07:00
Scott Main
ba751a0ade
am f284d492: docs: fix broken links
...
* commit 'f284d49293aead609de5b83d601260cfd86b7978':
docs: fix broken links
2012-07-31 14:57:37 -07:00
The Android Open Source Project
50ce252644
am 9dcfff20: am ca4117ca: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit '9dcfff205e05c62e97b5aabedaa8c30309b99738':
2012-07-31 14:54:57 -07:00
The Android Open Source Project
9dcfff205e
am ca4117ca: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'ca4117ca387fbcd8a9e18070e0a73c2eae4baa22':
2012-07-31 14:51:16 -07:00
The Android Open Source Project
ca4117ca38
Reconcile with jb-mr0-release - do not merge
...
Change-Id: Ica8b95c440b5c3fe0a7d31e9633d4ac1b0e02c38
2012-07-31 14:48:19 -07:00
Scott Main
f284d49293
docs: fix broken links
...
Change-Id: I0523fb8eb8608b07cf7ca866d0c2ccfcbfc2e946
2012-07-31 14:19:33 -07:00
The Android Automerger
4594d8baf8
merge in jb-mr0-release history after reset to jb-dev
2012-07-31 14:07:31 -07:00
Adam Powell
82b25f54ba
Fix bug 6906134
...
Change-Id: I47dfa1e503e502fe348a350dad960fbb112435e7
2012-07-31 13:12:31 -07:00
Kenny Root
861f6fe9a6
am bccda0ae: am 194da0b8: am a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-dev
...
* commit 'bccda0aee3fc0078d2e094b4fb9c6c2abab1b728':
Fix AccountManagerServiceTest
2012-07-31 12:38:43 -07:00
Kenny Root
bccda0aee3
am 194da0b8: am a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-dev
...
* commit '194da0b8b368ac61b23870224bc0d449ad465bd4':
Fix AccountManagerServiceTest
2012-07-31 12:36:35 -07:00
Kenny Root
194da0b8b3
am a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-dev
...
* commit 'a39fdd11e80618acc046fff65b6549b5c8b5aa8d':
Fix AccountManagerServiceTest
2012-07-31 12:34:30 -07:00
Kenny Root
a39fdd11e8
Merge "Fix AccountManagerServiceTest" into jb-dev
2012-07-31 12:32:27 -07:00
Fabrice Di Meglio
ffbacd8ce5
am fba3bf97: Merge "Improve Toast RTL support" into jb-mr1-dev
...
* commit 'fba3bf97d4c9fecac2de727120515c8c7f08bcf9':
Improve Toast RTL support
2012-07-31 12:28:45 -07:00
Kenny Root
ae652cc97c
Fix AccountManagerServiceTest
...
The MockAccountAuthenticatorCache needs to implement the new method.
Bug: 6820670
Change-Id: I5d1cb3aecec63602ae4541cd01ae8e28c8328e5a
2012-07-31 12:27:32 -07:00
Fabrice Di Meglio
fba3bf97d4
Merge "Improve Toast RTL support" into jb-mr1-dev
2012-07-31 12:26:52 -07:00
Jeff Sharkey
2614e42319
am 16ef5779: Merge "API to adjust network stats. DO NOT MERGE." into jb-mr1-dev
...
* commit '16ef57791766b92b8e34de4f752db2f522f34c82':
API to adjust network stats. DO NOT MERGE.
2012-07-31 12:11:46 -07:00
Jeff Sharkey
16ef577917
Merge "API to adjust network stats. DO NOT MERGE." into jb-mr1-dev
2012-07-31 12:09:54 -07:00
Alexander Lucas
d15a81487b
am 18a91725: am cef72019: am 320b3ec2: Merge "Initial commit of wireless connectivity/discovery class." into jb-dev
...
* commit '18a917250d4d595759a054e354c99c4c1e633768':
Initial commit of wireless connectivity/discovery class.
2012-07-31 11:46:16 -07:00
Jeff Sharkey
e7ed1ce4c8
API to adjust network stats. DO NOT MERGE.
...
Enables system apps to correctly account network usage performed on
behalf of another application.
Bug: 6695246
Change-Id: I39e243afd57936b6b30157a6ca511a17b6c55c39
2012-07-31 11:45:17 -07:00
Alexander Lucas
18a917250d
am cef72019: am 320b3ec2: Merge "Initial commit of wireless connectivity/discovery class." into jb-dev
...
* commit 'cef720192aa615a08b36e282b8ae24197131f18b':
Initial commit of wireless connectivity/discovery class.
2012-07-31 11:45:05 -07:00
Alexander Lucas
cef720192a
am 320b3ec2: Merge "Initial commit of wireless connectivity/discovery class." into jb-dev
...
* commit '320b3ec21eff971827a9032f1fb1ee7c866e4303':
Initial commit of wireless connectivity/discovery class.
2012-07-31 11:42:59 -07:00
