Scott Main
bca689703d
am 0d9d5831: Merge "fix more broken links" into jb-dev
...
* commit '0d9d583103aca82b6bc0be719b3579ee83760209':
fix more broken links
2012-08-01 10:02:24 -07:00
Craig Mautner
1c43719c47
Remove debugging for b6829431.
...
Change-Id: If7da858722d5d0a5e7db2bc249d454bdee1ec94e
2012-08-01 10:01:16 -07:00
Roman Nurik
da5cb90b99
Merge "docs: Add Device Art Generator for Nexus devices to d.a.c/distribute." into jb-dev
2012-08-01 09:59:54 -07:00
Scott Main
0d9d583103
Merge "fix more broken links" into jb-dev
2012-08-01 09:58:53 -07:00
Roman Nurik
37eecc7e92
docs: Add Device Art Generator for Nexus devices to d.a.c/distribute.
...
Most of this code is adapted from my code.google.com/p/android-ui-utils
project.
Change-Id: If6763bc7a490e53bd31d5a713158577fa74cfd7b
2012-08-01 09:05:37 -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
1ae49ab865
Merge "Fix bug 6892600 Font (character pairs) rendering issue" into jb-mr1-dev
2012-07-31 19:26:55 -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
Scott Main
f05e34a10c
fix more broken links
...
Change-Id: If4dceab223a6c22827a0645aa5923ddc427b2b85
2012-07-31 18:25:33 -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
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
24d19fb6ab
Revert "API to adjust network stats."
2012-07-31 17:11:07 -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
a9fa7b25dd
Merge "save 2ms replace div with mul." into jb-mr1-dev
2012-07-31 15:30:29 -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
9dcfff205e
am ca4117ca: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'ca4117ca387fbcd8a9e18070e0a73c2eae4baa22':
2012-07-31 14:51:16 -07:00
James Dong
9984833191
Added a key to retrieve the rotation angle in MediaMetadataRetriever.java class
...
o related-to-bug: 6872687
Change-Id: I94569bb8357c39e8309974ede8284b33a996866c
2012-07-31 14:50:49 -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
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
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
16ef577917
Merge "API to adjust network stats. DO NOT MERGE." into jb-mr1-dev
2012-07-31 12:09:54 -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
Alexander Lucas
320b3ec21e
Merge "Initial commit of wireless connectivity/discovery class." into jb-dev
2012-07-31 11:39:53 -07:00
Adam Powell
4b941f00cd
Merge "Fix bug 6906134" into jb-mr1-dev
2012-07-31 11:34:51 -07:00
Romain Guy
9f52da21d7
Merge "Fix android.opengl.Matrix frustum's generation" into jb-mr1-dev
2012-07-31 11:33:29 -07:00
Adam Powell
c1eea136ea
Fix bug 6906134
...
Change-Id: I47dfa1e503e502fe348a350dad960fbb112435e7
2012-07-31 11:27:19 -07:00
Kenny Root
e23ae144cc
am fa74f7e0: am bba948dc: Merge "Delay AccountManagerService initialization" into jb-dev
...
* commit 'fa74f7e04fcad1258a1b85515547dba0466086d8':
Delay AccountManagerService initialization
2012-07-31 11:19:40 -07:00
Kenny Root
fa74f7e04f
am bba948dc: Merge "Delay AccountManagerService initialization" into jb-dev
...
* commit 'bba948dc9e95baab9e6fb728927aada4a00d93de':
Delay AccountManagerService initialization
2012-07-31 11:17:11 -07:00
Kenny Root
bba948dc9e
Merge "Delay AccountManagerService initialization" into jb-dev
2012-07-31 11:14:02 -07:00
Alexander Lucas
969c243f17
Initial commit of wireless connectivity/discovery class.
...
Change-Id: Ifbcbb8f5021a749ddb131d678ee1117835168598
2012-07-31 10:23:01 -07:00
Peter Ng
4fcaa382b7
am bed43546: am 971c05a0: Merge "removing recents icon in tabs ss" into jb-dev
...
* commit 'bed43546760180f967f0ee0538afbf1f5ef0d649':
removing recents icon in tabs ss
2012-07-31 10:17:55 -07:00
Peter Ng
bed4354676
am 971c05a0: Merge "removing recents icon in tabs ss" into jb-dev
...
* commit '971c05a07b42018fa994d0f48d559838de7ed1a0':
removing recents icon in tabs ss
2012-07-31 10:16:00 -07:00
