234736 Commits

Author SHA1 Message Date
Adam Lesinski
8b030cce34 Merge "AAPT2: Support building, linking, and merging static libraries" into nyc-dev 2016-03-04 23:46:49 +00:00
Adrian Roos
d78520192a Merge "Fix BiDi issues in app error dialogs" into nyc-dev 2016-03-04 23:37:03 +00:00
Adrian Roos
569edb8512 Log bouncer prompt reason
Bug: 27434873
Change-Id: I6918507b66506cf95b20f95fe4a5cb19c899122f
2016-03-04 15:13:28 -08:00
Jean-Michel Trivi
b74926232e Merge "API changes for audio recording notifications" into nyc-dev 2016-03-04 22:49:31 +00:00
Chris Wren
b279a8b39c Merge "add more comments from the other file" into nyc-dev 2016-03-04 22:42:03 +00:00
Adam Lesinski
64587af817 AAPT2: Support building, linking, and merging static libraries
Android static libraries are like APKs but they contain much more debugging
and source information. We need to treat them differently in 3 ways:

1) When building a static library, we skip things like ID assignment and
   product/config stripping. Source information is emitted as well.
2) When building a static library and linking against another
   static library, we don't want to merge, we want to simply reference.
3) When building an app that uses static libraries, we want to merge
   the static library under the same package with or without mangling.

Bug:25958912
Change-Id: I425e032857936a3e83173c1edc2a6cdc6020b842
2016-03-04 14:39:01 -08:00
Aga Wronska
e5a3bb76b8 Merge "Made breadcrumb drop down match mocks" into nyc-dev 2016-03-04 22:37:41 +00:00
Chris Wren
dc86f34a09 add more comments from the other file
Bug: 27429645
Change-Id: Ie903240af25a15f0f57cda5a8c57377d001a2f2c
2016-03-04 22:34:44 +00:00
Winson Chung
e27a4376ab Merge "Use the non-override task progress for calculating the z." into nyc-dev 2016-03-04 22:31:01 +00:00
Aga Wronska
b6db022312 Made breadcrumb drop down match mocks
Bug: 27136601
Change-Id: I93af07a45defaddd7f5785fac8b686984a889583
2016-03-04 14:05:39 -08:00
Roshan Pius
56eac13284 WifiScanner: Add PNO public API
am: e4fd150962

* commit 'e4fd150962e07dbcb0646d556bf372be0cc15f1f':
  WifiScanner: Add PNO public API
2016-03-04 22:01:04 +00:00
Julia Reynolds
da52422a83 Merge "Redlines for inline settings." into nyc-dev 2016-03-04 21:47:56 +00:00
Joe Onorato
5d4ab988bd Merge changes Ib6e0e6f3,I109f04c2,Idc716000,I44c51d5f,I810b9bd5, ... into nyc-dev
* changes:
  Turn down the logging a little bit.
  Turn down the logging a little bit and don't do a log wrapper function.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
2016-03-04 21:39:14 +00:00
Roshan Pius
e4fd150962 WifiScanner: Add PNO public API
Add the public interface for starting/stopping PNO scan.

This is the internal flow that is going to be used for PNO scan:
1. Set Pno list
2. Start background scan

This flow will not work as is for supplicant, since background scan is
done manually today. So, we'll need a flag to indicate that this
background scan is targetted for PNO.

BUG: 27167559
Change-Id: I3f6921c5d03f7d9e8ad1847e57e12fb38df6c9c9
TEST: Compiles & unit-test passes
2016-03-04 13:37:48 -08:00
Jeff Sharkey
a561e3a3b7 Merge "Log FBE related flags when dumping packages." into nyc-dev 2016-03-04 21:35:35 +00:00
Chien-Yu Chen
329484bb7e Merge "Camera2 Legacy: Connect to surfaces it produces" into nyc-dev 2016-03-04 21:01:34 +00:00
Suprabh Shukla
e1fd7f09d5 Merge "Not clearing data for a package that is a DO or PO" into nyc-dev 2016-03-04 20:38:44 +00:00
Joe Onorato
12acbd7836 Turn down the logging a little bit.
Change-Id: Ib6e0e6f3577afac3b9bfe9a9b1cce70fb16d9d04
2016-03-04 12:21:30 -08:00
Joe Onorato
f188d41fa2 Turn down the logging a little bit and don't do a log wrapper function.
Change-Id: I109f04c2c2299f26e21b076df3a935ce2d356bdf
2016-03-04 12:21:30 -08:00
Joe Onorato
a102dd01e9 Turn down the logging a little bit.
Change-Id: Idc716000ba5d28f52aee3e1cb84832e1c6eaf440
2016-03-04 12:21:30 -08:00
Joe Onorato
0aa05d7388 Turn down the logging a little bit.
Change-Id: I44c51d5f8248df1f8cca19da802ee891afe78af7
2016-03-04 12:21:30 -08:00
Joe Onorato
3973b1a75d Turn down the logging a little bit.
Change-Id: I810b9bd58412d2b38d8ce4497baa71047125b92f
2016-03-04 12:21:30 -08:00
Joe Onorato
1e55375c96 Turn down the logging a little bit.
Change-Id: I14762c5cc3706c31bd1b3868eac2528ae981aef8
2016-03-04 12:21:30 -08:00
Joe Onorato
93dcff0122 Turn down the logging a little bit.
Change-Id: I5760eb7d6d6ed5e8a3426e92c835e8a71e10cdbb
2016-03-04 12:21:30 -08:00
Eino-Ville Talvala
8a35cbf45b Merge "DngCreator: Improve BlackLevel, fix thumbnail metadata" into nyc-dev 2016-03-04 20:07:43 +00:00
Steve McKay
9eb7190af5 Merge "Revert "Hide Files app launcher icon."" into nyc-dev 2016-03-04 19:54:36 +00:00
Steve McKay
080d71b130 Revert "Hide Files app launcher icon."
This reverts commit 24e46045956da911b385be33cff473bdacebf780.

Un-hiding this for continued development in nyc-dev.

Based on conversations between those at higher paygrades, we'll either leave this visible or re-hide prior to next dev release.

Change-Id: I235eb0f593daa7b34ea10ed4c9df4eaa6c68078c
2016-03-04 19:52:55 +00:00
Jeff Sharkey
effcd93594 Log FBE related flags when dumping packages.
Bug: 27455726
Change-Id: I18146431792d5be0808ff6044174eff328039251
2016-03-04 12:52:39 -07:00
Steve McKay
58e8d467bd Merge "Hide Files app launcher icon." into nyc-dev 2016-03-04 19:42:34 +00:00
Julia Reynolds
aebacc94c0 Redlines for inline settings.
Change-Id: I535f84f70444caf376b671352da8da94b764b1eb
2016-03-04 14:37:45 -05:00
Julia Reynolds
cedacefd70 Api Review: NotificationManager.Policy
Bug: 27365873
Change-Id: Ie53a410d53f430fa90f24d95a885be150a3d66aa
2016-03-04 14:37:45 -05:00
Winson
8f97c83b2e Use the non-override task progress for calculating the z.
- This guarantees that they won’t collide, where as the override task
  progresses will as tasks animate while dragging to dismiss.

Change-Id: I25eded22c13b38428d849062c6d95893f3fff5c5
2016-03-04 19:33:50 +00:00
Steve McKay
24e4604595 Hide Files app launcher icon.
Bug: 27498061

Change-Id: Ifc76ef731a623e95839252a6c9483ce3546c9930
2016-03-04 11:33:46 -08:00
Adam Powell
92e84089c4 Merge "Stop ProgressBar animations when not visible" into nyc-dev 2016-03-04 19:27:17 +00:00
Eino-Ville Talvala
8069b1f252 DngCreator: Improve BlackLevel, fix thumbnail metadata
- Use new dynamic black level result key when available
 - Write rational black level instead of integral value
 - Fix incorrect thumbnail BitsPerSample metadata
 - Fix incorrect date/time format string
 - Fix unknown orientation

Test: dng_validate for captured DNGs is clean
Bug: 27452979
Bug: 25862995
Change-Id: I87b73f7a4f4ecc3cf6498c7db16df68dd0b0b43a
2016-03-04 11:22:15 -08:00
Aga Wronska
8d07a1d757 Merge "Fixed arranging the views when in tablet landscape layout." into nyc-dev 2016-03-04 19:15:59 +00:00
Aga Wronska
511ee39691 Fixed arranging the views when in tablet landscape layout.
Bug: 27473988
Change-Id: Id0333af9d9c63e1292d234543cd5950ae201f66a
2016-03-04 11:13:07 -08:00
Todd Kennedy
40a6e6a10e Merge "dump apk signing version" into nyc-dev 2016-03-04 18:34:00 +00:00
Yorke Lee
acc86abf82 Merge "Add config value to force nav bar to be opaque" into nyc-dev 2016-03-04 18:27:20 +00:00
Adam Powell
c1bba9b9f8 Stop ProgressBar animations when not visible
Propagate setVisible calls to current drawable. Take window visibility
into account when determining drawable visibility.

Bug 27461595

Change-Id: Ia1de1d1686f26c2cf27630c5bde70f23c2c332bd
2016-03-04 10:15:35 -08:00
Chris Craik
485e41d510 Merge "Revert "Disable HWUI_NEW_OPS"" into nyc-dev 2016-03-04 17:58:37 +00:00
Chris Tate
2fad2ea0e6 Merge "Don't use restricted backup launch mode for system-ish processes" into nyc-dev 2016-03-04 17:57:09 +00:00
Chris Craik
6f270e062c Merge "Fix clip rect snapping at non-integer scale values" into nyc-dev 2016-03-04 17:54:33 +00:00
Yorke Lee
e5ccccd3be Merge "Make isPanelFullyCollapsed public" into nyc-dev 2016-03-04 17:36:50 +00:00
Jason Monk
84606d704a Merge "Make QS do simpler anim on lock screen" into nyc-dev 2016-03-04 15:52:47 +00:00
Deepanshu Gupta
10b6e07717 Change BridgeResources to Resources_Delegate [DO NOT MERGE]
am: 9b137e27d3  -s ours

* commit '9b137e27d34efb89024543ffd2def2b37307aa0c':
  Change BridgeResources to Resources_Delegate [DO NOT MERGE]
2016-03-04 14:59:55 +00:00
Deepanshu Gupta
9b137e27d3 Change BridgeResources to Resources_Delegate [DO NOT MERGE]
Do not merge because the resource implementation has changed in N and
the change is no longer valid there.

This is a very hacky fix to make layoutlib work with the latest support
lib. Inject a couple of fields in android.content.res.Resources to
allow using most of the earlier code as is.

Bug: 27403642
Bug: http://b.android.com/201934
Change-Id: I186cad32b1b4de64164fbad937d989e0110c6976
2016-03-04 20:18:23 +05:30
Narayan Kamath
cda4198937 Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33 (part 2).
Also includes a regenerated test-current.txt.

bug: 27426688

(cherry picked from commit 7d18ce744fff219ab60470ec095d585b854b91e1)

Change-Id: I754803d51d365ac1fe26c638b12efb88d23b35c6
2016-03-04 13:24:13 +00:00
Victor Chang
0114263a1a Merge "enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode" into nyc-dev 2016-03-04 13:13:27 +00:00
Victor Chang
915d524553 Merge "isDeviceOwnerProvisioningAllowed implementation to match enforceCanSetDeviceOwnerLocked" into nyc-dev 2016-03-04 13:13:14 +00:00