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

59091 Commits

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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Jeff Sharkey
df9d704a60 am b8d727ec: Merge "Use sscanf() for parsing tag values." into lmp-dev 
* commit 'b8d727ec928c77d4131a5f90995f29b829443b57':
  Use sscanf() for parsing tag values.
 2014-09-09 20:31:26 +00:00
Amith Yamasani
da6e6c888f Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 2014-09-09 20:29:57 +00:00
Jeff Sharkey
a237e05cd7 Merge "Use sscanf() for parsing tag values." into lmp-dev 2014-09-09 20:29:36 +00:00
Riley Andrews
fd8a25eba1 am 4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev 
* commit '4b7c14bf1cb62c806223b12fdf3c5ba1d48908e7':
  Use surfaceflinger for recents thumbnail rotations.
 2014-09-09 20:05:04 +00:00
Alan Viverette
c6a76344b1 am e74dff14: Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev 
* commit 'e74dff14dc6e075e372aeedb6610243c28884610':
  Use correct row/column order in list and grid CollectionItems
 2014-09-09 20:04:58 +00:00
Riley Andrews
0b81adcaea Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev 2014-09-09 19:59:15 +00:00
Alan Viverette
b505298489 Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev 2014-09-09 19:57:09 +00:00
Eino-Ville Talvala
e8df3093f5 Camera2: Add frameNumber to CaptureCallback#onCaptureStarted 
Otherwise, cannot reliably match up capture progressed and failure callbacks
with the start callback.

Bug: 17421092
Change-Id: I91d92be70a15536b215bac330370ce37e426ec26
 2014-09-09 12:38:11 -07:00
Jeff Sharkey
e47d5435de Use sscanf() for parsing tag values. 
Neither strtoll() nor strtoull() can parse the %llx formatted tag
values coming from the kernel.  We know the lowest 32 bits will never
be set, so fast-path the 3-character case as 0x0.

Bug: 17365163
Change-Id: I238bbd2830c9335e7ab7a53362d6e12b46e0bcb3
 2014-09-09 12:29:41 -07:00
Amith Yamasani
26af829fd7 User restriction to disallow outgoing NFC beam 
This can be controlled by MDMs via DPM.

Also fixes:
 - javadoc for restrictions
 - persisting of cross profile copy/paste restriction

Bug: 17387303
Change-Id: Ie148f56189181d2a4c6345c0823d417ab13a94a3
 2014-09-09 12:09:47 -07:00
Griff Hazen
87631502eb am 78ce7d0b: am 527006ad: am df35ac5f: Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev 
* commit '78ce7d0bd36fb3b20a05aed600367cbb0ff8b5a2':
  Remove reference to StatusBarNotification after the value is accessed.
 2014-09-09 18:58:34 +00:00
Griff Hazen
88a9c55233 am f26b4fda: am accb122d: am c06b7a78: Copy visibility docs from support version to base Notification. 
* commit 'f26b4fdac14531e9a18a476db1ddf07a0cadefe8':
  Copy visibility docs from support version to base Notification.
 2014-09-09 18:58:14 +00:00
Griff Hazen
6b6fe58db1 am 527006ad: am df35ac5f: Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev 
* commit '527006ad3a84a1cec342d00a59ab766aee4730cd':
  Remove reference to StatusBarNotification after the value is accessed.
 2014-09-09 18:47:50 +00:00