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

293677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrii Kulian
618b3cb6fa Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev 
am: 6e4f6ecbab

Change-Id: I56995f1b7239f4b3bb1a81c46891af04016561f0
 2016-10-19 19:16:52 +00:00
Andrii Kulian
39be2e91ca DO NOT MERGE -- Use focused activity value when moving task back 
am: da3b648b64

Change-Id: Ib706755c056ed27050375a675169f7df3f5f141a
 2016-10-19 19:16:50 +00:00
Treehugger Robot
239df3cc5a Merge "Use this.isUp() inside InterfaceConfiguration" 2016-10-19 19:15:31 +00:00
TreeHugger Robot
f529013abc Merge "Fixed monkey test failure" 2016-10-19 19:09:04 +00:00
TreeHugger Robot
5f4169b5ea Merge "Skip getting transforms for ignored tasks." into nyc-mr1-dev 2016-10-19 18:45:26 +00:00
Dan Yu
e80d16b525 Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am: dc69de5ac6 am: 3aa0ff2de7 am: 8233c03d1e am: 0346fee93c am: a2ffd6e04c 
am: 87a867e86d

Change-Id: Ie4a6d815105315d2df5250ae6fd1dbde4ddec0a6
 2016-10-19 18:36:08 +00:00
Andrii Kulian
6e4f6ecbab Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev 2016-10-19 18:31:37 +00:00
Sudheer Shanka
cc6418feb7 Move ApplicationThread to aidl. 
Bug: 30977067
Test: Existing tests are passing, dump commands still working.
Change-Id: Iecb382e8720dfb1b6b707272497e3793e6995edb
 2016-10-19 11:29:47 -07:00
Daniel Yu
10fd65485b docs: Updating TIF docs for new TIF Companion library. am: e0810402fb am: f8a8260c0d am: 9ce21dc769 am: f45beedf6c am: 3d74d9933c 
am: ab9e34f9cd

Change-Id: Ia531f675fa35e876d73099e1bec98d89098b6d1c
 2016-10-19 18:29:42 +00:00
Yang Ni
5c8d1c5af5 Merge "Updated API reference doc for Single-Source RS" into nyc-dev am: 6aee6e9ca8 am: 4a9883cdf8 am: 02addb0b41 am: c7c49fbe14 
am: ecb31ed2c8

Change-Id: I12353dd8af768dfc91dd896aa50412c1416a4546
 2016-10-19 18:28:29 +00:00
Dan Yu
87a867e86d Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am: dc69de5ac6 am: 3aa0ff2de7 am: 8233c03d1e am: 0346fee93c 
am: a2ffd6e04c

Change-Id: Ida63ff86031842a5ebe7eec32ba183cdd1f42496
 2016-10-19 18:27:36 +00:00
Yang Ni
3ac237f663 Updated API reference doc for Single-Source RS am: 51f1e93be7 am: 246b0bcc9a am: 93f0442cbd am: 29ce2a91c9 
am: 8baaab047a

Change-Id: I5a8a0cbd3c86914a09ced7015978818382060332
 2016-10-19 18:27:25 +00:00
Daniel Yu
ab9e34f9cd docs: Updating TIF docs for new TIF Companion library. am: e0810402fb am: f8a8260c0d am: 9ce21dc769 am: f45beedf6c 
am: 3d74d9933c

Change-Id: I199d261d2dfa7d2b92f0dbe6fe7cbc2cbd8c3d64
 2016-10-19 18:15:17 +00:00
Yang Ni
ecb31ed2c8 Merge "Updated API reference doc for Single-Source RS" into nyc-dev am: 6aee6e9ca8 am: 4a9883cdf8 am: 02addb0b41 
am: c7c49fbe14

Change-Id: I7a07aa97830cf198f62c13f5d6fbd78b2ef210b8
 2016-10-19 18:14:07 +00:00
Yang Ni
8baaab047a Updated API reference doc for Single-Source RS am: 51f1e93be7 am: 246b0bcc9a am: 93f0442cbd 
am: 29ce2a91c9

Change-Id: If8d347e881d7260e9a762c9f588ad535c05ee8dd
 2016-10-19 18:13:01 +00:00
Dan Yu
a2ffd6e04c Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am: dc69de5ac6 am: 3aa0ff2de7 am: 8233c03d1e 
am: 0346fee93c

Change-Id: I1997e8e14e5d0ddfbf60ea08797b57d107393411
 2016-10-19 18:12:16 +00:00
Dan Yu
0346fee93c Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am: dc69de5ac6 am: 3aa0ff2de7 
am: 8233c03d1e

Change-Id: If0291ee0b6df1c0fb81785b490cdf716ba9cc8b7
 2016-10-19 18:05:37 +00:00
Daniel Yu
3d74d9933c docs: Updating TIF docs for new TIF Companion library. am: e0810402fb am: f8a8260c0d am: 9ce21dc769 
am: f45beedf6c

Change-Id: I2895221a6675da5909d4dbb1186321018189e10d
 2016-10-19 18:05:18 +00:00
Yang Ni
c7c49fbe14 Merge "Updated API reference doc for Single-Source RS" into nyc-dev am: 6aee6e9ca8 am: 4a9883cdf8 
am: 02addb0b41

Change-Id: I7f934cb65171862b1ef5f0e1c41c5c1916b99529
 2016-10-19 17:59:16 +00:00
Andrew Solovay
8209bada30 Merge "docs: Updating the samples "what's new" for API 7.1" into nyc-mr1-dev am: 439d71837e am: f31f36c305 
am: 6f31fb8483

Change-Id: I5938b3713bf8182a43f918ad250440fdda7424e1
 2016-10-19 17:59:13 +00:00
Andrew Solovay
3cd41abd3d docs: Updating the samples "what's new" for API 7.1 am: c86db22b2f am: 630b6320eb 
am: b1d1b8f02c

Change-Id: Ida776d9ba66b95a79dd5a96e552713103a70badb
 2016-10-19 17:58:17 +00:00
Yang Ni
29ce2a91c9 Updated API reference doc for Single-Source RS am: 51f1e93be7 am: 246b0bcc9a 
am: 93f0442cbd

Change-Id: I9d26975a2ce8c0c9efa187cb1c90207f73b3c42a
 2016-10-19 17:58:16 +00:00
Daniel Yu
f45beedf6c docs: Updating TIF docs for new TIF Companion library. am: e0810402fb am: f8a8260c0d 
am: 9ce21dc769

Change-Id: I1066a9122bab7f3fe620bd23f17adc36559133a4
 2016-10-19 17:57:11 +00:00
Felipe Leme
b44a1578bd Adds user id when dumping a task. 
Test: manual verification
Bug: 31001899
Change-Id: Ifa2f2719e9d02c48ab913dd8b359c0b63039134f
 2016-10-19 10:57:00 -07:00
Yang Ni
02addb0b41 Merge "Updated API reference doc for Single-Source RS" into nyc-dev am: 6aee6e9ca8 
am: 4a9883cdf8

Change-Id: I1a4378d4ec4c5b2e720d81d90d72c5b7fedce261
 2016-10-19 17:52:39 +00:00
Dan Yu
8233c03d1e Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am: dc69de5ac6 
am: 3aa0ff2de7

Change-Id: If9e2b5d23f40a5d48906b81f818a2e9b5e8bb24a
 2016-10-19 17:52:35 +00:00
Daniel Yu
9ce21dc769 docs: Updating TIF docs for new TIF Companion library. am: e0810402fb 
am: f8a8260c0d

Change-Id: Ida18c6b46ccff01cb6299b1774fbcc724f54712a
 2016-10-19 17:51:36 +00:00
Yang Ni
93f0442cbd Updated API reference doc for Single-Source RS am: 51f1e93be7 
am: 246b0bcc9a

Change-Id: I572709a23a33f0a17ad754221c27a042f9c44f2e
 2016-10-19 17:51:32 +00:00
Andrew Solovay
6f31fb8483 Merge "docs: Updating the samples "what's new" for API 7.1" into nyc-mr1-dev am: 439d71837e 
am: f31f36c305

Change-Id: I0735ce31db3435e47e0610955ff345968f877932
 2016-10-19 17:47:40 +00:00
Mahaver Chopra
ae0abdd8bf Merge changes from topic 'provisioning-entry-point' 
* changes:
  Analytics for provisioning entry point: ADB
  Metrics constants for provisioning entry points
 2016-10-19 17:46:49 +00:00
Andrew Solovay
b1d1b8f02c docs: Updating the samples "what's new" for API 7.1 am: c86db22b2f 
am: 630b6320eb

Change-Id: I124e27242de6de31e6d7d33b4fc93dcb12804caf
 2016-10-19 17:46:35 +00:00
Paulo Casanova
6bfdc27287 Merge "Added JNI interface for aapt2." 2016-10-19 17:45:04 +00:00
Dan Yu
3aa0ff2de7 Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs 
am: dc69de5ac6

Change-Id: I3f49c5fbd2dc9f298cdf0cdd8acc5f49188319d4
 2016-10-19 17:44:48 +00:00
Daniel Yu
f8a8260c0d docs: Updating TIF docs for new TIF Companion library. 
am: e0810402fb

Change-Id: Ic44c96963d1dd172f07f6564a084ca731bf49762
 2016-10-19 17:44:46 +00:00
Yang Ni
4a9883cdf8 Merge "Updated API reference doc for Single-Source RS" into nyc-dev 
am: 6aee6e9ca8

Change-Id: I86ae7b92e3c6bb2202375a990f0203630afa5744
 2016-10-19 17:37:43 +00:00
Yang Ni
246b0bcc9a Updated API reference doc for Single-Source RS 
am: 51f1e93be7

Change-Id: Ie8c820ea2d55b16f66afd53034b69d4c770d17e0
 2016-10-19 17:37:39 +00:00
Andrew Solovay
f31f36c305 Merge "docs: Updating the samples "what's new" for API 7.1" into nyc-mr1-dev 
am: 439d71837e

Change-Id: I33ca9cc9e7176df2916c70619c007260d035afdf
 2016-10-19 17:36:48 +00:00
Andrew Solovay
630b6320eb docs: Updating the samples "what's new" for API 7.1 
am: c86db22b2f

Change-Id: Ic7feef22e3337445f8dccfcb237783a40dd59099
 2016-10-19 17:36:46 +00:00
Dan Yu
dc69de5ac6 Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs 2016-10-19 17:30:46 +00:00
Yang Ni
6aee6e9ca8 Merge "Updated API reference doc for Single-Source RS" into nyc-dev 2016-10-19 17:26:00 +00:00
Andrew Solovay
439d71837e Merge "docs: Updating the samples "what's new" for API 7.1" into nyc-mr1-dev 2016-10-19 17:06:47 +00:00
Marie Janssen
733f0bc08e Bluetooth: More logging of bluetooth service state am: 9fa2491850 am: d8e027b5a4 
am: 849174f228

Change-Id: I3049a597bf3182b68167973ab897749833a0dc9d
 2016-10-19 16:56:49 +00:00
Winson
448c0adb78 Skip getting transforms for ignored tasks. 
- If the stack does not contain the existing ignored task view on
  relayout, then we should not try and get the transform for it
  since it will be skipped.

Bug: 32001762
Change-Id: I23182c76ac41b036c25edf92374622191e9d4ce3
 2016-10-19 09:53:59 -07:00
Wale Ogunwale
cfca258639 Fixed monkey test failure 
Avoid duplicate attempt to remove WindowToken from its parent
container when removeImmediately is called by first removing the
token from the display before calling super.removeImmediately
which only tries to remove the child from the parent container
if it is still attached to the parent.

Also, added test for the failure case the monkey test was
triggering.

Bug: 32239922
Test: WindowTokenTests.testChildRemoval passes
Change-Id: I4153669d18260d956c4b570944d2f48516d692ac
 2016-10-19 09:53:25 -07:00
Marie Janssen
849174f228 Bluetooth: More logging of bluetooth service state am: 9fa2491850 
am: d8e027b5a4

Change-Id: Ifaa9bad48234a6035b49a6a05484d91df31c5727
 2016-10-19 16:49:23 +00:00
Marie Janssen
d8e027b5a4 Bluetooth: More logging of bluetooth service state 
am: 9fa2491850

Change-Id: Idd26922caf3c1a0fb77d2091ac86bfe3a1d1c62a
 2016-10-19 16:43:09 +00:00
TreeHugger Robot
4b6e0d7b6e Merge "Have DisplayContent be the call point for assigning window layers" 2016-10-19 16:30:55 +00:00
Marie Janssen
9fa2491850 Bluetooth: More logging of bluetooth service state 
Bug: 32140251
Bug: 32140271
Bug: 32060415

Change-Id: I50faa184551748023ea5a573646a75293f553d16
 2016-10-19 16:28:31 +00:00
Jason Monk
b4d876a5d6 Merge "Hide QS customizer correctly" am: 03e4eb32fe am: fb56958223 
am: 9dce7cdf13

Change-Id: I884b10c5a187bfd4299b9ff5b6ed1aa6917c3e71
 2016-10-19 15:31:44 +00:00
Jason Monk
9dce7cdf13 Merge "Hide QS customizer correctly" am: 03e4eb32fe 
am: fb56958223

Change-Id: I62095e8b8c5bea7627e59cf166abce1cfa4ce2f1
 2016-10-19 15:23:40 +00:00