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

199245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Perez
fa04b7c279 am 898be8bc: am fa794eb0: am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev 
* commit '898be8bc76c873cf885d7bdf293b4f58563a1648':
  Fix for shadows on theme editor
 2015-06-15 15:55:06 +00:00
Diego Perez
878d05539f am dc929e28: am 40a216d9: am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 
* commit 'dc929e28acd32f7adebdc0d5afd3dc7eaa1a09fe':
  Fix GcSnapshot drawInLayer when clipping is used.
 2015-06-15 15:55:01 +00:00
Dirk Dougherty
125e1d52d4 am d2161615: am c6d33420: am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs 
* commit 'd2161615988725fd49791d67a534bccdee3957cd':
  Doc change: move ndk docs jd into main docs tree.
 2015-06-15 15:54:54 +00:00
Andrew Solovay
ccb50a7c91 am dba3544f: am ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs 
* commit 'dba3544fe08e9590a5f73fdb3bc6b30de10525a8':
  docs: Added AfW videos to "Android for Work" landing page
 2015-06-15 15:54:47 +00:00
Rich Slogar
2d2759164c am 974f0d82: am afb19e27: am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs 
* commit '974f0d82281f79ac4c163eebaf1a341cf6ebcda2':
  docs: sdk tools 24.3.2 download updates
 2015-06-15 15:54:43 +00:00
Diego Perez
0e3fb38eab am b39e85af: am ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev 
* commit 'b39e85afb160997a51df1dff18e118266c692243':
  New custom widgets library
 2015-06-15 15:54:38 +00:00
Chet Haase
1f81e0bfd4 am c03fa1ee: Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev 
* commit 'c03fa1ee54424b0c8b9ecdc06004c9dbdf4925f2':
  Add isFilterBitmap() overrides where appropriate
 2015-06-15 15:54:33 +00:00
Diego Perez
e5d3170d92 am 0524e97a: Merge "resolved conflicts for merge of 5a53816b to mnc-dev" into mnc-dev 
* commit '0524e97ac333c685b43cd9dbe5a49b28371b8865':
  Fix crash when shadowSize is 0
 2015-06-15 15:54:29 +00:00
Jason Monk
0c8fd1a154 am 4b8704c9: Merge "Don\'t try to get entries for uninstalled apps." into mnc-dev 
* commit '4b8704c9e1024fa7aba66cce03cde78c7e10ba64':
  Don't try to get entries for uninstalled apps.
 2015-06-15 15:54:25 +00:00
Diego Perez
898be8bc76 am fa794eb0: am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev 
* commit 'fa794eb0025dbec6c1b90135495081d42f06bdaf':
  Fix for shadows on theme editor
 2015-06-15 15:48:29 +00:00
Diego Perez
dc929e28ac am 40a216d9: am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 
* commit '40a216d95973bb897ee0d755ef260a616f176798':
  Fix GcSnapshot drawInLayer when clipping is used.
 2015-06-15 15:48:24 +00:00
Dirk Dougherty
d216161598 am c6d33420: am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs 
* commit 'c6d3342064db4982298d0ebe79c8b974c57b99a7':
  Doc change: move ndk docs jd into main docs tree.
 2015-06-15 15:48:14 +00:00
Andrew Solovay
dba3544fe0 am ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs 
* commit 'ecc50268d72f0084a96bf98494229a294be10458':
  docs: Added AfW videos to "Android for Work" landing page
 2015-06-15 15:48:05 +00:00
Rich Slogar
974f0d8228 am afb19e27: am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs 
* commit 'afb19e27ccc80415956c1b63ddb19e953a7c3f20':
  docs: sdk tools 24.3.2 download updates
 2015-06-15 15:47:49 +00:00
Diego Perez
b39e85afb1 am ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev 
* commit 'ce5a79dacfb152317429cb69c28fe8bb39c02f4c':
  New custom widgets library
 2015-06-15 15:47:44 +00:00
Chet Haase
c03fa1ee54 Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev 2015-06-15 15:45:57 +00:00
Diego Perez
0524e97ac3 Merge "resolved conflicts for merge of 5a53816b to mnc-dev" into mnc-dev 2015-06-15 15:44:14 +00:00
Chet Haase
ea1363910b Add isFilterBitmap() overrides where appropriate 
Issue #21825791 add isFilterBitmap() override to appropriate Drawable subclasses

Change-Id: I5cbd72c034be79b0aa53815c7a5a8ea499e6e02d
 2015-06-15 08:43:27 -07:00
Jason Monk
4b8704c9e1 Merge "Don't try to get entries for uninstalled apps." into mnc-dev 2015-06-15 15:41:38 +00:00
Jason Monk
c1f24abd10 Don't try to get entries for uninstalled apps. 
Bug: 21837824
Change-Id: I6f7bbc309e9edf1db12476f55ab8be424739fae0
 2015-06-15 11:38:03 -04:00
Diego Perez
8df6d037be resolved conflicts for merge of 5a53816b to mnc-dev 
Change-Id: Ice1ba8cb9793432e18635e77f4e3309f50bb7b3f
 2015-06-15 16:17:08 +01:00
Prashant Malani
1e6c78e872 am 8fdeda3d: (-s ours) am 6a7fdbdd: (-s ours) am a8cff2ac: (-s ours) am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev 
* commit '8fdeda3d3af44a0fcaa472af171a1dc09d4e0529':
  DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
 2015-06-15 14:48:39 +00:00
Filip Gruszczynski
677557a884 am fc41fe26: am 5b15bd7b: am 94476be6: (-s ours) am 88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev 
* commit 'fc41fe263995069eb80bf1dd797e34532ce2ff1b':
  DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
 2015-06-15 14:48:30 +00:00
Leon Scroggins III
f95055b5ac am fdf48a16: am 0af86ee7: am d7959d30: (-s ours) am 265d053d: am 81babaa3: am 7ffde4a6: am e899576f: am 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit 'fdf48a16b6d0a942595266cf6cbd2429fcfe0fed':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-15 14:48:26 +00:00
Leon Scroggins III
16470b4b40 am e7641e29: am c3809332: am 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev 
* commit 'e7641e295d3f366b5269cbeeb1ca97a4c99b3791':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-15 14:48:20 +00:00
Jason Monk
794e06dfa9 am a3de0d98: am 7d79bea4: Merge "Fix invisible rotation tile" into mnc-dev 
* commit 'a3de0d9877b9951d964232cd3232f441c1b00379':
  Fix invisible rotation tile
 2015-06-15 14:48:15 +00:00
Jason Monk
fa0302bf13 am 9fed13f8: am 5d8c276b: Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev 
* commit '9fed13f8c3be41d5039757fe44631b31780d89b6':
  Make references to ssid use a verbatim TtsSpan
 2015-06-15 14:39:07 +00:00
Prashant Malani
8fdeda3d3a am 6a7fdbdd: (-s ours) am a8cff2ac: (-s ours) am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev 
* commit '6a7fdbddf7f7cec3ce511994b05eaeb94d18da6a':
  DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
 2015-06-15 14:37:21 +00:00
Filip Gruszczynski
fc41fe2639 am 5b15bd7b: am 94476be6: (-s ours) am 88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev 
* commit '5b15bd7b2d403cedf2c76729b3a38925f52be66b':
  DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
 2015-06-15 14:37:17 +00:00
Leon Scroggins III
fdf48a16b6 am 0af86ee7: am d7959d30: (-s ours) am 265d053d: am 81babaa3: am 7ffde4a6: am e899576f: am 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit '0af86ee769845334d27aa969fce3feba3e255d34':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-15 14:37:13 +00:00
Leon Scroggins III
e7641e295d am c3809332: am 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev 
* commit 'c3809332fca20139543710abc78b185fb1abc9f2':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-15 14:37:08 +00:00
Jason Monk
a3de0d9877 am 7d79bea4: Merge "Fix invisible rotation tile" into mnc-dev 
* commit '7d79bea4a92760559f61cfbe412cd8470b84c9fc':
  Fix invisible rotation tile
 2015-06-15 14:37:04 +00:00
Joseph Wen
5fcbb9d0c1 Retry intent verification 3 times before failing. 
BUG=21596311

Change-Id: Ia98925a4310046ef4d8117afe0b278e6a414dac6
 2015-06-15 10:36:03 -04:00
Prashant Malani
6a7fdbddf7 am a8cff2ac: (-s ours) am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev 
* commit 'a8cff2acb7cc18d1cf123f45eb4e47e1ab876a20':
  DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
 2015-06-15 14:30:35 +00:00
Filip Gruszczynski
5b15bd7b2d am 94476be6: (-s ours) am 88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev 
* commit '94476be6a4055d09413d51e489446bf220c440a6':
  DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
 2015-06-15 14:30:30 +00:00
Leon Scroggins III
0af86ee769 am d7959d30: (-s ours) am 265d053d: am 81babaa3: am 7ffde4a6: am e899576f: am 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit 'd7959d30b61962a905de6c5081dac6b2f7be65c1':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-15 14:30:25 +00:00
Leon Scroggins III
c3809332fc am 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev 
* commit '8c9ae41bc7188cfe929d0b4f31c18faf9f9a03f7':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-15 14:30:20 +00:00
Jason Monk
7d79bea4a9 Merge "Fix invisible rotation tile" into mnc-dev 2015-06-15 14:26:38 +00:00
Jason Monk
9fed13f8c3 am 5d8c276b: Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev 
* commit '5d8c276bb91788441ec9a98717017eb01f1b348f':
  Make references to ssid use a verbatim TtsSpan
 2015-06-15 14:23:58 +00:00
Jason Monk
1634d182e1 Fix invisible rotation tile 
Make sure we set the state at least once.

Bug: 21837219
Change-Id: Iabd0524f0c09fd3f7b895007204ddf49af19ea98
 2015-06-15 10:19:26 -04:00
Geoff Mendal
b736c65ab1 am ea1807aa: (-s ours) am 991f0f65: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'ea1807aa9d6829e4b8c07b82a349d1f15d37a503':
  Import translations. DO NOT MERGE
 2015-06-15 14:17:40 +00:00
Jason Monk
5d8c276bb9 Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev 2015-06-15 14:14:52 +00:00
Geoff Mendal
ea1807aa9d am 991f0f65: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '991f0f6549fd25a658f2519b4ee2169c6c5195eb':
  Import translations. DO NOT MERGE
 2015-06-15 14:09:04 +00:00
Jason Monk
6980d12c58 Make references to ssid use a verbatim TtsSpan 
Bug: 20059794
Change-Id: Id92ef11e78547e168f55515dea2fc28519871d6f
 2015-06-15 10:07:55 -04:00
Geoff Mendal
f5c84d5ca3 am f2cd1681: (-s ours) am 8cacde13: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'f2cd168186d6e96a345b7d6cd54e312f5536a1e0':
  Import translations. DO NOT MERGE
 2015-06-15 13:59:12 +00:00
Geoff Mendal
13eae7929f am 26df3646: (-s ours) am 1ed87e5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '26df364618da36007186df8eb4c7a85e47f8e18a':
  Import translations. DO NOT MERGE
 2015-06-15 13:59:08 +00:00
Paul Jensen
b379fdd0e9 am 49ab026a: am 8a6025fd: Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev 
* commit '49ab026a5298668681665212e0ea21f514e0642e':
  Remove most sleep() calls from ConnectivityServiceTest
 2015-06-15 13:59:04 +00:00
Geoff Mendal
f2cd168186 am 8cacde13: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '8cacde138398bb63a131452fab84e3677b87adc3':
  Import translations. DO NOT MERGE
 2015-06-15 13:54:36 +00:00
Geoff Mendal
26df364618 am 1ed87e5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '1ed87e5d30b5ccfd1d7448f22389143928b8c118':
  Import translations. DO NOT MERGE
 2015-06-15 13:54:32 +00:00
Geoff Mendal
991f0f6549 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-15 13:53:11 +00:00