Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
6ee6ba515a Merge "Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb am: cd1a9642e8" into nyc-mr1-dev-plus-aosp 2016-05-18 22:13:31 +00:00
Android Build Merger (Role)
80a01d8d6d Merge "Merge "Correct PiP inset adjustment." into nyc-dev am: 54a3dd53fe am: beda350d78" into nyc-mr1-dev-plus-aosp 2016-05-18 22:13:19 +00:00
Robert Carr
962e267d8c Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb 
am: cd1a9642e8

* commit 'cd1a9642e8a5787ef1ab822b6b7a4c4370cd93b7':
  Fixes for ending PiP animation.

Change-Id: Ied6460cf354628c348f5503c2b63eb2b4ef419fb
 2016-05-18 22:12:52 +00:00
Robert Carr
715994bf82 Merge "Correct PiP inset adjustment." into nyc-dev am: 54a3dd53fe 
am: beda350d78

* commit 'beda350d785f25456ce31363203fef3a3e694712':
  Correct PiP inset adjustment.

Change-Id: I2b357ac4a80b86ac2dd4c8f46d0aad172624688e
 2016-05-18 22:12:50 +00:00
smain@google.com
e1a486a4c1 Update app context in code snippet bug: 28842396 am: 056df25179 am: 0fc19538cf am: cca8eba82d 
am: d24ad86909

* commit 'd24ad8690968c532d3b9d2109309ae19cc995d3c':
  Update app context in code snippet bug: 28842396

Change-Id: I0efcef2cddb7e372347c8665d02093c3ed22c1ed
 2016-05-18 22:11:38 +00:00
smain@google.com
664446a34c Update app context in code snippet bug: 28842396 am: 056df25179 am: 0fc19538cf am: cca8eba82d 
am: d24ad86909

* commit 'd24ad8690968c532d3b9d2109309ae19cc995d3c':
  Update app context in code snippet bug: 28842396

Change-Id: Ib50337985494772510e4e754dd6884fe9b30ba8e
 2016-05-18 22:11:35 +00:00
Robert Carr
3b0a049b11 Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb 
am: 9782de1ffd

* commit '9782de1ffd344d1a8250b8ead4a13eee16c20cde':
  Fixes for ending PiP animation.

Change-Id: I34acea654389eedd7d3b6f6e7ec2f239cccf2ae6
 2016-05-18 22:11:10 +00:00
Robert Carr
0a669e6e98 Merge "Correct PiP inset adjustment." into nyc-dev am: 54a3dd53fe 
am: 76ad440346

* commit '76ad440346ef6e87775403566aacf8d852a7c674':
  Correct PiP inset adjustment.

Change-Id: I2aee2e94118884b9bb98876e55283b1a8783c8b0
 2016-05-18 22:11:03 +00:00
Robert Carr
9782de1ffd Merge "Fixes for ending PiP animation." into nyc-dev 
am: bc9edc7ccb

* commit 'bc9edc7ccb4d876bfc5c706fbb64dab9a2768b52':
  Fixes for ending PiP animation.

Change-Id: If885965536859bc2433d14d4993010871c171360
 2016-05-18 22:05:30 +00:00
Robert Carr
cd1a9642e8 Merge "Fixes for ending PiP animation." into nyc-dev 
am: bc9edc7ccb

* commit 'bc9edc7ccb4d876bfc5c706fbb64dab9a2768b52':
  Fixes for ending PiP animation.

Change-Id: I58d62d0d0dd964264395b545bf4e3093a0ffaf88
 2016-05-18 22:05:28 +00:00
Robert Carr
76ad440346 Merge "Correct PiP inset adjustment." into nyc-dev 
am: 54a3dd53fe

* commit '54a3dd53fe6028db1f1c797ed6be12ccb6263ecf':
  Correct PiP inset adjustment.

Change-Id: I7e9ad20b69c5bfc99828537535bf83e6c864ffeb
 2016-05-18 22:05:26 +00:00
Robert Carr
beda350d78 Merge "Correct PiP inset adjustment." into nyc-dev 
am: 54a3dd53fe

* commit '54a3dd53fe6028db1f1c797ed6be12ccb6263ecf':
  Correct PiP inset adjustment.

Change-Id: I4dd488abc3f9eb84a7c4fc198837f7bb715964b5
 2016-05-18 22:05:23 +00:00
Winson Chung
56e6d81716 Merge "Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42 am: 98fdcf308f" into nyc-mr1-dev-plus-aosp 
am: 185bfbb635

* commit '185bfbb635d198ec0b29783828f4c326ddb4ac0d':

Change-Id: I281a129ab90159742c6a34e30a26dfc639a5b869
 2016-05-18 22:05:04 +00:00
Alex Light
ac0a933b33 Merge "Merge "Make fake libart for misbehaving apps be loaded." am: 4bc3d32b15 am: 8f578530a9 -s ours am: 67f3a19e9a" into nyc-mr1-dev-plus-aosp 
am: 8386eae2a1

* commit '8386eae2a18345c71cd3c72b48dbe107597ee28c':
  Make fake libart for misbehaving apps be loaded.

Change-Id: I75d880e8e1d4f297ae624cd94f46654f427e0386
 2016-05-18 22:01:15 +00:00
Winson
81100ae084 Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42 am: 6e2ee9e382 
am: ea9220988e

* commit 'ea9220988e8c88d258a5cb99e2687ee03f90cf55':
  Mark occluded home stack as invisible.

Change-Id: I8f9f1a92e198f7db97d7c3e1b93ff77a83fdbc5c
 2016-05-18 22:01:00 +00:00
smain@google.com
d24ad86909 Update app context in code snippet bug: 28842396 am: 056df25179 am: 0fc19538cf 
am: cca8eba82d

* commit 'cca8eba82d48888656d36aed8020fd3ecd738fdd':
  Update app context in code snippet bug: 28842396

Change-Id: I04ef5aeac32a526028e71ed71bcdf39920cc0c4f
 2016-05-18 22:00:21 +00:00
TreeHugger Robot
bc9edc7ccb Merge "Fixes for ending PiP animation." into nyc-dev 2016-05-18 21:57:23 +00:00
TreeHugger Robot
54a3dd53fe Merge "Correct PiP inset adjustment." into nyc-dev 2016-05-18 21:57:04 +00:00
Android Build Merger (Role)
185bfbb635 Merge "Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42 am: 98fdcf308f" into nyc-mr1-dev-plus-aosp 2016-05-18 21:56:54 +00:00
Android Build Merger (Role)
8386eae2a1 Merge "Merge "Make fake libart for misbehaving apps be loaded." am: 4bc3d32b15 am: 8f578530a9 -s ours am: 67f3a19e9a" into nyc-mr1-dev-plus-aosp 2016-05-18 21:56:43 +00:00
Winson Chung
b371da239c Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42 
am: 98fdcf308f

* commit '98fdcf308f8cc609e2b7c919d308379d1164c85e':
  Mark occluded home stack as invisible.

Change-Id: If6b7f4c0f750135125777f41ba5d2b76bea03640
 2016-05-18 21:56:14 +00:00
Alex Light
52dcb22b81 Merge "Make fake libart for misbehaving apps be loaded." am: 4bc3d32b15 am: 8f578530a9 -s ours 
am: 67f3a19e9a

* commit '67f3a19e9a29c4417eaeed42bd99fb079e096e9c':
  Make fake libart for misbehaving apps be loaded.

Change-Id: I35845a4b62ff4111680f0b1ffc3cc47717d23ab9
 2016-05-18 21:56:12 +00:00
Winson Chung
ea9220988e Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42 
am: 6e2ee9e382

* commit '6e2ee9e382dd86340d5242fe04a623b9cda10f6e':
  Mark occluded home stack as invisible.

Change-Id: I1762cf46b675fe2c5151332a53139e95d676cb01
 2016-05-18 21:56:10 +00:00
smain@google.com
cca8eba82d Update app context in code snippet bug: 28842396 am: 056df25179 
am: 0fc19538cf

* commit '0fc19538cf9e166fe0ccf511c3f6d18b23b9fd90':
  Update app context in code snippet bug: 28842396

Change-Id: I9212c98b926568f2516fd34fb3ba376029bb366b
 2016-05-18 21:55:11 +00:00
smain@google.com
0fc19538cf Update app context in code snippet bug: 28842396 
am: 056df25179

* commit '056df25179e2a6621f9abeb5cdf749387a489751':
  Update app context in code snippet bug: 28842396

Change-Id: I302124bb72a8162dbc0c7b1fa96c14657a86c97c
 2016-05-18 21:51:50 +00:00
Winson
98fdcf308f Merge "Mark occluded home stack as invisible." into nyc-dev 
am: 32b54f2e42

* commit '32b54f2e42c4ff793c418c29c0ce9ef0be2a4a16':
  Mark occluded home stack as invisible.

Change-Id: Iae4279835f345b2b294acca20760634ba031f0bd
 2016-05-18 21:50:44 +00:00
Winson
6e2ee9e382 Merge "Mark occluded home stack as invisible." into nyc-dev 
am: 32b54f2e42

* commit '32b54f2e42c4ff793c418c29c0ce9ef0be2a4a16':
  Mark occluded home stack as invisible.

Change-Id: Iaa68bb7c93ffd8bcfc9af3e66fd7fced7787a671
 2016-05-18 21:49:17 +00:00
TreeHugger Robot
bb711dfeb7 Merge "sysui: refactor for extensibility." 2016-05-18 21:47:41 +00:00
Winson Chung
32b54f2e42 Merge "Mark occluded home stack as invisible." into nyc-dev 2016-05-18 21:42:57 +00:00
Alex Light
67f3a19e9a Merge "Make fake libart for misbehaving apps be loaded." am: 4bc3d32b15 
am: 8f578530a9  -s ours

* commit '8f578530a9e2c249ccdd881933d48c205bf5d374':
  Make fake libart for misbehaving apps be loaded.

Change-Id: I1685e8fabf23d6fe1709fb34cafe20a5cc2625e4
 2016-05-18 21:41:43 +00:00
smain@google.com
056df25179 Update app context in code snippet 
bug: 28842396

Change-Id: I306ba2d3f7ccb1f547caa46e038c1d3faaccab26
 2016-05-18 14:35:51 -07:00
Alex Light
8f578530a9 Merge "Make fake libart for misbehaving apps be loaded." 
am: 4bc3d32b15

* commit '4bc3d32b15cdcae7685722e7a20007c7aa9ae949':
  Make fake libart for misbehaving apps be loaded.

Change-Id: Ia256fdb964f69c029c3b1e8e10ff396f79048cb4
 2016-05-18 21:13:23 +00:00
Chong Zhang
9a9fae1d53 Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev am: ff8ceadfc8 am: e5f15f1b34 
am: b5dcf2f7f0

* commit 'b5dcf2f7f079d5f13a7cef127ebf6ba4c2a0b905':

Change-Id: I33e7762d430dc0bd5a1d8d7693c95169e0cf65b4
 2016-05-18 21:12:49 +00:00
Chong Zhang
9268d5af08 Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev am: ff8ceadfc8 am: c5bdda2236 
am: 0cfcd14e7b

* commit '0cfcd14e7b97a064e416957f115dea4e1d4650eb':
  Request a traversal when a saved surface gets redrawn

Change-Id: Ie0db6c2fd7d6eb198efa22fe00d5f819ddb8d402
 2016-05-18 21:07:41 +00:00
Amith Yamasani
a3d46611e3 Merge "Retail mode flag and some clients for it" into nyc-mr1-dev am: dbf0dbd8c2 
am: 1ab19ea6e6

* commit '1ab19ea6e6575a578244eecbae61d46150bec392':
  Retail mode flag and some clients for it

Change-Id: I08eb3539db3fd29403d05d8ef1124862a78d1acc
 2016-05-18 21:07:37 +00:00
Chong Zhang
b5dcf2f7f0 Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev am: ff8ceadfc8 
am: e5f15f1b34

* commit 'e5f15f1b34931fb28937646599e7e66b7cb61ed1':

Change-Id: I0b4837dc3e7b10d6f345b54079aefa8a6bdf3bd8
 2016-05-18 21:07:35 +00:00
Alex Light
4bc3d32b15 Merge "Make fake libart for misbehaving apps be loaded." 2016-05-18 21:05:42 +00:00
Chong Zhang
0cfcd14e7b Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev am: ff8ceadfc8 
am: c5bdda2236

* commit 'c5bdda22367884965b16dcfbb98cf6b2f6cddd1d':
  Request a traversal when a saved surface gets redrawn

Change-Id: Ie38198dca921a06b7124c195ae8f77479e8fdfd6
 2016-05-18 21:04:39 +00:00
Amith Yamasani
1ab19ea6e6 Merge "Retail mode flag and some clients for it" into nyc-mr1-dev 
am: dbf0dbd8c2

* commit 'dbf0dbd8c216e801b3d95f83d13ae05c1ba0ea39':
  Retail mode flag and some clients for it

Change-Id: I5f9e7c49759154925c6f20ab3fd647d84259b1bb
 2016-05-18 21:01:49 +00:00
Chong Zhang
c5bdda2236 Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev 
am: ff8ceadfc8

* commit 'ff8ceadfc8c5f03da57420ad93a698cb0a57fcd9':
  Request a traversal when a saved surface gets redrawn

Change-Id: I5cd93f39d2cf2b11e405f4d9f05ecb6bc2040267
 2016-05-18 21:01:44 +00:00
Chong Zhang
e5f15f1b34 Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev 
am: ff8ceadfc8

* commit 'ff8ceadfc8c5f03da57420ad93a698cb0a57fcd9':
  Request a traversal when a saved surface gets redrawn

Change-Id: I7feb2216d6e90fcb15dd0c72da24c5d58e16b64f
 2016-05-18 21:01:41 +00:00
Christopher Tate
a9b4f3f628 API feedback: rename JobInfo methods for clarity 
Bug 28773330

Change-Id: I081fa225380a1966010d41020200fb3b9549a195
 2016-05-18 13:59:16 -07:00
Chong Zhang
ff8ceadfc8 Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev 2016-05-18 20:57:30 +00:00
Amith Yamasani
dbf0dbd8c2 Merge "Retail mode flag and some clients for it" into nyc-mr1-dev 2016-05-18 20:57:12 +00:00
Chenjie Luo
9140b8f02e Merge "Add null pointer check in removeConnection am: e370b538eb am: 58642e6545 am: 7e745ec49c am: dd0e3efd4d" into nyc-mr1-dev-plus-aosp 
am: e01e336efc

* commit 'e01e336efcd7d254e8441831981e9ecd20042e2a':

Change-Id: I22ae08c295df61bd29b0e43b8376a093dbf5b0b4
 2016-05-18 20:50:49 +00:00
Chenjie Luo
c7ce941db4 Add null pointer check in removeConnection am: e370b538eb am: 58642e6545 am: 7e745ec49c am: 8462d63c23 
am: 9aea3f1b94

* commit '9aea3f1b94720280d85c9d082e1fe76f51d69b9e':
  Add null pointer check in removeConnection

Change-Id: I3a8c620c5b7c2adb49f7e26cd744c2b917d82f11
 2016-05-18 20:50:44 +00:00
Android Build Merger (Role)
e01e336efc Merge "Add null pointer check in removeConnection am: e370b538eb am: 58642e6545 am: 7e745ec49c am: dd0e3efd4d" into nyc-mr1-dev-plus-aosp 2016-05-18 20:47:46 +00:00
Chenjie Luo
42690b746d Add null pointer check in removeConnection am: e370b538eb am: 58642e6545 am: 7e745ec49c 
am: dd0e3efd4d

* commit 'dd0e3efd4d70f36e0649abe6087a06a1fb0366b0':
  Add null pointer check in removeConnection

Change-Id: Icb2fb87eeeab4de28a1e117a8f74867f7c0002ac
 2016-05-18 20:47:22 +00:00
Chenjie Luo
9aea3f1b94 Add null pointer check in removeConnection am: e370b538eb am: 58642e6545 am: 7e745ec49c 
am: 8462d63c23

* commit '8462d63c238117bd6f9dea3c073b5996564621b1':
  Add null pointer check in removeConnection

Change-Id: I820fe9de2186784261b7c8dd838fa1ebcf1bab6a
 2016-05-18 20:46:16 +00:00
Chenjie Luo
dd0e3efd4d Add null pointer check in removeConnection am: e370b538eb am: 58642e6545 
am: 7e745ec49c

* commit '7e745ec49c0458f92af65bf370770417dcc7075d':
  Add null pointer check in removeConnection

Change-Id: I7f0fef6f29dc1667993425510014308f030a457f
 2016-05-18 20:41:27 +00:00