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

156951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lajos Molnar
5498ba4a1f am 55b5fb8e: am 4662ef1f: am adbca3e5: Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev 
* commit '55b5fb8e25f0ef15377c08db9c1ec82e03482e18':
  initialize codec list before MediaCodec.getCodecInfo()
 2014-09-10 01:07:54 +00:00
Guang Zhu
ffd8367c20 am 0472349a: am 7f27443e: am a3cd7592: Merge "add some assert messages to download manager test" into lmp-dev 
* commit '0472349a346726f2d7bdc77f805f60f93e8c40d0':
  add some assert messages to download manager test
 2014-09-10 01:07:44 +00:00
Lajos Molnar
884698e380 am 4662ef1f: am adbca3e5: Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev 
* commit '4662ef1fcf2b9fe0d9087649beefbf82d2c48fc7':
  initialize codec list before MediaCodec.getCodecInfo()
 2014-09-10 00:49:02 +00:00
Guang Zhu
5d2792c824 am 7f27443e: am a3cd7592: Merge "add some assert messages to download manager test" into lmp-dev 
* commit '7f27443e5cb4a64570be4da792937662711c3a33':
  add some assert messages to download manager test
 2014-09-10 00:48:57 +00:00
John Spurlock
ff8eb7fdf5 am 6d43ddd5: am b65c57e5: am 7fa27583: Merge "QS: Fix tile padding on dual tile first lines." into lmp-dev 
* commit '6d43ddd56950cd0db693697ae4d763c63dfe0908':
  QS: Fix tile padding on dual tile first lines.
 2014-09-09 22:08:24 +00:00
Alan Viverette
15ed888e26 am a80987d8: am df2a84a4: am ba2ce6fa: Merge "Update alert dialog styling to match Material spec" into lmp-dev 
* commit 'a80987d84b8893ad42c1e83a4c9f2eb07687fcfc':
  Update alert dialog styling to match Material spec
 2014-09-09 22:08:19 +00:00
Philip Milne
e37711f831 am ee5d9e09: am 4a4bf80a: am 2a95b928: Fix for b/16400888 - API Review: GridLayout attributes 
* commit 'ee5d9e09887f7a5c4b12b33319d3e42159ed1773':
  Fix for b/16400888 - API Review: GridLayout attributes
 2014-09-09 22:08:15 +00:00
John Spurlock
dd6b4218a9 am ec1a45ea: am 9d44371d: am 0b7a5768: Merge "On db upgrade, reset ringer mode to normal." into lmp-dev 
* commit 'ec1a45eaeaeb4f5334b3164cda19fade873fe9a2':
  On db upgrade, reset ringer mode to normal.
 2014-09-09 22:08:10 +00:00
Jean-Michel Trivi
32080bf1d4 am b026a79f: am 99fa36d5: am 013279ac: Merge "Prevent NotificationManagerService from using bad stream type" into lmp-dev 
* commit 'b026a79fb7331ef9a7237bc731ef4a42b71e8f1c':
  Prevent NotificationManagerService from using bad stream type
 2014-09-09 22:08:05 +00:00
John Spurlock
18068e6e61 am efe671e6: am cf44d281: am cdc2b578: Merge "Zen: Map transition to ringer-mode silent to "priority"." into lmp-dev 
* commit 'efe671e6b399e4f6fb181ab641c4f5f022de385b':
  Zen: Map transition to ringer-mode silent to "priority".
 2014-09-09 22:08:00 +00:00
Amith Yamasani
95674712b0 am af81aa33: am d94df395: am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 
* commit 'af81aa331fce43f80b018a38a0f042b73e38c349':
  User restriction to disallow outgoing NFC beam
 2014-09-09 22:07:55 +00:00
Jeff Sharkey
d2d01e9bd6 am f77f306f: am a5746ce3: am b8d727ec: Merge "Use sscanf() for parsing tag values." into lmp-dev 
* commit 'f77f306f9803f4f9b9937b10a0a4dc545c86bd9b':
  Use sscanf() for parsing tag values.
 2014-09-09 22:07:50 +00:00
John Spurlock
3b4df663bc am a9e4098e: am 1d182090: am d09f0b6b: Merge "Doze: Wake up on touch, fade between states." into lmp-dev 
* commit 'a9e4098ef639605178d97eac2271ecec4d02a0a2':
  Doze: Wake up on touch, fade between states.
 2014-09-09 22:07:45 +00:00
Chris Craik
9984035cc3 am 3c1f32d5: am 78558652: am e46cfca2: Merge "hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D" into lmp-dev 
* commit '3c1f32d58760596eda85436e44c2ea9465eec7bc':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D
 2014-09-09 22:07:41 +00:00
Riley Andrews
c890b81a7b am 3dec5a67: am f41b1485: am 4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev 
* commit '3dec5a67d900e18f3aa3607aeb20fa4e6586f771':
  Use surfaceflinger for recents thumbnail rotations.
 2014-09-09 22:07:36 +00:00
Alan Viverette
0faf7dc76f am 0c6884d2: am aafd303e: am e74dff14: Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev 
* commit '0c6884d266b7c3d08bd68d018be8053da7ecd22b':
  Use correct row/column order in list and grid CollectionItems
 2014-09-09 22:07:31 +00:00
John Spurlock
c2163a2d2f am b65c57e5: am 7fa27583: Merge "QS: Fix tile padding on dual tile first lines." into lmp-dev 
* commit 'b65c57e58a49c3f0505e4cb4c8cee7c01663a27d':
  QS: Fix tile padding on dual tile first lines.
 2014-09-09 22:04:12 +00:00
Alan Viverette
f50212afa4 am df2a84a4: am ba2ce6fa: Merge "Update alert dialog styling to match Material spec" into lmp-dev 
* commit 'df2a84a4781dfaf4fa3d03b8198615d0cc981f87':
  Update alert dialog styling to match Material spec
 2014-09-09 22:04:08 +00:00
Lajos Molnar
287cf721bc am adbca3e5: Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev 
* commit 'adbca3e552abc358326b4245a4fc4b8761e79b7e':
  initialize codec list before MediaCodec.getCodecInfo()
 2014-09-09 22:01:17 +00:00
Guang Zhu
63e47699b9 am a3cd7592: Merge "add some assert messages to download manager test" into lmp-dev 
* commit 'a3cd75926fd65afee93305ebe88f01c05a27be96':
  add some assert messages to download manager test
 2014-09-09 22:01:07 +00:00
Philip Milne
83032a0211 am 4a4bf80a: am 2a95b928: Fix for b/16400888 - API Review: GridLayout attributes 
* commit '4a4bf80a3ce90f4d4d4a925b1a4130dbc28130db':
  Fix for b/16400888 - API Review: GridLayout attributes
 2014-09-09 21:57:10 +00:00
John Spurlock
506b2e3559 am 9d44371d: am 0b7a5768: Merge "On db upgrade, reset ringer mode to normal." into lmp-dev 
* commit '9d44371d4ccb8d4c2c511b21a8d736c1d3600383':
  On db upgrade, reset ringer mode to normal.
 2014-09-09 21:57:06 +00:00
Jean-Michel Trivi
10b9bb6aab am 99fa36d5: am 013279ac: Merge "Prevent NotificationManagerService from using bad stream type" into lmp-dev 
* commit '99fa36d5a29f006f5be397380a590ff4c7ff4d27':
  Prevent NotificationManagerService from using bad stream type
 2014-09-09 21:56:47 +00:00
John Spurlock
975830376a am cf44d281: am cdc2b578: Merge "Zen: Map transition to ringer-mode silent to "priority"." into lmp-dev 
* commit 'cf44d2815b243d5064cecd9778135e7d85484003':
  Zen: Map transition to ringer-mode silent to "priority".
 2014-09-09 21:56:21 +00:00
Amith Yamasani
1f4ea68a07 am d94df395: am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 
* commit 'd94df395a87836b5dba6bd159010046e1d016661':
  User restriction to disallow outgoing NFC beam
 2014-09-09 21:56:09 +00:00
Jeff Sharkey
30d40e707b am a5746ce3: am b8d727ec: Merge "Use sscanf() for parsing tag values." into lmp-dev 
* commit 'a5746ce305bc331c4cb6a5bd1fa152c17813e0f8':
  Use sscanf() for parsing tag values.
 2014-09-09 21:56:04 +00:00
John Spurlock
ec034796ab am 1d182090: am d09f0b6b: Merge "Doze: Wake up on touch, fade between states." into lmp-dev 
* commit '1d1820902aab92865bd8ddebb1ddf55f4998051f':
  Doze: Wake up on touch, fade between states.
 2014-09-09 21:56:00 +00:00
Chris Craik
e938707a64 am 78558652: am e46cfca2: Merge "hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D" into lmp-dev 
* commit '785586526d97aab356acbcb4d8b4a79904ff3424':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D
 2014-09-09 21:55:44 +00:00
Lajos Molnar
bc67eee710 Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev 2014-09-09 21:55:43 +00:00
Riley Andrews
4ef0f50c29 am f41b1485: am 4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev 
* commit 'f41b14855e6fd1bcf2ddaa843d0e177825010023':
  Use surfaceflinger for recents thumbnail rotations.
 2014-09-09 21:55:38 +00:00
Alan Viverette
d381834c77 am aafd303e: am e74dff14: Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev 
* commit 'aafd303e48e95fda8b2b5bd9e3541e87997d6ef4':
  Use correct row/column order in list and grid CollectionItems
 2014-09-09 21:55:33 +00:00
Guang Zhu
3ab7bf1a3d Merge "add some assert messages to download manager test" into lmp-dev 2014-09-09 21:51:17 +00:00
John Spurlock
b06cd76a69 am 7fa27583: Merge "QS: Fix tile padding on dual tile first lines." into lmp-dev 
* commit '7fa275831652f2fcaf6df2d10264f2c9b8ae0346':
  QS: Fix tile padding on dual tile first lines.
 2014-09-09 21:49:52 +00:00
Alan Viverette
9597427fe9 am ba2ce6fa: Merge "Update alert dialog styling to match Material spec" into lmp-dev 
* commit 'ba2ce6fa080df627646501f58bab5fde76b0f2c2':
  Update alert dialog styling to match Material spec
 2014-09-09 21:49:47 +00:00
John Spurlock
8143d2fbfd Merge "QS: Fix tile padding on dual tile first lines." into lmp-dev 2014-09-09 21:47:53 +00:00
Guang Zhu
30478148bd add some assert messages to download manager test 
Change-Id: If2e1bdd115eddeeb7bdebf0fab29a3756fee4ceb
 2014-09-09 14:44:17 -07:00
Alan Viverette
6aad5057b6 Merge "Update alert dialog styling to match Material spec" into lmp-dev 2014-09-09 21:43:33 +00:00
Lajos Molnar
aa79d99576 initialize codec list before MediaCodec.getCodecInfo() 
Bug: 17374217
Change-Id: I8e8fc3a34ec01afdf5fc577979010183971c878b
 2014-09-09 14:35:33 -07:00
John Spurlock
baa958dc44 QS: Fix tile padding on dual tile first lines. 
Now that the caret is not being set, update the padding to
handle this case.

Bug:17421027
Change-Id: Iaacf60df6e39801a27dad054f2d42c99b85c46cd
 2014-09-09 17:33:01 -04:00
Philip Milne
737d4a12b0 am 2a95b928: Fix for b/16400888 - API Review: GridLayout attributes 
* commit '2a95b928c8fbe326d79776fa30d0d18809a0dd45':
  Fix for b/16400888 - API Review: GridLayout attributes
 2014-09-09 21:29:23 +00:00
John Spurlock
a6db715a7f am 0b7a5768: Merge "On db upgrade, reset ringer mode to normal." into lmp-dev 
* commit '0b7a576895b15d19fd0b1880ccba633ea1d6010a':
  On db upgrade, reset ringer mode to normal.
 2014-09-09 21:29:18 +00:00
Philip Milne
1a7a63ad5e Fix for b/16400888 - API Review: GridLayout attributes 
Column weights specify the relative proportions of space distribution 
within a *row*. With that in mind, I flipped the vertical and horizontal 
axes in the docs - but that was a mistake. This CL flips the docs back. 
The code works the right way around so doesn't need to be modified.

Change-Id: I1a36882eee8d1b9bd7b8ef10e03cbf66de0ac261
(cherry picked from commit 4ae5f5ee917b2014abe3b6e0b99451693cd2b896)
 2014-09-09 21:25:44 +00:00
John Spurlock
38553adb4f Merge "On db upgrade, reset ringer mode to normal." into lmp-dev 2014-09-09 21:20:28 +00:00
John Spurlock
7d424b6c50 On db upgrade, reset ringer mode to normal. 
When users upgrade to L, don't restore into a state that would force
zen mode to follow suit.  A user's first encounter with zen mode
should be via the UI.

Bug:16826161
Change-Id: I4eb63dce37d88f3a91b5034b3393eed2b768562c
 2014-09-09 17:05:54 -04:00
Jean-Michel Trivi
69890cfd21 am 013279ac: Merge "Prevent NotificationManagerService from using bad stream type" into lmp-dev 
* commit '013279ac439d3a4acb7e53a8af1ff8cd146543fa':
  Prevent NotificationManagerService from using bad stream type
 2014-09-09 20:57:11 +00:00
Jean-Michel Trivi
97dc52c857 Merge "Prevent NotificationManagerService from using bad stream type" into lmp-dev 2014-09-09 20:49:50 +00:00
John Spurlock
9fcbbebd6f am cdc2b578: Merge "Zen: Map transition to ringer-mode silent to "priority"." into lmp-dev 
* commit 'cdc2b578ac80aad887745896b689bda4442a1028':
  Zen: Map transition to ringer-mode silent to "priority".
 2014-09-09 20:47:33 +00:00
John Spurlock
9ed0292a65 Merge "Zen: Map transition to ringer-mode silent to "priority"." into lmp-dev 2014-09-09 20:40:03 +00:00
Amith Yamasani
5ac4d47091 am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 
* commit '7a9f541e596b4db8824969678896161c8e06d6bc':
  User restriction to disallow outgoing NFC beam
 2014-09-09 20:35:52 +00:00
John Spurlock
806dbae9e1 Zen: Map transition to ringer-mode silent to "priority". 
Instead of "none".

Bug:16875664
Change-Id: I2a425663f08f35854e7e857330afc20eef01ef2e
 2014-09-09 16:32:42 -04:00