Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
235,150 Commits 3 Branches 0 Tags
df72e80b03768e94de0d46baea98e6eebd3d4e8d
Commit Graph

235150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
73d96fb4bb Merge "Remove Notification Topics." into nyc-dev 2016-02-19 19:17:25 +00:00
Siyamed Sinir
c7ff969b47 JavaDoc for ReplacementSpan getSize & draw functions. 
Added JavaDoc for ReplacementSpan’s getSize and draw functions.

Bug: 20616288
Change-Id: I033ae82b5de672c508d8cbcd69e942c236b2e674
 2016-02-19 11:15:09 -08:00
Jason Monk
9e4f241ba4 Merge changes Ie427a2d8,I213f1f76 into nyc-dev am: ea168d229d 
am: 0aecf08207

* commit '0aecf08207267bcbf36af9c8f4dd8daad0f14283':
  SysUI Tuner: UI cleanup and grouping
  SysUI Tuner: Night mode v3
 2016-02-19 19:05:18 +00:00
Jason Monk
0aecf08207 Merge changes Ie427a2d8,I213f1f76 into nyc-dev 
am: ea168d229d

* commit 'ea168d229d316c84652e88ad0f19adbaa884d731':
  SysUI Tuner: UI cleanup and grouping
  SysUI Tuner: Night mode v3
 2016-02-19 18:59:47 +00:00
Lajos Molnar
a8be884d0b Merge "media: expose audio sample format in MediaFormat" into nyc-dev am: 0ab076c5c9 
am: 4474a5cd4b

* commit '4474a5cd4b6b55e14048515be5a04ba438f60e90':
  media: expose audio sample format in MediaFormat
 2016-02-19 18:56:54 +00:00
Glen Kuhne
b6cd6fa5a7 Add EID_TIM to ScanResult.InformationElement 
Added EID_TIM to enable parsing of TrafficIndicationMap
InformationElements.

BUG=25691077
Change-Id: I99450f0b720175660486da15d6b13affbdb61adc
 2016-02-19 10:54:51 -08:00
Lajos Molnar
4474a5cd4b Merge "media: expose audio sample format in MediaFormat" into nyc-dev 
am: 0ab076c5c9

* commit '0ab076c5c9d8895ae1a77132e167dc70341a4084':
  media: expose audio sample format in MediaFormat
 2016-02-19 18:52:41 +00:00
Mady Mellor
f062580d39 Improve touch target for the gear beneath a notification 
This CL increases the touch target size of the gear beneath
a notification.

It also adds the logic:
- If the gear is displayed and the notification is touched
then the notification slides back over the gear
- If the grey background is touched rather than the gear
  nothing happens

Bug: 22451710
Change-Id: I7c1d8943e066fdd821446c2f90807891d6b74e5c
 2016-02-19 10:52:06 -08:00
Jason Monk
ea168d229d Merge changes Ie427a2d8,I213f1f76 into nyc-dev 
* changes:
  SysUI Tuner: UI cleanup and grouping
  SysUI Tuner: Night mode v3
 2016-02-19 18:50:05 +00:00
Lajos Molnar
0ab076c5c9 Merge "media: expose audio sample format in MediaFormat" into nyc-dev 2016-02-19 18:47:06 +00:00
Mitchell Wills
1705955ed3 Merge "Fix FastXmlSerializerTest" into mm-wireless-dev am: 3ca1ccb419 am: 8e2602ea26 
am: f60381283f

* commit 'f60381283fdd29b0cec9bb8fc553b55a9a30053d':
  Fix FastXmlSerializerTest
 2016-02-19 18:44:02 +00:00
Mitchell Wills
773a42fc03 Merge "Remove AsyncChannelTest because it does not test anything" into mm-wireless-dev am: acd97e2e0f am: e8bab3cd37 
am: 76183eed8c

* commit '76183eed8ce88bd0949225e5f0840497a720e575':
  Remove AsyncChannelTest because it does not test anything
 2016-02-19 18:42:52 +00:00
John Reck
6cc3a25db5 Temporarily enable fine-grained error checking 
Bug: 27186019

Quick testing shows negligable performance impact, so turn
this on temporarily to track down some GL errors

Change-Id: I5700075d5640af0951d832acfde3179ec7511912
 2016-02-19 10:39:17 -08:00
Mitchell Wills
f60381283f Merge "Fix FastXmlSerializerTest" into mm-wireless-dev am: 3ca1ccb419 
am: 8e2602ea26

* commit '8e2602ea26fe8eeec36a994f84d9f8ed03ef9090':
  Fix FastXmlSerializerTest
 2016-02-19 18:37:17 +00:00
Mitchell Wills
f59499bb3b Merge "DO NOT MERGE Disable failing test case" into mm-wireless-dev am: 9272fd8f4c -s ours am: 9a5c5fba25 
am: 502d431a45  -s ours

* commit '502d431a45f3ba283fcd24600931351c365c5bbd':
  DO NOT MERGE Disable failing test case
 2016-02-19 18:33:12 +00:00
Sudheer Shanka
99a703e2a0 Merge "Update string used as summary when an option is disabled by policy." into nyc-dev am: 82f927bd28 
am: 297b2164a7

* commit '297b2164a7e23badb802fe5a449e0b0c80a7399f':
  Update string used as summary when an option is disabled by policy.
 2016-02-19 18:31:30 +00:00
Mitchell Wills
76183eed8c Merge "Remove AsyncChannelTest because it does not test anything" into mm-wireless-dev am: acd97e2e0f 
am: e8bab3cd37

* commit 'e8bab3cd379114956a1f395224787db6f1d72ad6':
  Remove AsyncChannelTest because it does not test anything
 2016-02-19 18:30:29 +00:00
Mitchell Wills
502d431a45 Merge "DO NOT MERGE Disable failing test case" into mm-wireless-dev am: 9272fd8f4c -s ours 
am: 9a5c5fba25

* commit '9a5c5fba258a704a87b6358bbb221c19c287e965':
  DO NOT MERGE Disable failing test case
 2016-02-19 18:27:00 +00:00
Sudheer Shanka
297b2164a7 Merge "Update string used as summary when an option is disabled by policy." into nyc-dev 
am: 82f927bd28

* commit '82f927bd28a1c57bce663771ccef77a7d515c9f7':
  Update string used as summary when an option is disabled by policy.
 2016-02-19 18:25:57 +00:00
Mitchell Wills
8e2602ea26 Merge "Fix FastXmlSerializerTest" into mm-wireless-dev 
am: 3ca1ccb419

* commit '3ca1ccb419ec56a191d724ff75c6943200c8cebe':
  Fix FastXmlSerializerTest
 2016-02-19 18:22:51 +00:00
Mitchell Wills
e8bab3cd37 Merge "Remove AsyncChannelTest because it does not test anything" into mm-wireless-dev 
am: acd97e2e0f

* commit 'acd97e2e0fdcc50f20bc4836188e781583b10f1e':
  Remove AsyncChannelTest because it does not test anything
 2016-02-19 18:19:27 +00:00
Mitchell Wills
9a5c5fba25 Merge "DO NOT MERGE Disable failing test case" into mm-wireless-dev 
am: 9272fd8f4c  -s ours

* commit '9272fd8f4c74384927ad6502c57153bf188a66ea':
  DO NOT MERGE Disable failing test case
 2016-02-19 18:18:14 +00:00
Diego Perez
3c4996454b Merge "Fix Canvas memory leak" into mnc-ub-dev am: bad0e07ee9 am: 1d3c41e563 
am: ef4329a062

* commit 'ef4329a062b49f5be3ae4bc2b4a48cae04bbcaa6':
  Fix Canvas memory leak
 2016-02-19 18:18:05 +00:00
Sudheer Shanka
82f927bd28 Merge "Update string used as summary when an option is disabled by policy." into nyc-dev 2016-02-19 18:15:33 +00:00
Mitchell Wills
3ca1ccb419 Merge "Fix FastXmlSerializerTest" into mm-wireless-dev 2016-02-19 18:13:58 +00:00
Diego Perez
ef4329a062 Merge "Fix Canvas memory leak" into mnc-ub-dev am: bad0e07ee9 
am: 1d3c41e563

* commit '1d3c41e563c30d85d5524df598f4bd6e6a226362':
  Fix Canvas memory leak
 2016-02-19 18:13:05 +00:00
Mitchell Wills
acd97e2e0f Merge "Remove AsyncChannelTest because it does not test anything" into mm-wireless-dev 2016-02-19 18:11:20 +00:00
Mitchell Wills
9272fd8f4c Merge "DO NOT MERGE Disable failing test case" into mm-wireless-dev 2016-02-19 18:10:54 +00:00
Diego Perez
1d3c41e563 Merge "Fix Canvas memory leak" into mnc-ub-dev 
am: bad0e07ee9

* commit 'bad0e07ee9163d6b0f0bf73ad591ff6e453199ef':
  Fix Canvas memory leak
 2016-02-19 18:08:00 +00:00
Mady Mellor
4b80b1025f Initial implementation of dismiss gesture + inline settings icon 
- Added a view to display / control the gear behind the noti
- Updated SwipeHelper to hide / show the gear based on the gesture
- Only one notification or notification group can show the gear
  at a time

Couple of things left to do that will come in a follow up CL:
- Animation (to / from inline controls, fading gear based on movement)
- For children in a group there needs to be a grey background

Bug: 22451710
Change-Id: I2f93edf48109a82bab0839c73cbaba1535caee9a
 2016-02-19 10:04:27 -08:00
Diego Perez
bad0e07ee9 Merge "Fix Canvas memory leak" into mnc-ub-dev 2016-02-19 17:58:17 +00:00
Diego Perez
e82bd72b6e Fix Canvas memory leak 
Every RenderSession would call the AttachInfo.setAttachInfo but wouldn't
issue a View.dispatchDetachedFromWindow.
This caused some Canvas to be slowly leaked in the DelegateManager in
every session.

Change-Id: I0322767e5fffc6053ce1be852dd8ca904dfaa137
 2016-02-19 17:57:36 +00:00
Neil Fuller
a3c33d24f1 Fix a bad merge am: 6b6d8426fe 
am: 83b0566c4e

* commit '83b0566c4ef3ce3bf298b6c3b9df71f0c8a3c97d':
  Fix a bad merge
 2016-02-19 17:39:07 +00:00
Neil Fuller
83b0566c4e Fix a bad merge 
am: 6b6d8426fe

* commit '6b6d8426fe16191b8ef9187c27e7b2f7540a4197':
  Fix a bad merge
 2016-02-19 17:34:33 +00:00
Polina Bondarenko
f8754ac212 Added hardwareproperties SystemService 
Add HardwarePropertiesManagerService which call native methods to
get CPU, GPU, battery temperatures, CPU usage info, fan speeds.
Restrict hardware properties retrieval only for device and profile
owners.

Bug: 26945055
Change-Id: I4d6b30b78e575532d5e9cfa59ef6cd81355439d4
 2016-02-19 18:24:29 +01:00
Svetoslav Ganov
8cc04de85f Merge "Don\'t hold a lock while reading shared preferences from disk." into nyc-dev am: 5350306989 
am: d24ac9abd6

* commit 'd24ac9abd617c5c1753dd1f8c662e42c4207e94e':
  Don't hold a lock while reading shared preferences from disk.
 2016-02-19 17:21:58 +00:00
Svetoslav Ganov
d24ac9abd6 Merge "Don\'t hold a lock while reading shared preferences from disk." into nyc-dev 
am: 5350306989

* commit '53503069895918a59a305addaac84ea11937edcf':
  Don't hold a lock while reading shared preferences from disk.
 2016-02-19 17:17:48 +00:00
Svetoslav Ganov
5350306989 Merge "Don't hold a lock while reading shared preferences from disk." into nyc-dev 2016-02-19 17:12:40 +00:00
Svet Ganov
96db26032e Don't hold a lock while reading shared preferences from disk. 
Shared prefrences loads thir content from disk on a separate
thread to improve performance, however it holds the lock
the whole time  while reading from disk which as a result blocks
operations that don't rely on reading data from being performed
intil load completes, e.g. reguistering a prefernces change
listener does not depend on having the data loaded.

bug:5254577

Change-Id: I5ad67b285631c34d5aadac7138ba8bfaa728cf94
 2016-02-19 09:11:39 -08:00
Esteban Talavera
552a561b5c Updated removeActiveAdmin documentation 
Bug: 13176294
Change-Id: I0554c2c9a1f4aaa4283474ab7810678004985a2f
 2016-02-19 17:02:24 +00:00
Neil Fuller
6b6d8426fe Fix a bad merge 
There was a bad interaction between
commits 6777f54fa4
and 23e47f5621.

Change-Id: Ic408f8b4859d83d89c612748ee6e772b57830d96
 2016-02-19 16:50:14 +00:00
Yohei Yukawa
6971feb595 Merge "Reset IMMS when the device is unlocked." into nyc-dev am: 9f1ab4fcc7 
am: 8470e6c258

* commit '8470e6c258313ec4f47c40fe20e04246e399200a':
  Reset IMMS when the device is unlocked.
 2016-02-19 16:12:30 +00:00
Yohei Yukawa
8470e6c258 Merge "Reset IMMS when the device is unlocked." into nyc-dev 
am: 9f1ab4fcc7

* commit '9f1ab4fcc777f97c21c9a6ecf85a7b421ce83ccf':
  Reset IMMS when the device is unlocked.
 2016-02-19 16:08:22 +00:00
Yohei Yukawa
9f1ab4fcc7 Merge "Reset IMMS when the device is unlocked." into nyc-dev 2016-02-19 16:04:59 +00:00
Shreyas Basarge
cf939c1409 Revert "Add defaultPeriodic to every authority" 
This reverts commit 6275d49007. The fix has been pushed to droidfood. It should be reverted now.

Change-Id: I656c1a49fe8b2db5dc427119ec3278c6bfdcd570
 2016-02-19 15:45:29 +00:00
Geoff Mendal
f91d0880d9 Merge "Import translations. DO NOT MERGE" into nyc-dev am: b0e07aa0d6 -s ours 
am: 62290450dd  -s ours

* commit '62290450dd2f55e2193742c6f7e5d162179ce0a9':
  Import translations. DO NOT MERGE
 2016-02-19 15:40:44 +00:00
Geoff Mendal
62290450dd Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: b0e07aa0d6  -s ours

* commit 'b0e07aa0d6f14abbfd4b3d9815e31b7862a8ec3a':
  Import translations. DO NOT MERGE
 2016-02-19 15:36:49 +00:00
Paul Stewart
a829f7cdcb Properly map EAP-GTC for TTLS am: 274042519d am: 173aa05908 
am: 3b35155868

* commit '3b351558686bbd809c28b6d46ed7198a19ad459b':
  Properly map EAP-GTC for TTLS
 2016-02-19 15:36:41 +00:00
Geoff Mendal
b0e07aa0d6 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-02-19 15:33:54 +00:00
Geoff Mendal
2b2332b47c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 27213136
Bug: 27262078
Change-Id: If76097a0645fbc162dd35af9d74e1ac42a21c9f5
 2016-02-19 15:33:26 +00:00