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

95920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
7ac87f8f45 Merge "JB image processing." 2012-11-09 17:31:18 -08:00
Jeff Sharkey
ad08e6dcfc Merge "Emit event log message when switching users." into jb-mr1.1-dev 2012-11-09 17:23:21 -08:00
The Android Automerger
5624af28af merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-09 16:25:31 -08:00
Jeff Sharkey
2528b50b91 Increase readability of connectivity event log. 
Bug: 6322766
Change-Id: I556759f5fc1466cdd4db6b4574084a8068dc9909
 2012-11-09 15:57:02 -08:00
Baligh Uddin
dc978909dc Merge "Import translations. DO NOT MERGE" 2012-11-09 15:51:17 -08:00
Baligh Uddin
df2670f162 am ba52aff4: Import translations. DO NOT MERGE 
* commit 'ba52aff41b602a68cbe7baed1aeb1adf42f34139':
  Import translations. DO NOT MERGE
 2012-11-09 15:50:41 -08:00
Baligh Uddin
aa29e48b2b am ff87960b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'ff87960b474609115f20cb9c0fa6e4b15eebc5c5':
  Import translations. DO NOT MERGE
 2012-11-09 15:46:27 -08:00
Baligh Uddin
ff87960b47 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-09 15:43:48 -08:00
Andy McFadden
798de53cf4 Merge "Reduce emulator logspam" into jb-mr1.1-dev 2012-11-09 15:38:47 -08:00
Jason Sams
9368f0b1b5 JB image processing. 
Change-Id: I10e1909332e9e67df0b9a6fcbcc105813295a8b1
 2012-11-09 15:18:21 -08:00
Baligh Uddin
9972e72127 Merge "Import translations. DO NOT MERGE" 2012-11-09 15:13:52 -08:00
Jeff Sharkey
86597df79f Emit event log message when switching users. 
Change-Id: I8e521e177b0e17e2ab9e033e0ff8bc421cd5f784
 2012-11-09 15:09:13 -08:00
Tim Murray
f89a5ef9e3 Merge "Convert constant to float instead of double in mandelbrot.rs." 2012-11-09 10:08:23 -08:00
Baligh Uddin
1f4da45254 Import translations. DO NOT MERGE 
Change-Id: I4d80873bb07a148963f6f0bde6f19ef315dba318
Auto-generated-cl: translation import
 2012-11-09 09:59:29 -08:00
Baligh Uddin
ba52aff41b Import translations. DO NOT MERGE 
Change-Id: I293bcd411943a50960328eb2ef836f4b9ba2295e
Auto-generated-cl: translation import
 2012-11-09 09:56:53 -08:00
Baligh Uddin
00eedd3fa5 Import translations. DO NOT MERGE 
Change-Id: I2fe703076ce42275a0f36ba5c1982a76242df6fc
Auto-generated-cl: translation import
 2012-11-09 09:55:52 -08:00
Robert Greenwalt
321020b7e0 Merge "Remove DhcpInfoInternal" 2012-11-09 09:51:21 -08:00
Robert Greenwalt
4717c261b2 Remove DhcpInfoInternal 
First step in accepting a set of patches.
bug:6799630

Change-Id: I6c894c60aeb3022960c2aaa45451bb1dde2b493b
 2012-11-09 09:46:32 -08:00
Tim Murray
2bd9144ed3 Convert constant to float instead of double in mandelbrot.rs. 
Change-Id: I05820b5e9b696662bd94dbcd4721298e92f1fc1a
 2012-11-09 09:42:51 -08:00
Baligh Uddin
39b1f03e17 Import translations. DO NOT MERGE 
Change-Id: I2788e772ec12b6a9c66cb400fbb43d9210030232
Auto-generated-cl: translation import
 2012-11-09 09:42:34 -08:00
Jean-Baptiste Queru
36465c7815 am e499803e: (-s ours) Re-merge translations - do not merge 
* commit 'e499803e82160f9fd8604ef295ed5d82a4db829d':
  Re-merge translations - do not merge
 2012-11-09 07:45:47 -08:00
Jean-Baptiste Queru
e499803e82 Re-merge translations - do not merge 
Change-Id: I52f28841a2c2411a331352b8d0da51ae4c7b707b
 2012-11-09 07:32:57 -08:00
The Android Open Source Project
ad96d5ced8 am 60acb590: (-s ours) am 7a396c39: am 18f95189: Reconcile with jb-mr1-release - do not merge 
* commit '60acb59089c1e73f74da900d98dc48924a2fabc4':
 2012-11-09 07:28:00 -08:00
John Spurlock
43d84518f2 Disable navbar searchlight if search assist not available. 
Bug:7506441
Change-Id: I55c740d4c3a45b9f7fdfa38346d1bc3fb1299153
 2012-11-09 10:27:33 -05:00
The Android Open Source Project
60acb59089 am 7a396c39: am 18f95189: Reconcile with jb-mr1-release - do not merge 
* commit '7a396c3972de860a4a5874cd3ff1b6b88a610cc2':
 2012-11-09 07:24:10 -08:00
The Android Open Source Project
7a396c3972 am 18f95189: Reconcile with jb-mr1-release - do not merge 
* commit '18f95189727de29246b663ad4557075678217555':
 2012-11-09 07:22:10 -08:00
The Android Open Source Project
18f9518972 Reconcile with jb-mr1-release - do not merge 
Change-Id: I807fafdf3e52abcd291f3f8e593c92f8016ad2ef
 2012-11-09 07:19:27 -08:00
Adam Cohen
c9b55965d5 am 483041c9: am ecba011f: am c1ae43ad: am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev 
* commit '483041c9c4b2812d67de53e567ce059d5e3417bc':
  Preventing more than five widgets from being added in the carousel (issue 7502935)
 2012-11-08 18:12:04 -08:00
Adam Cohen
42914af09f am d5759ecf: am a49ab4f8: am b82b3b57: am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 
* commit 'd5759ecf1f08a31fb9fe7f4ca89f020b7361efb1':
  Deferring size callbacks until boot completed (issue 7469267)
 2012-11-08 18:12:00 -08:00
Adam Cohen
483041c9c4 am ecba011f: am c1ae43ad: am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev 
* commit 'ecba011fd81386895fda02a7d132eadf5c710ae0':
  Preventing more than five widgets from being added in the carousel (issue 7502935)
 2012-11-08 18:08:57 -08:00
Adam Cohen
d5759ecf1f am a49ab4f8: am b82b3b57: am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 
* commit 'a49ab4f8f17d9c222275c6196220838528629c66':
  Deferring size callbacks until boot completed (issue 7469267)
 2012-11-08 18:08:53 -08:00
The Android Automerger
913f13ef69 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-08 17:53:27 -08:00
Glenn Kasten
068225de01 Add all-channel setVolume() API 
Add combined channel APIs setVolume to AudioTrack, MediaPlayer, and
SoundPool to make later migration easier, and encourage apps to use
that API.  The new APIs are @hide for now.

Change-Id: I0c87bfdbff4f4292259fa33e65f67badbafd270b
 2012-11-08 17:50:43 -08:00
Adam Cohen
ecba011fd8 am c1ae43ad: am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev 
* commit 'c1ae43ade0baa4dc8af1b505ba4b83f0f72c6dd8':
  Preventing more than five widgets from being added in the carousel (issue 7502935)
 2012-11-08 16:41:31 -08:00
Adam Cohen
a49ab4f8f1 am b82b3b57: am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 
* commit 'b82b3b5754305c36cfeb7c87816110da3c7b2ff4':
  Deferring size callbacks until boot completed (issue 7469267)
 2012-11-08 16:41:27 -08:00
Andy McFadden
325be8a1ea Reduce emulator logspam 
The emulator doesn't support systrace, but we should point that out
at most once per process.

Bug 7436352

Change-Id: I30e0094dc3b24bc3ab6bc2799ce81ca0a6bb7d9d
 2012-11-08 16:40:21 -08:00
Adam Cohen
c1ae43ade0 am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev 
* commit 'f69320a1f02de3106a26a3911c25be63fcfaf738':
  Preventing more than five widgets from being added in the carousel (issue 7502935)
 2012-11-08 16:39:16 -08:00
Adam Cohen
b82b3b5754 am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 
* commit '3e9cba4f9db96e3b5ba2ab2f9ad7a7ac2549582d':
  Deferring size callbacks until boot completed (issue 7469267)
 2012-11-08 16:39:13 -08:00
Adam Cohen
f69320a1f0 Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev 2012-11-08 16:36:56 -08:00
Adam Cohen
3e9cba4f9d Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 2012-11-08 16:35:42 -08:00
The Android Open Source Project
e3c4001cdb am 167296d7: (-s ours) am 5c0da20c: am 71a408b9: Reconcile with jb-mr1-release - do not merge 
* commit '167296d70a022fc65a4e9fda10f3bd13e1d4b428':
 2012-11-08 15:58:56 -08:00
Dianne Hackborn
55fdd58af8 am e0d454d2: am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev 
* commit 'e0d454d2e86f4170bdab68d45696fb2eb9a87f9f':
  Remove extraneous logs.
 2012-11-08 15:58:52 -08:00
Daniel Sandler
0e4d6de103 am 77f2e27e: am 9b15f2e5: am 82b18e8d: am 9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev 
* commit '77f2e27e68a851b5cec13e724645972df663d397':
  Don't crash if no ECA.
 2012-11-08 15:58:48 -08:00
Chris Wren
b063e7b634 am b3e8071d: am b1d094ba: am f080dc0c: am 7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev 
* commit 'b3e8071d8198096fe1bb19183c5ba3d342a11fe9':
  allow pattern linear layout to manage message_area.
 2012-11-08 15:58:44 -08:00
Daniel Sandler
11bf8e2c14 am 8d62faea: am c4639949: am 38883bdd: am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev 
* commit '8d62faea22e8974d72cd98dd7cd3f919504d7123':
  Only show the bouncer for the assistant if secure.
 2012-11-08 15:58:37 -08:00
John Spurlock
17dcc0156c am 2a1e6a69: am 18048411: am f6b6462f: am 14adfe42: Address comments from merged "Fix remaining jank in sec..." 
* commit '2a1e6a69a7713d588769693df96a7b8f2a6438c3':
  Address comments from merged "Fix remaining jank in sec..."
 2012-11-08 15:58:32 -08:00
John Spurlock
4dd1cec48d am b99a6b33: am cc60b7dc: am baee9ed5: am 7a73344b: Minimal fix for stuck google now. 
* commit 'b99a6b336de0e9a2a8ff89276137af20321dfc2a':
  Minimal fix for stuck google now.
 2012-11-08 15:58:25 -08:00
Jim Miller
abc9bba610 am fe3d459d: am bfd17051: am 271add4e: am 899e6c73: Merge "Fix bug where SearchPanel wasn\'t launching assist intent when keyguard is gone." into jb-mr1-lockscreen-dev 
* commit 'fe3d459d9ce9b1b945b78312e7324c4b7b88688d':
  Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone.
 2012-11-08 15:58:19 -08:00
Michael Jurka
76f117da7e am 9d31d103: am 1470297c: am 47674796: am eb963f04: Enforce max number of 5 lockscreen widgets 
* commit '9d31d103b374e3327de13fdb954d400bd0abc628':
  Enforce max number of 5 lockscreen widgets
 2012-11-08 15:58:15 -08:00
Adam Cohen
db5790d6e1 am 5d92a50e: am 06b29549: am 38515e9a: am c8ed8d32: Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev 
* commit '5d92a50efd069a3056fdf94d2673f3934378d213':
  Adding user activity when the challenge is slid down
 2012-11-08 15:58:11 -08:00