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

98290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
b71f5b3c9a am 6fb9a983: Merge "Add single crunch command to aapt." 
* commit '6fb9a983cefd9d0b75c2c68c161c03667afe339e':
  Add single crunch command to aapt.
 2013-01-02 12:57:53 -08:00
Xavier Ducrohet
6fb9a983ce Merge "Add single crunch command to aapt." 2013-01-02 12:55:45 -08:00
Jean-Michel Trivi
0f617ba82c am 84aa61e2: Optimize remote control stack traversal order 
* commit '84aa61e2a838fdeb7484ffaf95945a205bccb453':
  Optimize remote control stack traversal order
 2013-01-02 12:22:50 -08:00
Jean-Michel Trivi
1bb23b6cd5 am 383f36cf: Merge "Add comments on remote control stack traversal order" 
* commit '383f36cf64d81ccda1aaa7cbf49377a930e02235':
  Add comments on remote control stack traversal order
 2013-01-02 12:19:04 -08:00
Jean-Michel Trivi
84aa61e2a8 Optimize remote control stack traversal order 
Iterate of remote control stack entries from the top of the stack
 for cases where the condition being checked is more likely at
 the top of the stack, as opposed to the bottom, which is first
 accessed when using an iterator.

Change-Id: I625bee59021c2d652e9d6355b48dc0c11e36093f
 2013-01-02 12:17:43 -08:00
Jean-Michel Trivi
383f36cf64 Merge "Add comments on remote control stack traversal order" 2013-01-02 12:15:45 -08:00
Jean-Michel Trivi
66cbd19737 Add comments on remote control stack traversal order 
Add comments to justify where remote control stack traversal order
 doesn't matter.

Change-Id: I71a71ae22446cee529649e047142c774f78a377b
 2013-01-02 12:11:15 -08:00
Jean-Michel Trivi
a2e8c661ec am d6a7925d: Merge "Updates to remote control client (un)registration" 
* commit 'd6a7925d14231c016e84db53fb5a5bbab5a07d84':
  Updates to remote control client (un)registration
 2013-01-02 11:08:31 -08:00
Jean-Michel Trivi
d6a7925d14 Merge "Updates to remote control client (un)registration" 2013-01-02 11:05:08 -08:00
Jean-Michel Trivi
dabff6efce am f2fc1cbb: Merge "Fix stack traversal order when removing or adding media button receiver" 
* commit 'f2fc1cbb067eb12eccb23c5469814675539e28a6':
  Fix stack traversal order when removing or adding media button receiver
 2013-01-02 11:00:02 -08:00
Jean-Michel Trivi
f2fc1cbb06 Merge "Fix stack traversal order when removing or adding media button receiver" 2013-01-02 10:56:35 -08:00
Xavier Ducrohet
b1f6ad82dd Add single crunch command to aapt. 
Previously the crunch command would work on a full res folder
and output a full res folder (with only the drawables). This
was only used in the SDK.

The incremental logic is moved to the SDK build system so we
change the crunch command (or rather add a new one) to only
crunch a single file.

Change-Id: I635ee3e871d035b9db2fb593802d914e48241abf
 2013-01-02 10:30:25 -08:00
Amith Yamasani
b2e5c59513 am 4c7f809d: am ff0cb373: am 554ed0f0: Merge "Fixed typo in Recreating an Activity documentation" 
* commit '4c7f809dd5c934b86b0450e59941998aeb7fb96e':
  Fixed typo in Recreating an Activity documentation
 2013-01-02 10:10:43 -08:00
Amith Yamasani
4c7f809dd5 am ff0cb373: am 554ed0f0: Merge "Fixed typo in Recreating an Activity documentation" 
* commit 'ff0cb3737b2f4f2e0762468f8424bba8a5681faf':
  Fixed typo in Recreating an Activity documentation
 2013-01-02 10:08:41 -08:00
Amith Yamasani
ff0cb3737b am 554ed0f0: Merge "Fixed typo in Recreating an Activity documentation" 
* commit '554ed0f0347acc568ab1e73621789423c953f693':
  Fixed typo in Recreating an Activity documentation
 2013-01-02 10:03:21 -08:00
Siva Velusamy
360b4d9418 am af80cdd7: Merge "DdmServer: add controls for OpenGL tracing" 
* commit 'af80cdd7dfa28158fa91ab374d8e6d2500de66b1':
  DdmServer: add controls for OpenGL tracing
 2013-01-02 09:14:06 -08:00
Siva Velusamy
af80cdd7df Merge "DdmServer: add controls for OpenGL tracing" 2013-01-02 09:10:06 -08:00
Amith Yamasani
554ed0f034 Merge "Fixed typo in Recreating an Activity documentation" 2013-01-02 09:00:28 -08:00
Jason Sams
1c7a510cb6 am a22f980f: Merge "Fix color cube tests." 
* commit 'a22f980f993876570eab8297d3c2207c7fe3d65e':
  Fix color cube tests.
 2012-12-28 14:40:52 -08:00
Jason Sams
a22f980f99 Merge "Fix color cube tests." 2012-12-28 14:37:44 -08:00
Jason Sams
ddf66ce679 Fix color cube tests. 
Change-Id: I644ac26c6d234bf5b9cf4c549bebdfee67e98f50
 2012-12-28 13:24:03 -08:00
Jason Sams
41cc867fda am 69bf687e: Merge "Add API support for 3D allocations." 
* commit '69bf687e5335db07d32fd68438ff64e18b9e9e8a':
  Add API support for 3D allocations.
 2012-12-28 11:57:37 -08:00
Jason Sams
69bf687e53 Merge "Add API support for 3D allocations." 2012-12-28 11:53:46 -08:00
Elliott Hughes
616e19ff51 am e2d3156b: am 2fbc67ab: am 5cb0f218: Merge "StringBlock_nativeCreate: Possible Leak" 
* commit 'e2d3156badd95ecb1b4f6e4b07f4e3acf2f5dffa':
  StringBlock_nativeCreate: Possible Leak
 2012-12-28 09:59:26 -08:00
Scott Main
27dfd013ab am 704cbbcd: am 1a9c5a5f: am 96f0e008: am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev 
* commit '704cbbcd1d821bb30d598a1637ae6e15202cea94':
  docs: add class on keyboards
 2012-12-28 09:59:23 -08:00
Scott Main
0f1f0a7b49 am e3d12580: am 51627153: am 8c8fd247: am cee5267b: am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441 
* commit 'e3d1258082883d9092ec5c3653c3dd81343f9d14':
  docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
 2012-12-28 09:59:20 -08:00
James Dong
38a2758e50 am f3ec1542: am edde28fd: am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberEffects" 
* commit 'f3ec15425fcd828586d3bbcea7ceffd75012f7a4':
  Handle errors from AudioEffect::queryNumberEffects
 2012-12-28 09:59:17 -08:00
James Dong
6354a1989f am cf1df194: am 0c1e566f: am c8db3b8a: Merge "Set "isdrm" info in Mediastore" 
* commit 'cf1df1944832d43aa95d3d8f6a84bea31096ad65':
  Set "isdrm" info in Mediastore
 2012-12-28 09:59:14 -08:00
The Android Open Source Project
53bdd7113f am b3c81e3f: (-s ours) am 57ebeed6: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit 'b3c81e3f6c3d41ab6220ba91808b04d758dccba1':
 2012-12-28 09:59:12 -08:00
kmccormick@google.com
6c4f94886c am 8d3a44bc: am 12f2f8dc: am 87d852a8: am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit '8d3a44bcb09a5a68d1f00a49db02b306633b2ea7':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-28 09:59:08 -08:00
Irfan Sheriff
f20d11dfa8 am fa28d45d: am 7f93e7d2: am 88fe4ebc: Merge "NsdService: Clear client info after resolution request is serviced." 
* commit 'fa28d45d59cd00163dad560eb3f9c1ed6d6651a0':
  NsdService: Clear client info after resolution request is serviced.
 2012-12-28 09:59:06 -08:00
Elliott Hughes
e2d3156bad am 2fbc67ab: am 5cb0f218: Merge "StringBlock_nativeCreate: Possible Leak" 
* commit '2fbc67abb9c79df942e0bbff118017d6d2476cbf':
  StringBlock_nativeCreate: Possible Leak
 2012-12-28 09:48:23 -08:00
Scott Main
704cbbcd1d am 1a9c5a5f: am 96f0e008: am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev 
* commit '1a9c5a5f82786825937c0a4d46457f336cba8f97':
  docs: add class on keyboards
 2012-12-28 09:48:14 -08:00
Scott Main
e3d1258082 am 51627153: am 8c8fd247: am cee5267b: am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441 
* commit '51627153b9e6c26d5d2d87ee14ca0676968578e5':
  docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
 2012-12-28 09:48:09 -08:00
James Dong
f3ec15425f am edde28fd: am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberEffects" 
* commit 'edde28fd0956d941e4962e3228f3030e203da4aa':
  Handle errors from AudioEffect::queryNumberEffects
 2012-12-28 09:47:46 -08:00
James Dong
cf1df19448 am 0c1e566f: am c8db3b8a: Merge "Set "isdrm" info in Mediastore" 
* commit '0c1e566f97a39dd79e563afe953de8879ef66bd9':
  Set "isdrm" info in Mediastore
 2012-12-28 09:47:41 -08:00
The Android Open Source Project
b3c81e3f6c am 57ebeed6: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '57ebeed61fd7b1a8fb8d1d8d719c10dfabd8aae4':
 2012-12-28 09:47:35 -08:00
kmccormick@google.com
8d3a44bcb0 am 12f2f8dc: am 87d852a8: am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit '12f2f8dcd79fc1952b3d606829857b0df4398fa8':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-28 09:47:28 -08:00
Irfan Sheriff
fa28d45d59 am 7f93e7d2: am 88fe4ebc: Merge "NsdService: Clear client info after resolution request is serviced." 
* commit '7f93e7d265509d4ae18f99cbc9a45cca087c4b71':
  NsdService: Clear client info after resolution request is serviced.
 2012-12-28 09:47:03 -08:00
Jean-Michel Trivi
863dd1f568 am 246f4529: Merge "Remove unused audio source" 
* commit '246f4529bb06c454759cf63d64cef3419f8df64a':
  Remove unused audio source
 2012-12-28 08:50:49 -08:00
Jean-Michel Trivi
246f4529bb Merge "Remove unused audio source" 2012-12-28 08:46:50 -08:00
Jason Sams
d1c306a9e6 Add API support for 3D allocations. 
Change-Id: I19c525f90135d83caec545e77e8f61a957d220ee
 2012-12-27 20:26:41 -08:00
Jean-Michel Trivi
58a9cad4e8 Remove unused audio source 
Bug 7110996

Change-Id: I90737c14a4e6f9fe662eb7eb5bd0483da823083b
 2012-12-27 15:31:47 -08:00
Jean-Michel Trivi
ed2d10dab7 Updates to remote control client (un)registration 
Iterate over the remote control stack from top to bottom
 when (un)registering a remote control client (RCC).
When unregistering an RCC, stop traversing the stack when
 match found. If match was at top of the stack, update
 the remote control display (RCD).

Change-Id: If64acf102bdf328085d707f9e0f7e86cf4d4001a
 2012-12-27 09:43:46 -08:00
Jean-Michel Trivi
bc83425c11 Fix stack traversal order when removing or adding media button receiver 
Iterate over the media button receiver stack from top to bottom
 when removing or adding a receiver.
Update comments and name to reflect that the corresponding methods
 must be synchronized on audio focus and remote control.

Change-Id: I1fb7f682a999aa66d92d56ca6ecd8b37eeff8ac9
 2012-12-26 16:18:24 -08:00
Kristian Monsen
70d417149e am d05e4d82: Merge "Update Geolocation.getInstance() comment." 
* commit 'd05e4d820d72474fbdb20998dce1a697c2f120bc':
  Update Geolocation.getInstance() comment.
 2012-12-26 16:03:40 -08:00
Kristian Monsen
d05e4d820d Merge "Update Geolocation.getInstance() comment." 2012-12-26 16:00:25 -08:00
Craig Mautner
f908880d2a am 273fa270: Merge "Fixes to clean up icon launching during animations." 
* commit '273fa2708a208155fedcf22161d2dfd4ab1ec6df':
  Fixes to clean up icon launching during animations.
 2012-12-26 11:59:14 -08:00
Craig Mautner
273fa2708a Merge "Fixes to clean up icon launching during animations." 2012-12-26 11:56:30 -08:00
Jean-Michel Trivi
e386732933 am c30f45b9: Add comments in AudioService focus and media button stack traversal 
* commit 'c30f45b97f0aeefef05f51208f54eafa3499e40b':
  Add comments in AudioService focus and media button stack traversal
 2012-12-26 11:14:24 -08:00