drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,610 Commits 1 Branch 0 Tags
Commit Graph

82610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
5e78b10e0d am 1e6b7a64: am a9fa7b25: Merge "save 2ms replace div with mul." into jb-mr1-dev 
* commit '1e6b7a6462c612c151bb25803c293dfd7ab68cd3':
  save 2ms replace div with mul.
 2012-07-31 15:34:08 -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
eed348a9fb am d5b7c955: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'd5b7c9551b3c9ea557afeb234d0e9272b35d63fa':
  Fix bug 6906134
 2012-07-31 15:11:27 -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
d8e9959366 am d6d0fb32: am 22a7b9de: am ba751a0a: am f284d492: docs: fix broken links 
* commit 'd6d0fb32327d8fa1d43a8e8066d55952d7078d82':
  docs: fix broken links
 2012-07-31 15:05:56 -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
a668cc4e48 am 50ce2526: (-s ours) am 9dcfff20: am ca4117ca: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '50ce25264492452ef2c2acd3ded3ae52e0b421e4':
 2012-07-31 14:57:16 -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
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
Adam Powell
82b25f54ba Fix bug 6906134 
Change-Id: I47dfa1e503e502fe348a350dad960fbb112435e7
 2012-07-31 13:12:31 -07:00
Kenny Root
c5b7edf7ab am 861f6fe9: am bccda0ae: am 194da0b8: am a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-dev 
* commit '861f6fe9a6ed54c28b6ce987adffafec6e1c3735':
  Fix AccountManagerServiceTest
 2012-07-31 12:40:24 -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
d8a7893698 am ffbacd8c: am fba3bf97: Merge "Improve Toast RTL support" into jb-mr1-dev 
* commit 'ffbacd8ce51544ce45d93e7009487d741569b724':
  Improve Toast RTL support
 2012-07-31 12:30:25 -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
8da490025a am 2614e423: (-s ours) am 16ef5779: Merge "API to adjust network stats. DO NOT MERGE." into jb-mr1-dev 
* commit '2614e423190e5005ec7d7bde192169c671db45c1':
  API to adjust network stats. DO NOT MERGE.
 2012-07-31 12:13:56 -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
9c3df2beb3 am d15a8148: am 18a91725: am cef72019: am 320b3ec2: Merge "Initial commit of wireless connectivity/discovery class." into jb-dev 
* commit 'd15a81487b7195e21491cf8c8dbcff24fb3acf3b':
  Initial commit of wireless connectivity/discovery class.
 2012-07-31 11:48:14 -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
Alexander Lucas
320b3ec21e Merge "Initial commit of wireless connectivity/discovery class." into jb-dev 2012-07-31 11:39:53 -07:00
Adam Powell
60f36bceda am 6cbfa689: am 4b941f00: Merge "Fix bug 6906134" into jb-mr1-dev 
* commit '6cbfa6896e7df2ed6381ad3ba4461386e41b1ca9':
  Fix bug 6906134
 2012-07-31 11:39:09 -07:00
Romain Guy
4e63cd42cb am 1b913c5c: am 9f52da21: Merge "Fix android.opengl.Matrix frustum\'s generation" into jb-mr1-dev 
* commit '1b913c5c2a8058159b776f9343cf6393b9bd5f18':
  Fix android.opengl.Matrix frustum's generation
 2012-07-31 11:37:25 -07:00
Adam Powell
6cbfa6896e am 4b941f00: Merge "Fix bug 6906134" into jb-mr1-dev 
* commit '4b941f00cd832663a42c8cf0ddb0f97365bfe252':
  Fix bug 6906134
 2012-07-31 11:37:02 -07:00
Romain Guy
1b913c5c2a am 9f52da21: Merge "Fix android.opengl.Matrix frustum\'s generation" into jb-mr1-dev 
* commit '9f52da21d7d87c36e075432615c85c20bfa5d180':
  Fix android.opengl.Matrix frustum's generation
 2012-07-31 11:35:15 -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
285345ff5c am a8e77099: am e23ae144: am fa74f7e0: am bba948dc: Merge "Delay AccountManagerService initialization" into jb-dev 
* commit 'a8e770991e8659d775d97f603e8f1a542aa0229e':
  Delay AccountManagerService initialization
 2012-07-31 11:23:22 -07:00
Kenny Root
a8e770991e am e23ae144: am fa74f7e0: am bba948dc: Merge "Delay AccountManagerService initialization" into jb-dev 
* commit 'e23ae144cc1b6487a7c0e7a33d3016431c81850c':
  Delay AccountManagerService initialization
 2012-07-31 11:21:16 -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