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

82354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Peter Ng
971c05a07b Merge "removing recents icon in tabs ss" into jb-dev 2012-07-31 10:13:39 -07:00
Brian Carlstrom
1dc426c29b am 400918b0: am 4881d8d3: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev 
* commit '400918b02d6939da5f939ec12bf07d6bd92bf829':
  Change KeyStore to use Modified UTF-8 to match NativeCrypto
 2012-07-31 09:57:36 -07:00
Brian Carlstrom
400918b02d am 4881d8d3: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev 
* commit '4881d8d3f12efc9bdb3b4c71d117a2c53919d258':
  Change KeyStore to use Modified UTF-8 to match NativeCrypto
 2012-07-31 09:55:30 -07:00
Brian Carlstrom
4881d8d3f1 Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev 2012-07-31 09:53:28 -07:00
Peter Ng
65558d5d33 am 0af60dfc: am 682077d1: Merge "help image updates" into jb-dev 
* commit '0af60dfc69e9cc11b8f8111a7ce657a74a0a4322':
  help image updates
 2012-07-31 09:43:06 -07:00
Peter Ng
be13fa0b7a removing recents icon in tabs ss 
Change-Id: I3a8b3b33c9c90bb8a0ee28e502bbdbe3e72e62be
 2012-07-31 09:41:57 -07:00
Peter Ng
8dda8194e1 am f42bd744: am 5e466ae4: Merge "new accessibility section" into jb-dev 
* commit 'f42bd7441e41587e19c0855711a38a361a4bd7fa':
  new accessibility section
 2012-07-31 09:41:12 -07:00
Peter Ng
0af60dfc69 am 682077d1: Merge "help image updates" into jb-dev 
* commit '682077d188e8c9e7d353138401a731b9e11ebd09':
  help image updates
 2012-07-31 09:41:09 -07:00
Peter Ng
f42bd7441e am 5e466ae4: Merge "new accessibility section" into jb-dev 
* commit '5e466ae4fa100cfc723472b9b402b4b1dde36ce0':
  new accessibility section
 2012-07-31 09:39:19 -07:00
Peter Ng
682077d188 Merge "help image updates" into jb-dev 2012-07-31 09:38:36 -07:00
Peter Ng
5e466ae4fa Merge "new accessibility section" into jb-dev 2012-07-31 09:36:25 -07:00
Kenny Root
00efe44923 am b3e4b46d: am e583bcf1: Merge "Explicitly set lib dir permissions during unlink" into jb-dev 
* commit 'b3e4b46db028c35d6d12c5f8f25b0463833fb51d':
  Explicitly set lib dir permissions during unlink
 2012-07-31 09:36:17 -07:00
Kenny Root
b3e4b46db0 am e583bcf1: Merge "Explicitly set lib dir permissions during unlink" into jb-dev 
* commit 'e583bcf13c13957bdf20f8bc5e23258b083b2f51':
  Explicitly set lib dir permissions during unlink
 2012-07-31 09:34:26 -07:00
Kenny Root
e583bcf13c Merge "Explicitly set lib dir permissions during unlink" into jb-dev 2012-07-31 09:31:41 -07:00
Robert Greenwalt
36b536be60 Merge "Reduce log spam." into jb-mr1-dev 2012-07-31 09:29:27 -07:00
Nick Pelly
90f5158961 am 5dcbe638: (-s ours) am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev 
* commit '5dcbe638ee063201fb476ef475d2beb347f02097':
  DO NOT MERGE. Add package-name-prefix blacklist for location updates.
 2012-07-31 09:22:46 -07:00
Nick Pelly
5dcbe638ee am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev 
* commit '1af5ac1b6801c4da2ef689449fd1fd2eba1ff48e':
  DO NOT MERGE. Add package-name-prefix blacklist for location updates.
 2012-07-31 09:20:25 -07:00
Nick Pelly
1af5ac1b68 Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev 2012-07-31 09:17:54 -07:00
Satoshi Kataoka
3185869c65 Merge " Tentertively enable notification ime switcher" into jb-mr1-dev 2012-07-30 20:14:59 -07:00
Satoshi Kataoka
5e445c2e2c Tentertively enable notification ime switcher 
Bug: 6883389

Change-Id: I90d216e0081c5c5b089ab7fe1396ace91f8b4434
 2012-07-31 11:39:51 +09:00
Fabrice Di Meglio
025f9602ee Improve Toast RTL support 
- simplier code

Change-Id: Ifbe8545697404ed6e9f508103bd9cf1e7efb5746
 2012-07-30 19:00:22 -07:00
Brian Carlstrom
5b1f037829 Change KeyStore to use Modified UTF-8 to match NativeCrypto 
Bug: http://code.google.com/p/android/issues/detail?id=35141
Bug: 6869713

Change-Id: I61cb309786960072148ef97ea5afedb33dc45f4e
 2012-07-30 18:54:18 -07:00