Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
249,237 Commits 3 Branches 0 Tags
24fdc177925e2664b9ee027d03fc4eb6eb2bcb68
Commit Graph

64947 Commits

Author SHA1 Message Date
Philip P. Moltmann
24fdc17792 Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev am: a1a1aa3 am: b8ccfaa4 
am: 7a1ae0b

* commit '7a1ae0bce2b86ee881ed0fe0bc25cdaa54922c16':
  Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory.

Change-Id: Iaefe74d98b308d9ed676b47dfcc96222ec476ab8
 2016-04-20 15:13:02 +00:00
Philip P. Moltmann
b8ccfaa4ff Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev 
am: a1a1aa3

* commit 'a1a1aa3c682215f0ac7251c43f77985b9aced2a2':
  Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory.

Change-Id: I6a177370c3fdcf0d81eedc3bc383f389f058b06a
 2016-04-20 15:06:47 +00:00
Philip P. Moltmann
a1a1aa3c68 Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev 2016-04-20 15:01:05 +00:00
Rubin Xu
7f55d526f1 Merge "Kill foreground apps when turning off work" into nyc-dev am: 49425d6 am: 48cef81 
am: 512ab59

* commit '512ab599fc903da21b67c0c4d01ce9ffb8e6d68f':
  Kill foreground apps when turning off work

Change-Id: I83e0e9792225416c6a0c9de4a8201dcb2e37666f
 2016-04-20 09:46:31 +00:00
Rubin Xu
48cef81f6e Merge "Kill foreground apps when turning off work" into nyc-dev 
am: 49425d6

* commit '49425d612cee3864a316e9ecb6ec3faeae519b1e':
  Kill foreground apps when turning off work

Change-Id: Ie8ea1ec98232437623c83f7d32c1f05c47580b35
 2016-04-20 09:40:38 +00:00
Rubin Xu
49425d612c Merge "Kill foreground apps when turning off work" into nyc-dev 2016-04-20 09:33:52 +00:00
Jakub Pawlowski
6a5cb51b5e Merge "OobData documentation" into nyc-dev am: 75760e6 am: a08c14d 
am: c97b0a7

* commit 'c97b0a734ddf093cbaf2e5fb7db2615c46d31dc5':
  OobData documentation

Change-Id: I0fa5e83a5a920d93fcc156e6ba308f9a05968db3
 2016-04-20 05:26:47 +00:00
Adam Lesinski
9369eb8802 Merge "Record in progress count when parceling Timer" into nyc-dev am: 752434a am: 7c7ee79 
am: 27d36bb

* commit '27d36bb9421c6a05990820919f90989a0d92323a':
  Record in progress count when parceling Timer

Change-Id: I364905f0be07562b83695fea09c0ca154e0171f6
 2016-04-20 05:26:21 +00:00
Jakub Pawlowski
c97b0a734d Merge "OobData documentation" into nyc-dev am: 75760e6 
am: a08c14d

* commit 'a08c14d05c47f1818dcb83c63143fcfb37044dd6':
  OobData documentation

Change-Id: I6a045e0fd21bf3293cc8a1cd474be231109db009
 2016-04-20 05:20:51 +00:00
Adam Lesinski
27d36bb942 Merge "Record in progress count when parceling Timer" into nyc-dev am: 752434a 
am: 7c7ee79

* commit '7c7ee79dc93ad12b2b5535e9727eef30ce1a3693':
  Record in progress count when parceling Timer

Change-Id: I7c4c92d2048df9bab52596bd3c9717fac9a056fb
 2016-04-20 05:20:26 +00:00
Jakub Pawlowski
68852d1776 Merge "OobData documentation" into nyc-dev 
am: 75760e6

* commit '75760e6b62e46fc9abcde523878459b08558f9d1':
  OobData documentation

Change-Id: Ief21f781808b84c5c2f63eade310b90209d1cd83
 2016-04-20 03:20:15 +00:00
Jakub Pawlowski
75760e6b62 Merge "OobData documentation" into nyc-dev 2016-04-20 03:15:23 +00:00
Adam Lesinski
50e1291340 Merge "Record in progress count when parceling Timer" into nyc-dev 
am: 752434a

* commit '752434a0ff54ac30b7701292b66361e64b2ae5a0':
  Record in progress count when parceling Timer

Change-Id: Icc7e8312df00bd22f0e5433e15fc65d2ad705db4
 2016-04-20 01:31:46 +00:00
Adam Lesinski
752434a0ff Merge "Record in progress count when parceling Timer" into nyc-dev 2016-04-20 01:22:37 +00:00
Adam Lesinski
98f0d4692c Record in progress count when parceling Timer 
The total time is computed before parceling, but the total count is not.

Bug:27747854
Change-Id: If3afdca9605f74d96a54fb9df17f6df761b99e55
 2016-04-19 17:21:40 -07:00
Jorim Jaggi
9b23400b05 Merge "Fixes for resize thread" into nyc-dev am: 13219992a0 am: 47606dc20f 
am: b3150d580e

* commit 'b3150d580e869fe85e3aec1b6417a9161acc7400':
  Fixes for resize thread

Change-Id: I6c9d9151edd94b18792875cd25f70f816053e326
 2016-04-20 00:18:57 +00:00
Jorim Jaggi
b3150d580e Merge "Fixes for resize thread" into nyc-dev am: 13219992a0 
am: 47606dc20f

* commit '47606dc20fb12e6fcf9c889d48b1b78b6790561e':
  Fixes for resize thread

Change-Id: I683fcd212936beb48808d016f8cf87a8c5635925
 2016-04-20 00:16:45 +00:00
Jorim Jaggi
4ed3f1dd1c Merge "Fixes for resize thread" into nyc-dev 
am: 13219992a0

* commit '13219992a0e8b08195ffd596d40d9ceecbf741e0':
  Fixes for resize thread

Change-Id: I2efa14b883a2d9ad31b6e2c4fd72a2b2258adf69
 2016-04-20 00:14:31 +00:00
Jorim Jaggi
13219992a0 Merge "Fixes for resize thread" into nyc-dev 2016-04-20 00:07:54 +00:00
Winson
4817184425 Merge changes Ie3125ec8,Ifa149322,Ifa2ed84a into nyc-dev am: b77d0bcc84 am: 174e1aceb0 
am: 23a6c4fcfd

* commit '23a6c4fcfdad199b0784e6ecdc62a149637f2080':
  Tweaking accessibility actions for dock divider.
  Ensure that the drag view is not dimmed.
  Disallowing scrim activity from setting TaskDescription.

Change-Id: I35f850b5bc04451938a97443878947485cb085a2
 2016-04-19 23:13:36 +00:00
Winson
174e1aceb0 Merge changes Ie3125ec8,Ifa149322,Ifa2ed84a into nyc-dev 
am: b77d0bcc84

* commit 'b77d0bcc840fbda8372c4042a1f2e83df8e12a83':
  Tweaking accessibility actions for dock divider.
  Ensure that the drag view is not dimmed.
  Disallowing scrim activity from setting TaskDescription.

Change-Id: I535255c12415caf02e30885fb4efc0efd04cdbc6
 2016-04-19 23:09:21 +00:00
Winson Chung
b77d0bcc84 Merge changes Ie3125ec8,Ifa149322,Ifa2ed84a into nyc-dev 
* changes:
  Tweaking accessibility actions for dock divider.
  Ensure that the drag view is not dimmed.
  Disallowing scrim activity from setting TaskDescription.
 2016-04-19 23:01:20 +00:00
Doris Liu
6e09efdb3f Merge "Merge "Fix pause/resume for AnimatorSet" into nyc-dev am: dd67b0d am: 86ac81b" into nyc-mr1-dev-plus-aosp 
am: 36b3ef5

* commit '36b3ef56ee20be40a4b1a66beac2f1cb15151ac3':
  Fix pause/resume for AnimatorSet

Change-Id: I42b7ce2033e82f81bbbd07b61f454f86d77514ae
 2016-04-19 22:39:30 +00:00
Robert Carr
d51e2981a2 Merge "Force windows to be scalable during pinned animation." into nyc-dev am: 4e9a9df am: 1b72363 
am: 465ff1f

* commit '465ff1f9e61953eb57ab2fe3ff3405abebc79628':
  Force windows to be scalable during pinned animation.

Change-Id: I49a8373aad59842e28847f36511e662c7087d4b3
 2016-04-19 22:28:20 +00:00
Adrian Roos
ef0895c2d9 Merge "Fix unprotected StatusBarManagerService calls" into nyc-dev am: 3dd5948 am: 30110b8 
am: 1ac1dce

* commit '1ac1dcec47e0c38fba2bba848e057508d93b403a':
  Fix unprotected StatusBarManagerService calls

Change-Id: Ice41ae607f3626ab1a068466e61e5088382817f3
 2016-04-19 22:28:04 +00:00
Doris Liu
86ac81b6ba Merge "Fix pause/resume for AnimatorSet" into nyc-dev 
am: dd67b0d

* commit 'dd67b0d52521bb828bc31732fe3ac8b786a19cce':
  Fix pause/resume for AnimatorSet

Change-Id: I235c869ce54fdf789898f8663a92fd22a4872600
 2016-04-19 22:24:27 +00:00
Robert Carr
1b72363846 Merge "Force windows to be scalable during pinned animation." into nyc-dev 
am: 4e9a9df

* commit '4e9a9dfb67ebc48028b1613a03144101d94f7d92':
  Force windows to be scalable during pinned animation.

Change-Id: I772d120442ed82c55c71fbf5ce841735d7a14cc5
 2016-04-19 22:17:16 +00:00
Adrian Roos
30110b80f7 Merge "Fix unprotected StatusBarManagerService calls" into nyc-dev 
am: 3dd5948

* commit '3dd59487cc5f01f38e1e5068ce9257a40473baba':
  Fix unprotected StatusBarManagerService calls

Change-Id: I3afc4a7c1ed8e1f73dcd4c4c0c00a3eb40ac3ce1
 2016-04-19 22:17:11 +00:00
Doris Liu
dd67b0d525 Merge "Fix pause/resume for AnimatorSet" into nyc-dev 2016-04-19 22:14:37 +00:00
Rob Carr
4e9a9dfb67 Merge "Force windows to be scalable during pinned animation." into nyc-dev 2016-04-19 22:11:02 +00:00
Adrian Roos
3dd59487cc Merge "Fix unprotected StatusBarManagerService calls" into nyc-dev 2016-04-19 22:05:44 +00:00
Kenny Guy
ed4ae966a4 Merge "Add test method to remove admins." into nyc-dev am: 3c5ceae am: 1ac021e 
am: 28a12ba

* commit '28a12ba5f6313d489d4b8e3c9dd6b3e06da6624e':
  Add test method to remove admins.

Change-Id: I32d81f5cb92a680f98446a8b735f6d2b0f501f64
 2016-04-19 22:00:40 +00:00
Amith Yamasani
28a12ba5f6 Merge "Add test method to remove admins." into nyc-dev am: 3c5ceae 
am: 1ac021e

* commit '1ac021e6245f7a9eb2aaf208bbb506541f6dd8ab':
  Add test method to remove admins.

Change-Id: I8f59c19521ea371cf9ef5a29c1dbfa3187a548ee
 2016-04-19 21:57:19 +00:00
Kenny Guy
75d4db49d9 Merge "Add test method to remove admins." into nyc-dev 
am: 3c5ceae

* commit '3c5ceae1d35de476644e4d5db5978149311e63e6':
  Add test method to remove admins.

Change-Id: Icff7bb03ca1c2bc987d46450a2dd2f49edcfb60b
 2016-04-19 21:53:23 +00:00
Amith Yamasani
3c5ceae1d3 Merge "Add test method to remove admins." into nyc-dev 2016-04-19 21:46:41 +00:00
Winson
ce9630da86 Tweaking accessibility actions for dock divider. 
- Adding tl_full/70%/50%/30%/rb_full

Bug: 27724715
Change-Id: Ie3125ec81e6463696cf56640c6b86f9cfcbda945
 2016-04-19 14:46:24 -07:00
Jorim Jaggi
0d6222d96d Fixes for resize thread 
- Make sure to draw navigation bar/status bar background before the
main render node. This is to avoid any flickering when entering
resizing mode, so you rather overdraw than underdraw.
- Draw the first frame from the main thread directly to increase
chance that all drawing commands are processing within a single
frame.

Bug: 27864358
Bug: 28003586
Change-Id: I033f57cdbcb2c16ea93134c041095a415d5c25b4
 2016-04-19 14:41:11 -07:00
Philip P. Moltmann
b87c08da82 Expose additional fields needed by PrintRecommendationService GTS test 
and move files into properly named directory.

Fixes: 28025769, 28214466
Change-Id: I14737515fc12525a1685a1a222f21913755ac988
 2016-04-19 14:31:04 -07:00
Chris Craik
50828c790a Merge "Document startService cost" into nyc-dev am: 6ed4e35 am: 82b735b 
am: 90f1a4c

* commit '90f1a4c60792898feaa9c5d52dfc1f59e61eee27':
  Document startService cost

Change-Id: I586cb1a40393dc2e4285492369d7117fda86ba7b
 2016-04-19 21:26:36 +00:00
Chris Craik
82b735bfb3 Merge "Document startService cost" into nyc-dev 
am: 6ed4e35

* commit '6ed4e35e49fb9d1e485f53b4ce309865d98a6058':
  Document startService cost

Change-Id: Iee9832e83570b01c98b72ce46a500b61b3184036
 2016-04-19 21:19:57 +00:00
Joe Onorato
0c8153a8ab Merge "Add the wall clock time to dumpsys cpuinfo so it\'s easier to correlate with the logs." into nyc-dev am: 6bf86d5 am: 9b7903e 
am: d7733ed

* commit 'd7733ed502220980ccb2a29e6cff65560d984607':
  Add the wall clock time to dumpsys cpuinfo so it's easier to correlate with the logs.

Change-Id: I95cd55cf1f00596cd17091fb93a61e3bbbeb2677
 2016-04-19 21:10:59 +00:00
Joe Onorato
a5d2056f25 Merge "Consolidate the HealthStats UI to only use milliseconds." into nyc-dev am: 4c4afed am: 6ee19e4 
am: 67288c5

* commit '67288c5b6f05e18e85dd9a520f273d311952276f':
  Consolidate the HealthStats UI to only use milliseconds.

Change-Id: I8ea14a4502f124daee32c0ef92130200431f04e7
 2016-04-19 21:10:42 +00:00
Chris Craik
6ed4e35e49 Merge "Document startService cost" into nyc-dev 2016-04-19 21:08:14 +00:00
Joe Onorato
d7733ed502 Merge "Add the wall clock time to dumpsys cpuinfo so it\'s easier to correlate with the logs." into nyc-dev am: 6bf86d5 
am: 9b7903e

* commit '9b7903e25ca86bf8e05e55b79de3f8f340ce720a':
  Add the wall clock time to dumpsys cpuinfo so it's easier to correlate with the logs.

Change-Id: I3e78c4a1a429e7f5c2a37fd5e26eaef0c44a1826
 2016-04-19 21:06:37 +00:00
Joe Onorato
67288c5b6f Merge "Consolidate the HealthStats UI to only use milliseconds." into nyc-dev am: 4c4afed 
am: 6ee19e4

* commit '6ee19e49346eea5d096933611586ab2b9d86e86d':
  Consolidate the HealthStats UI to only use milliseconds.

Change-Id: Idf18eb11cff73c174072b4ab831bc35b5cb467de
 2016-04-19 21:06:29 +00:00
Joe Onorato
1f3b7e1529 Merge "Add the wall clock time to dumpsys cpuinfo so it\'s easier to correlate with the logs." into nyc-dev 
am: 6bf86d5

* commit '6bf86d5e5ca73bceeb4f46771eabdc946ddc56e1':
  Add the wall clock time to dumpsys cpuinfo so it's easier to correlate with the logs.

Change-Id: Ib051ed05ac47a05312e82d9535cc6ac4f39a8058
 2016-04-19 21:01:07 +00:00
Joe Onorato
2d7e674608 Merge "Consolidate the HealthStats UI to only use milliseconds." into nyc-dev 
am: 4c4afed

* commit '4c4afedfc5134558c1f674c1fc8f41260e07bdeb':
  Consolidate the HealthStats UI to only use milliseconds.

Change-Id: I875b82483386bce75b35304970b6020d1da2ed5d
 2016-04-19 21:00:52 +00:00
Joe Onorato
6bf86d5e5c Merge "Add the wall clock time to dumpsys cpuinfo so it's easier to correlate with the logs." into nyc-dev 2016-04-19 20:49:43 +00:00
Joe Onorato
4c4afedfc5 Merge "Consolidate the HealthStats UI to only use milliseconds." into nyc-dev 2016-04-19 20:49:20 +00:00
Todd Kennedy
62347f17f3 Merge "Always perform has code check" into nyc-dev am: 069ed70 am: 64dc481 
am: a0906c8

* commit 'a0906c8d9e36ac79d1f802ec0cf6dd82aa39240c':
  Always perform has code check

Change-Id: I6e1afb2c727cf3944fb65d8b15f49de272bde362
 2016-04-19 20:01:00 +00:00