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

211716 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
89e665c694 am 391dc204: am c16a33c5: am 454ba0b3: am 54c1efd8: am 5c7817bc: Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev 
* commit '391dc204eb7868001ee3f6345028736e17522e13':
  Update the RenderScript runtime documentation for MNC.
 2015-08-17 16:24:06 +00:00
Tomasz Mikolajewski
4a86977e3c Merge "Add API for uploading files to MTP devices." 2015-08-17 14:33:00 +00:00
Geoff Mendal
f5d7ce563a Merge "Import translations. DO NOT MERGE" 2015-08-17 12:56:07 +00:00
Derek Sollenberger
3c9edc9fae Merge "Cleanup unused param in RenderNode::computeOrdering" 2015-08-17 12:44:06 +00:00
Geoff Mendal
f9f462d7ef Import translations. DO NOT MERGE 
Change-Id: I5cc8d39d08cbd52c199ffc904348a60d346e6fb7
Auto-generated-cl: translation import
 2015-08-17 05:37:50 -07:00
Daichi Hirono
b1870e922e Handle null value returned by MtpDevice#getRoots. 
BUG=23169303

Change-Id: I9602dda01f3b8919a471c1f4c88acdd19f391684
 2015-08-17 18:17:33 +09:00
Daichi Hirono
5e491c91e8 Merge "Add RootScanner to MtpDocumentsProvider to handle new/removed MTP storages." 2015-08-17 04:39:27 +00:00
Joe Fernandez
391dc204eb am c16a33c5: am 454ba0b3: am 54c1efd8: am 5c7817bc: Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev 
* commit 'c16a33c536882aed6c4fdb8d421c40addb351adc':
  Update the RenderScript runtime documentation for MNC.
 2015-08-17 00:19:15 +00:00
Joe Fernandez
c16a33c536 am 454ba0b3: am 54c1efd8: am 5c7817bc: Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev 
* commit '454ba0b3a1a02400ddfbb1f4842af7729e6c3212':
  Update the RenderScript runtime documentation for MNC.
 2015-08-17 00:13:28 +00:00
Joe Fernandez
454ba0b3a1 am 54c1efd8: am 5c7817bc: Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev 
* commit '54c1efd8449eddaf1d772e7d4e82efa40e2e4d85':
  Update the RenderScript runtime documentation for MNC.
 2015-08-17 00:06:16 +00:00
Joe Fernandez
54c1efd844 am 5c7817bc: Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev 
* commit '5c7817bc2f784e6f48a7d26aadf901ac3eb7aca2':
  Update the RenderScript runtime documentation for MNC.
 2015-08-16 23:57:39 +00:00
Filip Gruszczynski
dfb25d3fd5 Make thumbnail header animation match multi window thumbnail animation. 
Change-Id: Ib21c7c6300d58f08132aadae3aa68439793936d2
 2015-08-16 14:43:51 -07:00
Joe Fernandez
5c7817bc2f Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev 2015-08-16 20:25:45 +00:00
Dan Sandler
f120f52337 Replace missing Color API. 
Removed in change Ic4cb43e7. I could switch back to the HSV
methods or just do the lazy thing and copy the code in like
in change Iae3d85c0. (Obviously I chose the latter.)

Change-Id: I154626c326ee0bbf389df75f4a8050136b56c2d5
 2015-08-16 05:45:32 +00:00
Geoff Mendal
1f8d2923f9 Fix the build. 
Bug: 23232602
 2015-08-15 20:40:15 -07:00
Seigo Nonaka
127c297b40 Merge "Use android.os.Debug.getCallers instead of self implementation." 2015-08-16 03:24:02 +00:00
Eino-Ville Talvala
db86989dfc am 3a94b2d2: am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '3a94b2d22e8346a884b2521f7e7682f2953d1515':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 03:03:29 +00:00
Quddus Chong
57a42b672d am 8c803683: am 5530de16: am 9f18c69c: am a99dd2c9: am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev 
* commit '8c8036838cc483ac951770e5a3a36d1095c30d38':
  docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
 2015-08-16 03:03:22 +00:00
Joe Fernandez
12ad25660f am aa131bc1: am 687a3025: am 674e5eb0: am d4828d67: am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev 
* commit 'aa131bc1f9be86741dcc00e9f75749995c4ab5b4':
  docs: API diff report 22 to 23
 2015-08-16 03:03:15 +00:00
Andrew Solovay
0aabe0ee7d am 6b5414ac: am 835032bb: am 24e05601: am 186c4c2f: am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev 
* commit '6b5414ac26f4e25473a33642eb5780b4e37608f1':
  docs: Added Javadoc links for new M Preview permissions methods
 2015-08-16 03:03:08 +00:00
David Friedman
6a54f120ce am 11d30dc1: am 244898ff: am 83f941b2: am f8134c85: am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev 
* commit '11d30dc114f101157781f3f4003cd247c86c98c9':
  Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123
 2015-08-16 03:03:01 +00:00
Dianne Hackborn
83eb8493b2 am 0ce3a291: am 914eda00: am 574f9b42: am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev 
* commit '0ce3a291fb4fdbfd041e605c0cb71dff4f681e8a':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
 2015-08-16 03:02:55 +00:00
Andrew Solovay
3a3e5694d7 am feff2de6: am d81e103a: am 83e0a223: am 7a372767: am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev 
* commit 'feff2de6f93f4846ead588d66cb738f73107f4a2':
  cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18
 2015-08-16 03:02:48 +00:00
Adam Lesinski
f1f078ca50 am f473084a: am 6df21b51: am 085a6b42: am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev 
* commit 'f473084a4a71c3e1c1f58db36b3934540f89c9e6':
  AAPT: Fix regression in resource versioning
 2015-08-16 03:02:40 +00:00
Quddus Chong
bf838248bd am d61da065: am 5abde23c: am ef7e8ccb: am 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev 
* commit 'd61da065605e5193b9caa3c709e6a23f46f26b2c':
  docs: Updated API Overview and Behavior Changes docs for M Preview 3.
 2015-08-16 03:02:33 +00:00
Daniel Sandler
26df5a6263 am cf59d059: am 98e684e7: am b66e755b: am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev 
* commit 'cf59d059a51f33cd28b05f4c248c164bd22f95f4':
  Introducing M Land.
 2015-08-16 03:02:26 +00:00
Dan Sandler
8d365fe440 am d1b160f3: am 87c1e1b8: am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
* commit 'd1b160f362e4d2bd961d8091b438f8eeb7d61a2f':
  "I tried to think of the most harmless thing."
 2015-08-16 03:02:19 +00:00
Geoff Mendal
e3d6a37036 Merge commit '92f58f7c' 
Bug: 23232602
 2015-08-15 19:56:49 -07:00
Eino-Ville Talvala
3a94b2d22e am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '028c2e4e264d1d2235e4d0f95d178fdf77510e7e':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 02:55:33 +00:00
Quddus Chong
8c8036838c am 5530de16: am 9f18c69c: am a99dd2c9: am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev 
* commit '5530de16b63df8f46ee59cae962df81d65b46bdb':
  docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
 2015-08-16 02:55:27 +00:00
Joe Fernandez
aa131bc1f9 am 687a3025: am 674e5eb0: am d4828d67: am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev 
* commit '687a3025c8c1b9c3bdf3918939a870930ce9bce2':
  docs: API diff report 22 to 23
 2015-08-16 02:55:22 +00:00
Andrew Solovay
6b5414ac26 am 835032bb: am 24e05601: am 186c4c2f: am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev 
* commit '835032bba5919f65463b03c0b1f095f11c160a17':
  docs: Added Javadoc links for new M Preview permissions methods
 2015-08-16 02:55:16 +00:00
David Friedman
11d30dc114 am 244898ff: am 83f941b2: am f8134c85: am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev 
* commit '244898ff9da34fac0ec9fdc150d09a0efd909e43':
  Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123
 2015-08-16 02:55:11 +00:00
Dianne Hackborn
0ce3a291fb am 914eda00: am 574f9b42: am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev 
* commit '914eda0070cde26325db3d2a2e9bbf0a9e612107':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
 2015-08-16 02:55:05 +00:00
Andrew Solovay
feff2de6f9 am d81e103a: am 83e0a223: am 7a372767: am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev 
* commit 'd81e103a12d2bf1e7f7b6098a7fce2d2feefcba6':
  cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18
 2015-08-16 02:54:59 +00:00
Adam Lesinski
f473084a4a am 6df21b51: am 085a6b42: am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev 
* commit '6df21b51b118281a46cfd3c13716718040a33aea':
  AAPT: Fix regression in resource versioning
 2015-08-16 02:54:54 +00:00
Quddus Chong
d61da06560 am 5abde23c: am ef7e8ccb: am 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev 
* commit '5abde23cf5d3bf00695e2309958a57e620ed1cd0':
  docs: Updated API Overview and Behavior Changes docs for M Preview 3.
 2015-08-16 02:54:48 +00:00
Daniel Sandler
cf59d059a5 am 98e684e7: am b66e755b: am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev 
* commit '98e684e7f464009192529f6a8f695979a4664e0f':
  Introducing M Land.
 2015-08-16 02:54:42 +00:00
Dan Sandler
d1b160f362 am 87c1e1b8: am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
* commit '87c1e1b8a1f6927d2c31375e83fd353110edd326':
  "I tried to think of the most harmless thing."
 2015-08-16 02:54:36 +00:00
Eino-Ville Talvala
028c2e4e26 am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '33689420d13283f192c66ca7e78776064a2def28':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 02:49:17 +00:00
Quddus Chong
5530de16b6 am 9f18c69c: am a99dd2c9: am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev 
* commit '9f18c69cfe446b5af216a97ce00c88237f4a61f1':
  docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
 2015-08-16 02:49:12 +00:00
Joe Fernandez
687a3025c8 am 674e5eb0: am d4828d67: am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev 
* commit '674e5eb0eb3c4bc4a624924affd4e02ccf1b0083':
  docs: API diff report 22 to 23
 2015-08-16 02:49:06 +00:00
Andrew Solovay
835032bba5 am 24e05601: am 186c4c2f: am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev 
* commit '24e0560169f78666c855cee0cdbeb758e773a5ec':
  docs: Added Javadoc links for new M Preview permissions methods
 2015-08-16 02:49:00 +00:00
David Friedman
244898ff9d am 83f941b2: am f8134c85: am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev 
* commit '83f941b24143b71c77885d91d95e34fa14f1da03':
  Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123
 2015-08-16 02:48:54 +00:00
Dianne Hackborn
914eda0070 am 574f9b42: am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev 
* commit '574f9b42da2093823f5b0a7da1fbae9b2b38ba8d':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
 2015-08-16 02:48:48 +00:00
Andrew Solovay
d81e103a12 am 83e0a223: am 7a372767: am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev 
* commit '83e0a223610be6fc38e39c40326e6a8a89f346fa':
  cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18
 2015-08-16 02:48:43 +00:00
Adam Lesinski
6df21b51b1 am 085a6b42: am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev 
* commit '085a6b42f49141089c142ae5364515af15a22f62':
  AAPT: Fix regression in resource versioning
 2015-08-16 02:48:37 +00:00
Quddus Chong
5abde23cf5 am ef7e8ccb: am 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev 
* commit 'ef7e8ccb185dbcddec29259c7a6a8b58096ecf52':
  docs: Updated API Overview and Behavior Changes docs for M Preview 3.
 2015-08-16 02:48:32 +00:00
Daniel Sandler
98e684e7f4 am b66e755b: am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev 
* commit 'b66e755bdba57f163f25d08c207ef598eea7edae':
  Introducing M Land.
 2015-08-16 02:48:26 +00:00
Dan Sandler
87c1e1b8a1 am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
* commit '415c6cb2358a0ad4821ec58c287b1de94de78d72':
  "I tried to think of the most harmless thing."
 2015-08-16 02:48:19 +00:00