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

156971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yin-Chia Yeh
bd4e8987ce am 74405587: am 5fc81692: am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev 
* commit '7440558739b20b835923e53866cd1998e6a77a37':
  camera2: make 3A regions null when not available
 2014-09-10 01:08:25 +00:00
Eino-Ville Talvala
b0fbabb77b am 75b0c316: am f9e64824: am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 
* commit '75b0c316390daeddbfcc897bcd4a763fed557fef':
  Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
 2014-09-10 01:08:16 +00:00
vandwalle
d5b175d67b am cfd59eff: am 2dd81a13: am 5e811150: Merge "make autojoin associated scan period a config opttion" into lmp-dev 
* commit 'cfd59eff3b9f66bbc3ae4024f46bc7b2438badd5':
  make autojoin associated scan period a config opttion
 2014-09-10 01:08:09 +00:00
Svetoslav
5014c1daf7 am 36a9a4c7: am f1b72b86: am 3f49b128: Merge "Trim unnecessary pages when printing." into lmp-dev 
* commit '36a9a4c7920e7faa02a4b9444b7a247e89923b9d':
  Trim unnecessary pages when printing.
 2014-09-10 01:07:59 +00:00
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
Yin-Chia Yeh
0efe661696 am 5fc81692: am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev 
* commit '5fc81692af2d249b901a0f7ce4ec6bc5327ff8c2':
  camera2: make 3A regions null when not available
 2014-09-10 00:49:37 +00:00
Eino-Ville Talvala
2f94ed6cee am f9e64824: am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 
* commit 'f9e648243298760e96053a90674b30fe00ce3f5c':
  Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
 2014-09-10 00:49:31 +00:00
vandwalle
62609a1146 am 2dd81a13: am 5e811150: Merge "make autojoin associated scan period a config opttion" into lmp-dev 
* commit '2dd81a13a6a2f872e9b074f2e2dab6fa390a30fa':
  make autojoin associated scan period a config opttion
 2014-09-10 00:49:22 +00:00
Svetoslav
87c8260341 am f1b72b86: am 3f49b128: Merge "Trim unnecessary pages when printing." into lmp-dev 
* commit 'f1b72b86380b25b933be32c46d4f59a41699a546':
  Trim unnecessary pages when printing.
 2014-09-10 00:49:17 +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
Yin-Chia Yeh
ec261ead49 am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev 
* commit '916d8fafe6b61b7499cc8d41331adfb11d2136fa':
  camera2: make 3A regions null when not available
 2014-09-09 22:31:57 +00:00
Eino-Ville Talvala
a8b4bb8c90 am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 
* commit '28312293a2dfab504e5d1e6102c5392d652b6981':
  Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
 2014-09-09 22:31:52 +00:00
Yin-Chia Yeh
8544c7da86 Merge "camera2: make 3A regions null when not available" into lmp-dev 2014-09-09 22:24:49 +00:00
Eino-Ville Talvala
31913c334a Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 2014-09-09 22:20:58 +00:00
vandwalle
1853fddaf4 am 5e811150: Merge "make autojoin associated scan period a config opttion" into lmp-dev 
* commit '5e811150b9d538d0e59a367d8d75a20d85a12549':
  make autojoin associated scan period a config opttion
 2014-09-09 22:19:48 +00:00
Svetoslav
08dd15e1f4 am 3f49b128: Merge "Trim unnecessary pages when printing." into lmp-dev 
* commit '3f49b128bc94c1b1e66decf96d46a83bcdb9a62b':
  Trim unnecessary pages when printing.
 2014-09-09 22:19:44 +00:00
vandwalle
2bc9f4178a Merge "make autojoin associated scan period a config opttion" into lmp-dev 2014-09-09 22:12:06 +00:00
Svetoslav
15040e0a58 Merge "Trim unnecessary pages when printing." into lmp-dev 2014-09-09 22:11:20 +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