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

212322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Kwa
207968345a Make grid items be square. 
Introduce a new GridItem class whose onMeasure method enforces a square
aspect ratio, and use it for rendering items when in grid mode.

Change-Id: Ieda82b644d0155354ee8e4c1dacae4af7436b7aa
 2015-08-20 13:16:36 -07:00
Ben Wagner
c091e218af Merge "Remove use of SkAutoSTMalloc from Android." 2015-08-19 15:38:14 +00:00
Ben Wagner
6bbf68d05a Remove use of SkAutoSTMalloc from Android. 
Skia desires to make SkTemplates.h private since the classes there
are designed only for internal use.

Change-Id: I1e05e54de9eb68e50ccd6a691889fecf34bc9cea
 2015-08-19 11:26:06 -04:00
Alan Viverette
0dcb9e81e2 Merge "Save and restore accessibility focus using decor view" 2015-08-19 14:37:03 +00:00
Geoff Mendal
f1ab38c847 am 47b04832: (-s ours) am 5b9e3290: (-s ours) am 257a9a87: (-s ours) am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '47b04832a58ab1c52582a792c45b03d578220733':
  Import translations. DO NOT MERGE
 2015-08-19 14:32:39 +00:00
Geoff Mendal
47b04832a5 am 5b9e3290: (-s ours) am 257a9a87: (-s ours) am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '5b9e3290062e4065aeb45085ea908b81c1fbe909':
  Import translations. DO NOT MERGE
 2015-08-19 14:27:32 +00:00
Geoff Mendal
5b9e329006 am 257a9a87: (-s ours) am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '257a9a87d49a6bda05e9d18940152213fd156f0f':
  Import translations. DO NOT MERGE
 2015-08-19 14:20:53 +00:00
Geoff Mendal
80b9f01d62 am da1404d0: (-s ours) am 2c6fe6c1: (-s ours) am 0c6eba36: (-s ours) am c2e81a0c: (-s ours) Import translations. DO NOT MERGE 
* commit 'da1404d02d22dde2cd4e79eaed46a48e40eefe29':
  Import translations. DO NOT MERGE
 2015-08-19 14:19:28 +00:00
Geoff Mendal
da1404d02d am 2c6fe6c1: (-s ours) am 0c6eba36: (-s ours) am c2e81a0c: (-s ours) Import translations. DO NOT MERGE 
* commit '2c6fe6c1ca362411f42afc22bb4c08082d03b636':
  Import translations. DO NOT MERGE
 2015-08-19 14:15:34 +00:00
Geoff Mendal
257a9a87d4 am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '81d99d47831153cfa71afaa1831b7a1e025e3069':
  Import translations. DO NOT MERGE
 2015-08-19 14:15:26 +00:00
Geoff Mendal
2c6fe6c1ca am 0c6eba36: (-s ours) am c2e81a0c: (-s ours) Import translations. DO NOT MERGE 
* commit '0c6eba366e77daeedecdffdd4d1dcf9406d39117':
  Import translations. DO NOT MERGE
 2015-08-19 14:07:53 +00:00
Alan Viverette
4cbd3ac740 Save and restore accessibility focus using decor view 
Also avoids potential NPE when decor view is null or has no view root.

Bug: 23316836
Change-Id: Iccf75ddc0e4c769a234f5b80bc0707631c2719a2
 2015-08-19 10:07:29 -04:00
Geoff Mendal
81d99d4783 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-19 14:07:13 +00:00
Geoff Mendal
31a96b3716 Import translations. DO NOT MERGE 
Change-Id: I13d19cb68c1b7b7880e2168e621c377c2b750b1b
Auto-generated-cl: translation import
 2015-08-19 07:02:46 -07:00
Geoff Mendal
0c6eba366e am c2e81a0c: (-s ours) Import translations. DO NOT MERGE 
* commit 'c2e81a0c2d95c0eee54975cb62b6c535171d74ee':
  Import translations. DO NOT MERGE
 2015-08-19 14:02:25 +00:00
Ben Kwa
0fad22712c Merge "Fix XML early-outs." 2015-08-19 13:59:48 +00:00
Geoff Mendal
c2e81a0c2d Import translations. DO NOT MERGE 
Change-Id: Ifd3cfe65e9a82e21d6a1611368dcbe9d6dfee829
Auto-generated-cl: translation import
 2015-08-19 06:53:44 -07:00
Derek Sollenberger
55f4445013 Merge "Add ninePatch support to Canvas.h" 2015-08-19 13:10:40 +00:00
Geoff Mendal
14af6c50c3 Merge "Import translations. DO NOT MERGE" 2015-08-19 12:53:52 +00:00
Geoff Mendal
9ad926d011 Import translations. DO NOT MERGE 
Change-Id: I94432e596e46517d184b195e388af9ace8ac82dc
Auto-generated-cl: translation import
 2015-08-19 05:50:29 -07:00
Geoff Mendal
caed5d8634 Merge "Import translations. DO NOT MERGE" 2015-08-19 12:34:40 +00:00
Geoff Mendal
3ca63ce0a8 Import translations. DO NOT MERGE 
Change-Id: Ic7efed73c357ab804e18094702e7f0ca29bcff66
Auto-generated-cl: translation import
 2015-08-19 05:32:43 -07:00
Geoff Mendal
319cc0ce10 Import translations. DO NOT MERGE 
Change-Id: I1c57278b5b481e1e737f38b8361ef362ed3f83d4
Auto-generated-cl: translation import
 2015-08-19 05:07:32 -07:00
Jorim Jaggi
077473fcc6 am 44ad8a51: am 6ac4af0f: am 8cc1abcb: am b960e75e: am 8b8fa3e9: Fix SysUI crash when no metadata is provided 
* commit '44ad8a51158e2712f2400276cdf8faacb4c1454b':
  Fix SysUI crash when no metadata is provided
 2015-08-19 03:10:27 +00:00
Jorim Jaggi
8385419883 am 42904b65: am 43fdc250: am e6c029b4: am 27c1a728: am f610bd78: Fix race conditions for camera prewarm service 
* commit '42904b65535430732f05ddf7271b1da83e5f2f0a':
  Fix race conditions for camera prewarm service
 2015-08-19 03:09:27 +00:00
Jorim Jaggi
0772bfd206 "resolved conflicts for merge of caacc8ba to master" 
Change-Id: I7904ac66ded45c3173af14d2940dc8210088e387
 2015-08-18 20:04:01 -07:00
Jorim Jaggi
44ad8a5115 am 6ac4af0f: am 8cc1abcb: am b960e75e: am 8b8fa3e9: Fix SysUI crash when no metadata is provided 
* commit '6ac4af0f4b31d3e33863263509d5a05bfc84d273':
  Fix SysUI crash when no metadata is provided
 2015-08-19 02:42:47 +00:00
Jorim Jaggi
6ac4af0f4b am 8cc1abcb: am b960e75e: am 8b8fa3e9: Fix SysUI crash when no metadata is provided 
* commit '8cc1abcb7fdebcfd777bfbfc7b905bd9276bbb7c':
  Fix SysUI crash when no metadata is provided
 2015-08-19 02:35:26 +00:00
Jorim Jaggi
8cc1abcb7f am b960e75e: am 8b8fa3e9: Fix SysUI crash when no metadata is provided 
* commit 'b960e75e52176bc4edc709aba71535b32e2d9970':
  Fix SysUI crash when no metadata is provided
 2015-08-19 02:27:04 +00:00
Jorim Jaggi
f0c28807a0 am 72964a37: am 1dc1c93b: am caa6cb3a: am 394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev 
* commit '72964a37e090b17d8dabb05cc7f779237a5f3572':
  Fix race condition for doze mode and wake-and-unlocking
 2015-08-19 02:22:40 +00:00
Chris Craik
93481f08b0 am 7da9d7fa: am 9c45aa8f: am ca3c865d: am 892768fb: am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev 
* commit '7da9d7fae673473a3a24d3ff0127bd0c67f70337':
  Constrain drawBitmap matrix-to-rect optimization
 2015-08-19 02:22:33 +00:00
Tenghui Zhu
6c4edcce52 am b8eb9aa3: am 23cee7ca: am a2de2177: am df23f371: am c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev 
* commit 'b8eb9aa3dd7869e242c9bf240318aacefc1cff25':
  Add some bookmarks to plugin-for-gradle page
 2015-08-19 02:22:26 +00:00
Quddus Chong
23f0df8106 am 0b1098af: am b696779a: am dd8ccccd: am f17a4f42: am 54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev 
* commit '0b1098af3ccac2cde28089c00c3cdd69cd0661dd':
  docs: Updated hardware system images for M.
 2015-08-19 02:22:19 +00:00
Adam Lesinski
90c68f2a24 am 3170650a: am 56df15d3: am 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev 
* commit '3170650a2b611f175e401634436c650a56d957e9':
  Change default cellular activity timeout to 10
 2015-08-19 02:22:12 +00:00
Jorim Jaggi
e6cfa30631 am 620a31d9: am 40c75831: am b7f482ab: am ee2cfe48: Only call authenticate when we are not listening yet 
* commit '620a31d948bba714c309c3bb5abba7733eee0fe5':
  Only call authenticate when we are not listening yet
 2015-08-19 02:22:06 +00:00
Jim Miller
4ea5152bd8 am 849b9e58: am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev 
* commit '849b9e58d6775a393f7d86a6305b658c6af9d16f':
  Reset fingerprint lockout timer when strong auth is used.
 2015-08-19 02:21:58 +00:00
Jorim Jaggi
2af1b3caaa am fc010d00: am 1d9a8c58: am 2591d6ff: am 358fcc79: Do not start with a black frame in bootanimation 
* commit 'fc010d00f3d98e0fa35e9dc32f8c07354b12cbb7':
  Do not start with a black frame in bootanimation
 2015-08-19 02:21:52 +00:00
Jim Miller
10fe83a9b9 am 8978d9ac: am 309fef16: am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev 
* commit '8978d9acbaaa89be3c14ed758e7c8a8d06071779':
  Revert "Disable fingerprint when remotely reset by DPM"
 2015-08-19 02:21:46 +00:00
Tim Kilbourn
4080a4197c am 6041a68b: am 458d4d6d: am 9b1fd822: am 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev 
* commit '6041a68babcc0ec9cc2009fcfe75848882661785':
  Use init to write usb typec props.
 2015-08-19 02:21:39 +00:00
Roozbeh Pournader
9eeeea5ea6 am 0f3ac894: am c91b67ad: am 31a536e1: am 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev 
* commit '0f3ac8944a712f087041d088d82eaa53b1a7b47b':
  Revert "Create a special CONSTRAINED font bucket in frameworks."
 2015-08-19 02:21:30 +00:00
Dianne Hackborn
35eb8d6205 am 1559f1c5: am 217d4568: am 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest 
* commit '1559f1c5a0a4db23b8338b8c4792dcb351c541f8':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest
 2015-08-19 02:21:23 +00:00
Jorim Jaggi
b960e75e52 am 8b8fa3e9: Fix SysUI crash when no metadata is provided 
* commit '8b8fa3e934e3ddf01790e647b4401dc88b24bf67':
  Fix SysUI crash when no metadata is provided
 2015-08-19 02:20:10 +00:00
Jorim Jaggi
42904b6553 am 43fdc250: am e6c029b4: am 27c1a728: am f610bd78: Fix race conditions for camera prewarm service 
* commit '43fdc250fcfc0c86613a0be8dbb964d3380ac35c':
  Fix race conditions for camera prewarm service
 2015-08-19 01:44:00 +00:00
Jorim Jaggi
caacc8ba5e am f10e475d: am ebcd9d55: am 0835f33a: Merge "Improve motion for wake-and-unlocking while pulsing" into mnc-dr-dev 
* commit 'f10e475d85a584e07bf74cc4d47ee4176ed543f8':
  Improve motion for wake-and-unlocking while pulsing
 2015-08-19 01:43:54 +00:00
Jorim Jaggi
72964a37e0 am 1dc1c93b: am caa6cb3a: am 394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev 
* commit '1dc1c93b9347380064c183398bb0441d99a33bf3':
  Fix race condition for doze mode and wake-and-unlocking
 2015-08-19 01:43:47 +00:00
Chris Craik
7da9d7fae6 am 9c45aa8f: am ca3c865d: am 892768fb: am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev 
* commit '9c45aa8f0db8e3c5370172018e162b7ecaf9ea4a':
  Constrain drawBitmap matrix-to-rect optimization
 2015-08-19 01:43:41 +00:00
Tenghui Zhu
b8eb9aa3dd am 23cee7ca: am a2de2177: am df23f371: am c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev 
* commit '23cee7cab2164eaa72f018de6ad9c141c03ed203':
  Add some bookmarks to plugin-for-gradle page
 2015-08-19 01:43:36 +00:00
Quddus Chong
0b1098af3c am b696779a: am dd8ccccd: am f17a4f42: am 54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev 
* commit 'b696779a540c6a5ce70d3f43705882d3587023f4':
  docs: Updated hardware system images for M.
 2015-08-19 01:43:31 +00:00
Adam Lesinski
3170650a2b am 56df15d3: am 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev 
* commit '56df15d3b41e6599e174da92352d85d11f9155ee':
  Change default cellular activity timeout to 10
 2015-08-19 01:43:25 +00:00
Jorim Jaggi
620a31d948 am 40c75831: am b7f482ab: am ee2cfe48: Only call authenticate when we are not listening yet 
* commit '40c758316302851a99cf6e285ed7b06497ac36f9':
  Only call authenticate when we are not listening yet
 2015-08-19 01:43:20 +00:00