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

100251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
a11c381418 am 68b60091: Merge "Revert "Use RenderScript for large text blurs"" 
# Via Android (Google) Code Review
* commit '68b600913b699da0fbfcd9d913e4c4fdb08e06b8':
  Revert "Use RenderScript for large text blurs"
 2013-02-13 11:53:45 -08:00
Chris Craik
68b600913b Merge "Revert "Use RenderScript for large text blurs"" 2013-02-13 19:50:24 +00:00
Craig Mautner
6ad4530a58 am 769a5b72: Merge "Replace access to mAppTokens with AppTokenIterator" 
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '769a5b72dc076facae20154bf5d55b9810322b87':
  Replace access to mAppTokens with AppTokenIterator
 2013-02-13 11:48:00 -08: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
Jean-Michel Trivi
21b1549cac am 0888a067: Merge "Fix AudioFocus for back-to-back notifications" 
# Via Android (Google) Code Review (1) and Jean-Michel Trivi (1)
* commit '0888a06762fb55d48646c86c6a0184a0b96cdc24':
  Fix AudioFocus for back-to-back notifications
 2013-02-13 11:44:38 -08:00
Craig Mautner
769a5b72dc Merge "Replace access to mAppTokens with AppTokenIterator" 2013-02-13 19:44:35 +00:00
Jean-Michel Trivi
fc95e673d3 am 23bbe02b: Merge "No AudioFocus for notifications when media played remotely" 
# Via Android (Google) Code Review (1) and Jean-Michel Trivi (1)
* commit '23bbe02b363bb96bd56d4008141e8cf800bb46b7':
  No AudioFocus for notifications when media played remotely
 2013-02-13 11:41:12 -08:00
Jean-Michel Trivi
0888a06762 Merge "Fix AudioFocus for back-to-back notifications" 2013-02-13 19:40:33 +00:00
Romain Guy
c29aff2581 am 0450086a: Merge "Fix format name typo" 
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '0450086a845709091e176f142d60dbe553c1bce3':
  Fix format name typo
 2013-02-13 11:37:49 -08:00
Jean-Michel Trivi
23bbe02b36 Merge "No AudioFocus for notifications when media played remotely" 2013-02-13 19:37:45 +00:00
Chris Craik
5c8fe3d447 am bce29d2a: Merge "Use RenderScript for large text blurs" 
# Via Android (Google) Code Review (1) and Chris Craik (1)
* commit 'bce29d2a549c374e642ad7a41a1daf869b46f53c':
  Use RenderScript for large text blurs
 2013-02-13 11:37:45 -08:00
Romain Guy
0450086a84 Merge "Fix format name typo" 2013-02-13 19:35:33 +00:00
Jeff Sharkey
3cee8f660a am eff99182: Merge "Escape arguments before passing to netd." 
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit 'eff99182297f1c762789237a7d66c9bef754a3d7':
  Escape arguments before passing to netd.
 2013-02-13 11:34:23 -08: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
Romain Guy
bd11e07a5c am 93799ba0: Merge "Add a render buffer cache to reuse stencil buffers Bug #7146141" 
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '93799ba01b5f2902d7120db8416a1e15103286e8':
  Add a render buffer cache to reuse stencil buffers Bug #7146141
 2013-02-13 11:30:57 -08: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
6795fe0798 am 0c33ecd2: Merge "Clean Paint.mBidiFlags as it is no longer used" 
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '0c33ecd209d884a9a2b9ad807cb798583b890a08':
  Clean Paint.mBidiFlags as it is no longer used
 2013-02-13 11:14:18 -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
15ba03d5b3 am 9cabb366: Merge "Count baseGlyphCount once for scripts without typefaces" 
# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit '9cabb366917ec91d3dc1329ff7ea7c98c89399bb':
  Count baseGlyphCount once for scripts without typefaces
 2013-02-13 11:10:52 -08:00
Victoria Lease
9cabb36691 Merge "Count baseGlyphCount once for scripts without typefaces" 2013-02-13 19:07:26 +00:00
Scott Main
7221111943 am ed0ea76c: 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 (5) and others
* commit 'ed0ea76cf4caf9b9e4528e776101739f4409a9a7':
  docs: add info about secure adb
 2013-02-13 10:14:41 -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
Joe Fernandez
03aead8613 am bbe99b35: 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 (5) and others
* commit 'bbe99b353db00c061085c12938d2a295c39a0e94':
  docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
 2013-02-13 09:50:00 -08: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
3700365550 Merge "Import translations. DO NOT MERGE" into master-chromium 2013-02-13 17:24:12 +00:00
Baligh Uddin
9263bf85fa am 222a6e9e: (-s ours) Import translations. DO NOT MERGE 
# Via Baligh Uddin
* commit '222a6e9e98c97743f5aace99ec34d81c6bd9bb29':
  Import translations. DO NOT MERGE
 2013-02-13 09:19:41 -08:00
Baligh Uddin
826983368f Import translations. DO NOT MERGE 
Change-Id: I8fc81238feb8efe49902b3020c96dc7f1a84665c
Auto-generated-cl: translation import
 2013-02-13 08:44:42 -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
a274006928 am f0bb8000: Merge "Fix getHitRect() to return correct rect for transformed child" 
# Via Android (Google) Code Review (1) and Chet Haase (1)
* commit 'f0bb8000a3a30cf389f91b70f6954b7397437b7e':
  Fix getHitRect() to return correct rect for transformed child
 2013-02-13 07:32:18 -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
9851a71708 am 502a15ff: 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 (5) and others
* commit '502a15ffe83608636a83721214bf06bba60242bf':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:26:25 -08: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