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
Chong Zhang
f1e2c252b0 Merge "Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev am: e55e4b7f73 am: d449dae513" into nyc-mr1-dev-plus-aosp 
am: e005e2a3b2

* commit 'e005e2a3b23277aec64f4c3dc0773303782d61b4':

Change-Id: I7d911b0f42eadfc4325e7480466c0bcbc5c1483e
 2016-05-25 23:22:11 +00:00
Philip P. Moltmann
5338bead7f Merge "Move add-printer list headers to the right positions." into nyc-dev 
am: 00e3c23265

* commit '00e3c232656e648376c94a78b568c3ca1fe8c123':
  Move add-printer list headers to the right positions.

Change-Id: I439ab5769e597994912d8bf5dcb6edcfa2a9b496
 2016-05-25 23:21:05 +00:00
Mady Mellor
6baed9e3a2 Parent notifications should always be normal notification color 
Notification groups would use the background color of their
children in some cases. This changes it so that parent
notifications always use the normal notification color.

Change-Id: I0638f94e044da2ba65a921f0c4a538941c001ca7
Fixes: 28613919
 2016-05-25 16:16:53 -07:00
Christopher Tate
24ceca96af DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 
am: 4c559cdade

* commit '4c559cdadea4b74262b40cbefe4a76a0e22ccc68':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: Iff8942e506b14cb2d0e64623daea3bdc3cee2142
 2016-05-25 23:16:15 +00:00
Christopher Tate
38a37f336f Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca 
am: c69aa838a8

* commit 'c69aa838a8f89ba7476ce554ecf5a19a6de78b28':
  Backport of backup transport whitelist

Change-Id: I0151279dfa467d6f456c2cfb4066cbc2ff4f7365
 2016-05-25 23:16:02 +00:00
Trevor Johns
05dd9d2c29 docs: Fix broken link in Volley training 
Inline link from from "Making a Standard Request" to "Implementing a
Custom Request" had a typo in the URL string.

Change-Id: I8f7d79e47ea82f423b9e56ef6d908938564a3fe9
 2016-05-25 16:13:21 -07:00
Chong Zhang
9fc0d01486 Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev am: e55e4b7f73 am: 5dfed87e37 
am: 2c7e700aad

* commit '2c7e700aade0282dc3eeb333b195a4a48f7ef9dc':
  Update dock stack create mode after rotation if dock side changed

Change-Id: I08ed26fdb872591270a024336e6fec841e9b576c
 2016-05-25 23:13:19 +00:00
Dianne Hackborn
47fb83a1e2 Fix issue #28964589: Binding dies when (unrelated) component is disabled in package 
We go through the same path for uninstalling and changing an app...
both of which would do a full force stop.  That is only appropriate
for uninstalling; for changing, we should just be killing its processes.

Change-Id: Ia87750d96d3e3eb7ee30841429eb926c20c5ad78
 2016-05-25 16:12:02 -07:00
Philip P. Moltmann
00e3c23265 Merge "Move add-printer list headers to the right positions." into nyc-dev 2016-05-25 23:10:26 +00:00
Android Build Merger (Role)
e005e2a3b2 Merge "Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev am: e55e4b7f73 am: d449dae513" into nyc-mr1-dev-plus-aosp 2016-05-25 23:08:16 +00:00
Chong Zhang
c08841428c Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev am: e55e4b7f73 
am: d449dae513

* commit 'd449dae513cef809160d31cd1cf68f2afdc4f3ed':
  Update dock stack create mode after rotation if dock side changed

Change-Id: I83de502fe74c6503beccd29c4ef0212e5b91ca26
 2016-05-25 23:07:46 +00:00
Chong Zhang
2c7e700aad Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev am: e55e4b7f73 
am: 5dfed87e37

* commit '5dfed87e37b640311ab38e259db5a9013daf4ed1':
  Update dock stack create mode after rotation if dock side changed

Change-Id: I7caf7e4d3397f08b0c3989b36bb7d88ab2fdaa84
 2016-05-25 23:07:43 +00:00
Miao Wang
b7157c815f Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." am: f1f13f98b5 am: 349e2f1558 am: 21f51e94b8 
am: c1ef374cd2

* commit 'c1ef374cd28d1593d029b92833f4a865b858ba53':
  [RenderScript] Fix ScriptIntrinsicBlur documentation.

Change-Id: I68c1fb380d4319c14fd7fa4415e48407cd5827d5
 2016-05-25 23:06:55 +00:00
Chris Tate
c69aa838a8 Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 
am: 600d4f61ca

* commit '600d4f61ca15b375c9acef64d52913f0ab823deb':
  Backport of backup transport whitelist

Change-Id: I308a0f0284990dc8e327c581cac49db899ad6cfa
 2016-05-25 23:06:54 +00:00
Miao Wang
ea73694966 Merge "Update documentation about copyTo and copyFrom." am: 4cd38c30e6 am: e31342e692 am: 1839237340 
am: e5932db9e9

* commit 'e5932db9e96c069282e7595b7683dd86e9d8e925':
  Update documentation about copyTo and copyFrom.

Change-Id: I7421176bb8e11d6fd2fbf89e18c06cf2ca64e037
 2016-05-25 23:06:49 +00:00
Christopher Tate
4c559cdade DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours 
am: 077534b101

* commit '077534b1015762d445f505fc2f440beaa2ba974a':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I04041486cfa35b534915a25cd1d84442a59ed7bf
 2016-05-25 23:06:02 +00:00
Miao Wang
c1ef374cd2 Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." am: f1f13f98b5 am: 349e2f1558 
am: 21f51e94b8

* commit '21f51e94b899aff529f46fc12dfb68c1dd6c04c8':
  [RenderScript] Fix ScriptIntrinsicBlur documentation.

Change-Id: I909a45104baec26501165e4df8be1135bb7f4f0b
 2016-05-25 23:00:43 +00:00
Miao Wang
e5932db9e9 Merge "Update documentation about copyTo and copyFrom." am: 4cd38c30e6 am: e31342e692 
am: 1839237340

* commit '18392373404a0f257018cc2600f771a39ffe60c8':
  Update documentation about copyTo and copyFrom.

Change-Id: Idd36fdafa620c2892b2414f4e7715dabf77cf0f6
 2016-05-25 23:00:39 +00:00
Bill Yi
0a0ceba3c7 Import translations. DO NOT MERGE 
Change-Id: I26ba43999026f73db18717776c9c475802d12a9d
Auto-generated-cl: translation import
 2016-05-25 16:00:02 -07:00
Chong Zhang
5dfed87e37 Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev 
am: e55e4b7f73

* commit 'e55e4b7f73be3b3babd28581a839d0b9700d555d':
  Update dock stack create mode after rotation if dock side changed

Change-Id: I1d795081651be6535603606de7a7728a98b42bf2
 2016-05-25 22:59:03 +00:00
Chong Zhang
d449dae513 Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev 
am: e55e4b7f73

* commit 'e55e4b7f73be3b3babd28581a839d0b9700d555d':
  Update dock stack create mode after rotation if dock side changed

Change-Id: I6e0b7bd1775c7968c36b0ec0d470be8bde363c73
 2016-05-25 22:57:07 +00:00
Stephan Linzner
ebdc157bc0 Un-deprecated Android mock testing APIs 
Some mock APIs don't have an ATSL equivalent yet
will be deprecated in O timeframe now.

Change-Id: Ibb7ec32fba3d16f0ea02d100f4e4fc8f011288f0
Bug: 28295815
 2016-05-25 22:54:27 +00:00
Bill Yi
3a97b5e245 Import translations. DO NOT MERGE 
Change-Id: I1565d077d00cddf65bcda9034194a020a1a61e7d
Auto-generated-cl: translation import
 2016-05-25 15:53:43 -07:00
Miao Wang
21f51e94b8 Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." am: f1f13f98b5 
am: 349e2f1558

* commit '349e2f15585136b323f68a5479051d9531605eb4':
  [RenderScript] Fix ScriptIntrinsicBlur documentation.

Change-Id: Icbc0bdb1f140aa528b1f06465a87db9c6934c592
 2016-05-25 22:50:08 +00:00
Miao Wang
1839237340 Merge "Update documentation about copyTo and copyFrom." am: 4cd38c30e6 
am: e31342e692

* commit 'e31342e692c3df7bc791a9320a233d2e9cec7c8a':
  Update documentation about copyTo and copyFrom.

Change-Id: Ifbfe89186dfbfa691bae798c5fadcfe6ed75a431
 2016-05-25 22:50:03 +00:00
Christopher Tate
600d4f61ca Merge "Backport of backup transport whitelist" into mnc-dev 
am: 2cfc6baa22

* commit '2cfc6baa2286a256585a7fb6295f9b66ff641726':
  Backport of backup transport whitelist

Change-Id: I73dff5d354cd5f26a7f2e68e16f8dd798d610fd3
 2016-05-25 22:45:49 +00:00
Christopher Tate
077534b101 DO NOT MERGE : backport of backup transport whitelist 
am: 647cb6a6d8  -s ours

* commit '647cb6a6d82e3bb22eca0e5a27810e99084e2d5b':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I08b62dc7639ecc874d4c61d737b2b4cca27da241
 2016-05-25 22:45:22 +00:00
Sid Soundararajan
3ce071c3e3 Merge "Alternate method for adding dismiss in talkback" into nyc-dev am: 436da616c8 am: 48a27be30f 
am: 7e4df27eb3

* commit '7e4df27eb3e5225e2703b0c21fe44aaa617b14eb':

Change-Id: I9ad25d8de7c010af6f6ac4cfab2385751162e6a0
 2016-05-25 22:43:56 +00:00
Antonio Cansado
8e0d26b20f Merge "Cleaning up NetworkStatsManager." into nyc-dev am: c45f0aea71 am: c37ba5cbc1 
am: e0ab0ccce3

* commit 'e0ab0ccce39de3b9ce65d62bfc6311238c6a3a01':

Change-Id: I9181055e652898024840694100b872ed966ed090
 2016-05-25 22:43:50 +00:00
Sid Soundararajan
af2cef35ef Merge "Alternate method for adding dismiss in talkback" into nyc-dev am: 436da616c8 am: 1c503aa1bd 
am: aa723942e0

* commit 'aa723942e03c45b46ea246f1e14003f6f9c70081':
  Alternate method for adding dismiss in talkback

Change-Id: I59c2628b24086bdcb54d8d0798c26ec734bd2297
 2016-05-25 22:43:41 +00:00
Antonio Cansado
4342f4419f Merge "Cleaning up NetworkStatsManager." into nyc-dev am: c45f0aea71 am: f49cbec84c 
am: cc1524eded

* commit 'cc1524edede07e2139cd072d6256fa96952f4004':
  Cleaning up NetworkStatsManager.

Change-Id: I3f669191e7c7739870dc098d5d6357d1d3ceb6dd
 2016-05-25 22:43:26 +00:00
Miao Wang
349e2f1558 Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." 
am: f1f13f98b5

* commit 'f1f13f98b58467b69c0ac9d4ba43d3f083525966':
  [RenderScript] Fix ScriptIntrinsicBlur documentation.

Change-Id: Ib2c03454a8fa19a279820a2809686646f54bdfc9
 2016-05-25 22:43:13 +00:00
Miao Wang
e31342e692 Merge "Update documentation about copyTo and copyFrom." 
am: 4cd38c30e6

* commit '4cd38c30e609c2ddb6ee3f8785750ff6a12c57d6':
  Update documentation about copyTo and copyFrom.

Change-Id: I9125dec95270b265fba34db5ed6e9df6deaed5c3
 2016-05-25 22:43:07 +00:00
Chong Zhang
e55e4b7f73 Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev 2016-05-25 22:42:56 +00:00
Sid Soundararajan
7e4df27eb3 Merge "Alternate method for adding dismiss in talkback" into nyc-dev am: 436da616c8 
am: 48a27be30f

* commit '48a27be30f7a47ffc88ca5ee806b24c3e01cf847':

Change-Id: Iae17611059d8e8612eeca6026762ef5b3b393060
 2016-05-25 22:37:40 +00:00
Antonio Cansado
e0ab0ccce3 Merge "Cleaning up NetworkStatsManager." into nyc-dev am: c45f0aea71 
am: c37ba5cbc1

* commit 'c37ba5cbc18ccb81e9378aff4d44437702318fe3':

Change-Id: I7d5641f96f6e1983544f962f91e2e2ffad9f9e8f
 2016-05-25 22:37:33 +00:00
Hemal Patel
ab0bd7d1ec Docs: Fixed the end-of-comment tag 
Bug: 28025365
Change-Id: I2d3963c8c0a909f7e0a4925636bc73a56816e0af
 2016-05-25 15:36:42 -07:00
Sid Soundararajan
aa723942e0 Merge "Alternate method for adding dismiss in talkback" into nyc-dev am: 436da616c8 
am: 1c503aa1bd

* commit '1c503aa1bd3e183741f48a5bb9ee40f2231205f2':
  Alternate method for adding dismiss in talkback

Change-Id: Ie93cdd047d8ec6808bcc38c18fa00362e902b4fe
 2016-05-25 22:34:24 +00:00
Antonio Cansado
cc1524eded Merge "Cleaning up NetworkStatsManager." into nyc-dev am: c45f0aea71 
am: f49cbec84c

* commit 'f49cbec84c1e2aa21b33d54ae97c54ed9c71bb32':
  Cleaning up NetworkStatsManager.

Change-Id: I0fd280e158eb3cfeb0b4f6066cc890439cffa02c
 2016-05-25 22:34:18 +00:00
Chris Tate
2cfc6baa22 Merge "Backport of backup transport whitelist" into mnc-dev 2016-05-25 22:30:58 +00:00
Miao Wang
f1f13f98b5 Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." 2016-05-25 22:28:35 +00:00
Sharvil Nanavati
6570340f71 Clean up Bluetooth test code. 
Change-Id: I502b03df842c628c7b504e2a32a17bce6d25b4f8
 2016-05-25 15:27:41 -07:00
Chong Zhang
73d4b44ce3 Update dock stack create mode after rotation if dock side changed 
On some devices (such as tablets) dock stack could be created on top,
but put to right after rotation. Dock create mode needs to be updated
in this case, otherwise when a new stack is attached to the display
(for example launch into now-cropped fullscreen stack),
attachDisplayContent() will use wrong dock mode to derive the bounds.

bug: 28942558
Change-Id: I83e66aeac94bd3f96c4b6a0a740acf76234bbe82
 2016-05-25 15:26:58 -07:00
Siyamed Sinir
942c938f52 Merge "Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev am: e747160509 am: 1a6f583c20" into nyc-mr1-dev-plus-aosp 
am: 4d0bc67a79

* commit '4d0bc67a794b1ca4bb83a953c3f1b8b1353873d2':

Change-Id: I8670a9885362119844de493cf4f8cb537f53a9ff
 2016-05-25 22:25:57 +00:00
Siyamed Sinir
4001c11816 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev am: e747160509 am: baf8284c62 
am: 1f4c99f7d8

* commit '1f4c99f7d88d7ccf1414c56fb38bbce08b8f30ea':
  Fix TextView layout reuse when maxLines is set

Change-Id: I52420052fbc85c346e861d66841d2b7aee4ac1ca
 2016-05-25 22:25:50 +00:00
Sid Soundararajan
48a27be30f Merge "Alternate method for adding dismiss in talkback" into nyc-dev 
am: 436da616c8

* commit '436da616c89cc860e71a858be8792fc068646d1e':
  Alternate method for adding dismiss in talkback

Change-Id: I8dbad668aa3accbe9d91dc634cbcbd5d1d4e820b
 2016-05-25 22:25:40 +00:00
Miao Wang
4cd38c30e6 Merge "Update documentation about copyTo and copyFrom." 2016-05-25 22:25:40 +00:00
Antonio Cansado
c37ba5cbc1 Merge "Cleaning up NetworkStatsManager." into nyc-dev 
am: c45f0aea71

* commit 'c45f0aea71944464b7636023f56a53fa635c09e2':
  Cleaning up NetworkStatsManager.

Change-Id: I236ffb5f753834931511d7df01333670de01604f
 2016-05-25 22:25:27 +00:00
Sid Soundararajan
1c503aa1bd Merge "Alternate method for adding dismiss in talkback" into nyc-dev 
am: 436da616c8

* commit '436da616c89cc860e71a858be8792fc068646d1e':
  Alternate method for adding dismiss in talkback

Change-Id: I1a12d842e2d95b5d3915231c495b8ae1d3ddeed5
 2016-05-25 22:25:18 +00:00
Antonio Cansado
f49cbec84c Merge "Cleaning up NetworkStatsManager." into nyc-dev 
am: c45f0aea71

* commit 'c45f0aea71944464b7636023f56a53fa635c09e2':
  Cleaning up NetworkStatsManager.

Change-Id: Id556eb00f5183a2f6905020f24f5d3f5f8d02795
 2016-05-25 22:25:11 +00:00