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

100259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
eb26fbe427 Merge "Fixing a NPE in accessibility manager service." 2013-02-13 23:14:10 +00:00
Scott Main
1f6dbc0dcc am c6608215: am d51a894a: docs: fix tools sidenav for offline docs 
# Via Android Git Automerger (1) and Scott Main (1)
* commit 'c660821502e5e27d10ea2d9248fb3c700f5560e5':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:13:24 -08:00
Irfan Sheriff
6e1a0738e9 Merge "Expose EAP config API" 2013-02-13 23:12:45 +00:00
Scott Main
c660821502 am d51a894a: docs: fix tools sidenav for offline docs 
# Via Scott Main
* commit 'd51a894a50b6dd48023fdc5b79c6f889a3988903':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:11:19 -08:00
Martijn Coenen
21654f9efc Merge "Add exception types for NfcEe operations." 2013-02-13 23:10:56 +00:00
Scott Main
d51a894a50 docs: fix tools sidenav for offline docs 
Change-Id: If15ec25f395d9e18f35085488b75be8f84a6d42f
 2013-02-13 15:06:41 -08:00
Stephen Hines
9b10e27d60 Merge "Add rsnScriptForEachClipped() implementation with no param array." 2013-02-13 23:06:34 +00:00
Svetoslav
0726843ea0 Fixing a NPE in accessibility manager service. 
There was a missing null checks as a result of a recent
refactoring.

bug:8185435

Change-Id: I3a1e256b434755b3a27f609dd2b6aeec31aa9a4f
 2013-02-13 14:59:00 -08:00
Joe Fernandez
b80012e35c docs: SDK r21.1 - fix download links, Issue 8193979 
Change-Id: Iabbbb030d50390021feab478812140158cdfd104
 2013-02-13 14:51:59 -08:00
Philip Milne
fd0fa65eea Merge "Revert "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE""" 2013-02-13 22:23:45 +00:00
Philip Milne
57ce47134a Revert "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE"" 
Suspected cause of: http://b.corp.google.com/issue?id=8192858 

This reverts commit e5e0b7f191b64380e9231a2b755ecd3738598dec

Change-Id: I1a35c12c3ca0b1eacfb0c1a4d6ba03601dab664b
 2013-02-13 22:07:50 +00:00
Jason Sams
fb2f5c207a Reuse context and allocations across test. 
Change-Id: I9a3498c9095db2c7876bf45d6bd5c75deded8dd8
 2013-02-13 12:11:53 -08:00
Craig Mautner
926f3839d8 Stop using AppToken movement and start using Task. 
Change-Id: I5fbd3b2b692e0e127386051f782b1015515ba384
 2013-02-13 11:58:56 -08:00
Chris Craik
68b600913b Merge "Revert "Use RenderScript for large text blurs"" 2013-02-13 19:50:24 +00:00
Chris Craik
bf5703e52e Revert "Use RenderScript for large text blurs" 
This reverts commit 3f76e65d251ead65fe8ff98e3bd4c7623fbaac07

Change-Id: Ia81cd485e5ca696bb284c419dc8a1d2f3247100e
 2013-02-13 19:47:24 +00:00
Craig Mautner
769a5b72dc Merge "Replace access to mAppTokens with AppTokenIterator" 2013-02-13 19:44:35 +00:00
Jean-Michel Trivi
0888a06762 Merge "Fix AudioFocus for back-to-back notifications" 2013-02-13 19:40:33 +00:00
Jean-Michel Trivi
23bbe02b36 Merge "No AudioFocus for notifications when media played remotely" 2013-02-13 19:37:45 +00:00
Romain Guy
0450086a84 Merge "Fix format name typo" 2013-02-13 19:35:33 +00:00
Romain Guy
2b44eb75c4 Fix format name typo 
Change-Id: If7d86b74ad9735f12349d9fcb62b335f5a742bb5
 2013-02-13 11:33:26 -08:00
Chris Craik
bce29d2a54 Merge "Use RenderScript for large text blurs" 2013-02-13 19:32:56 +00:00
Jeff Sharkey
eff9918229 Merge "Escape arguments before passing to netd." 2013-02-13 19:29:58 +00:00
Romain Guy
93799ba01b Merge "Add a render buffer cache to reuse stencil buffers Bug #7146141" 2013-02-13 19:27:59 +00:00
Jeff Sharkey
0c232f5a99 Escape arguments before passing to netd. 
Change-Id: I70bb0cb1e90abd490f8893365c6bdf1844b01d18
 2013-02-13 11:27:24 -08:00
Romain Guy
8d4aeb7111 Add a render buffer cache to reuse stencil buffers 
Bug #7146141

This new cache is used in a similar way to LayerCache. It helps
reuse already allocated stencil buffers and thus avoid churning
memory on every frame.

Change-Id: I19551d72da52c40039e65904563600e492c8b193
 2013-02-13 11:27:05 -08:00
Fabrice Di Meglio
0c33ecd209 Merge "Clean Paint.mBidiFlags as it is no longer used" 2013-02-13 19:11:50 +00:00
Victoria Lease
9cabb36691 Merge "Count baseGlyphCount once for scripts without typefaces" 2013-02-13 19:07:26 +00:00
Chris Craik
7c1a49f5f5 Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE 
This reverts commit 6c0307dd0aefe9a08794b155fc03ee60ebd14f25, reversing
changes made to a2cd828b749c444d55c2c41c7dbb85088ff94b9f.

Conflicts:
	packages/SystemUI/res/values-sv/strings.xml

Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e
 2013-02-13 10:50:20 -08:00
Irfan Sheriff
fdc028383a Expose EAP config API 
This API allows apps to setup access to enterprise Wi-Fi networks.

Change-Id: I37573d76b8bd9cad72413afdc4fc62ce57b4dc43
 2013-02-13 10:32:58 -08:00
Scott Main
ed0ea76cf4 am 1214e975: am 3baf1b6f: am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '1214e975d65dc5604ac95ed3ce7565333fa3e364':
  docs: add info about secure adb
 2013-02-13 10:12:33 -08:00
Scott Main
1214e975d6 am 3baf1b6f: am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '3baf1b6f44c8f9f851e165f1b818a475b4b09fed':
  docs: add info about secure adb
 2013-02-13 10:10:08 -08:00
Scott Main
3baf1b6f44 am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '60d8836e0dcd46645d73ef7fb34257aef5e5a927':
  docs: add info about secure adb
 2013-02-13 10:08:43 -08:00
Scott Main
60d8836e0d am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit 'be4d1dcd0118e2933c8467a13d5e8cb7abbb9707':
  docs: add info about secure adb
 2013-02-13 10:07:47 -08:00
Scott Main
be4d1dcd01 am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit 'dd8b58457c6ce18ec98f1b2419300aa8c9cd326d':
  docs: add info about secure adb
 2013-02-13 10:05:41 -08:00
Scott Main
dd8b58457c Merge "docs: add info about secure adb" into jb-mr1-dev 2013-02-13 18:01:48 +00:00
Jean-Michel Trivi
562e65bb19 Remove obsolete imports 
Change-Id: I67d357a1b0bac89447b1e237f61dd18aea7b912b
 2013-02-13 17:52:30 +00:00
Joe Fernandez
bbe99b353d am 4c28487a: am 45df16aa: am 6e372639: am 30890f28: am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '4c28487acd5f0f52d212190925d424d898fbb672':
  docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
 2013-02-13 09:47:57 -08:00
Joe Fernandez
4c28487acd am 45df16aa: am 6e372639: am 30890f28: am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '45df16aa73c6665f55c86f4a9998e6b383b751ca':
  docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
 2013-02-13 09:45:59 -08:00
Joe Fernandez
45df16aa73 am 6e372639: am 30890f28: am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '6e372639f8c9a3ccda58a9d6cc321abb60eb62b1':
  docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
 2013-02-13 09:43:02 -08:00
Jean-Michel Trivi
6313cbe1d0 Fix AudioFocus for back-to-back notifications 
A single instance of NotificationPlayer will play notifications
 back-to-back, and was, for each requesting AudioFocus. But as
 a new notification was about to be played, its accompanying
 thread was terminated, and the completion listener was never
 called, and therefore AudioFocus was not released (e.g. two
 requests for one release).
 The fix consists in requesting AudioFocus only once and
 abandonning it when the only reported completion is received.
 Added a FIXME note about a better solution to be implemented.

Bug 7680947

Change-Id: Ica9d5c1eb5d57c89ceebe66282af69f0f7d43667
 2013-02-13 09:41:10 -08:00
Joe Fernandez
6e372639f8 am 30890f28: am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '30890f2853dc7d2871d4485e2af3467bb7960b88':
  docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
 2013-02-13 09:40:59 -08:00
Joe Fernandez
30890f2853 am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Joe Fernandez (1)
* commit 'c5cb262cc6bd47a5a2ad71866cb6d9961713842a':
  docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
 2013-02-13 09:38:54 -08:00
Joe Fernandez
c5cb262cc6 Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 2013-02-13 17:35:22 +00:00
Joe Fernandez
798da53fa8 docs: Keystore/Cert warning for Signing Apps, Issue: 8180111 
Change-Id: Iab2a06fc27922aafbf10b821550098c040e2a4b2
 2013-02-13 09:26:57 -08:00
Baligh Uddin
222a6e9e98 Import translations. DO NOT MERGE 
Change-Id: I19f0cf6b89a1bfb5d95aeafc7a639716b86f618e
Auto-generated-cl: translation import
 2013-02-13 08:43:11 -08:00
Chet Haase
f0bb8000a3 Merge "Fix getHitRect() to return correct rect for transformed child" 2013-02-13 15:29:36 +00:00
Joe Fernandez
502a15ffe8 am c698a855: am d1c9d6e8: am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit 'c698a855d27520bac00677f78136b48e617ba333':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:23:26 -08:00
Joe Fernandez
c698a855d2 am d1c9d6e8: am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'd1c9d6e84969ee36f8a3b74515bae715727866a1':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:21:08 -08:00
Joe Fernandez
d1c9d6e849 am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '3b8381e1ed71258957718b8cc8dca46ee587c0fe':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:18:49 -08:00
Joe Fernandez
3b8381e1ed am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '7bb37c8748b6c7e36a18b7e55cc0b8af65b45099':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:16:16 -08:00