Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
212,405 Commits 3 Branches 0 Tags
571663bfd6bb0aeda6bf7689ce2ac80be4aca265
Commit Graph

212405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
571663bfd6 Merge "Throw exception when setting a fg/bg on TextureView" 2015-08-19 23:26:54 +00:00
Tyler Gunn
10397d377d am 393a93ab: am 7d4cf23f: am 9e191aa6: am a6562603: am 1e9bfc64: Fix incorrect android.telecom.Call.Details equality check. 
* commit '393a93abaf8eb14a6b7efebcd7665484558161f8':
  Fix incorrect android.telecom.Call.Details equality check.
 2015-08-19 23:13:40 +00:00
Chris Craik
2e931eae35 Throw exception when setting a fg/bg on TextureView 
Change-Id: Iead53e0947d941ebc1331f77fc478c475e24c812
 2015-08-19 16:13:04 -07:00
Chris Craik
f2dc936a90 Merge "Remove MathUtils::min/max" 2015-08-19 23:09:54 +00:00
Tyler Gunn
393a93abaf am 7d4cf23f: am 9e191aa6: am a6562603: am 1e9bfc64: Fix incorrect android.telecom.Call.Details equality check. 
* commit '7d4cf23f8a57b73055a5d9310df074dc149be577':
  Fix incorrect android.telecom.Call.Details equality check.
 2015-08-19 23:03:14 +00:00
Tyler Gunn
7d4cf23f8a am 9e191aa6: am a6562603: am 1e9bfc64: Fix incorrect android.telecom.Call.Details equality check. 
* commit '9e191aa634c1eb3b24ced704b7fc6c5e1e4ef9c0':
  Fix incorrect android.telecom.Call.Details equality check.
 2015-08-19 22:56:43 +00:00
Chris Craik
9db58c031f Remove MathUtils::min/max 
bug:22202895

Change-Id: Ia115d86871314e3819f684ea7307356aed13a28e
 2015-08-19 15:53:01 -07:00
Tyler Gunn
9e191aa634 am a6562603: am 1e9bfc64: Fix incorrect android.telecom.Call.Details equality check. 
* commit 'a65626031017517331fd402541b5e8f072c46a34':
  Fix incorrect android.telecom.Call.Details equality check.
 2015-08-19 22:41:14 +00:00
Vadim Tryshev
16ac7c3b1f Merge "Checking for unlauncheable apps." 2015-08-19 22:38:40 +00:00
Roozbeh Pournader
5afe8f2089 Merge "Add first implementation of LocaleList." 2015-08-19 22:38:24 +00:00
Chris Craik
e5e6f4837b Merge "Change setMatrix behavior to only affect canvas-local matrix" 2015-08-19 22:38:07 +00:00
Chris Craik
c725313a77 Merge "Remove Matrix4::load(Matrix4&)" 2015-08-19 22:38:03 +00:00
Roozbeh Pournader
0ba0d6bb18 Add first implementation of LocaleList. 
This is a first implementation, just to get the basics in, so we can
experiement with how the system would interact with locale lists.

Change-Id: I75d386f24f693c6c1bdefc9386a7142aec2de37c
 2015-08-19 15:31:08 -07:00
Tyler Gunn
a656260310 am 1e9bfc64: Fix incorrect android.telecom.Call.Details equality check. 
* commit '1e9bfc6461d3fe5455c9d7a21414ec66695b5798':
  Fix incorrect android.telecom.Call.Details equality check.
 2015-08-19 22:29:51 +00:00
Filip Gruszczynski
920d8eb505 Merge "Fix build." 2015-08-19 22:13:07 +00:00
Filip Gruszczynski
ad98eeb16c Fix build. 
Change-Id: I4be1b58cb5348ffe8b6dd5b1a2c612de737d0d91
 2015-08-19 15:12:11 -07:00
Chris Craik
7c85c54499 Remove Matrix4::load(Matrix4&) 
bug:22320446

Change-Id: Id6d1cc9b4aea828b0cdf622ad672064d72671f8d
 2015-08-19 15:10:25 -07:00
Vadim Tryshev
1bec0c472b Checking for unlauncheable apps. 
When loading apps from prefs, detecting apps that cannot
be launched (for example, were uninstalled) and not adding them
to the shelf.

Also watching for apps that become unlauncheable while the shelf
is shown, and removing them as it happens.

Bug: 22694757
Change-Id: Iab9494f0480e9bf4438b72a94041002be010334f
 2015-08-19 15:06:56 -07:00
Xiaohui Chen
f86676ad6d Change framework services tests' runner 
Change the test runner to android.support.test.runner.AndroidJUnitRunner
This newer runner support Mockito tests. See b/8138651
This should at least fix RankingHelperTest here.

Change-Id: I68e4f33939478e1ea59a3860d5ded1cd22a47989
 2015-08-19 21:32:36 +00:00
Lorenzo Colitti
e0938bed96 am a5bfd73a: am ab5e962e: am d7121f56: am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit 'a5bfd73ab683d3310ee3ce31d7ad3edb656aa858':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:23:03 +00:00
Adrian Roos
8b0b56df19 am df50c12a: am 6abed070: am 359f5944: am 06a86644: Merge "Fix wakelock leak for dozing" into mnc-dr-dev 
* commit 'df50c12af58e5fd2a201ce7f874eb0648c6dc002':
  Fix wakelock leak for dozing
 2015-08-19 21:22:56 +00:00
Filip Gruszczynski
6c8b36f767 Merge "Improve animating from recents to multi window state." 2015-08-19 21:21:03 +00:00
Lorenzo Colitti
a5bfd73ab6 am ab5e962e: am d7121f56: am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit 'ab5e962e1dd05799980342757edd8e83f4a76a8e':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:15:22 +00:00
Adrian Roos
df50c12af5 am 6abed070: am 359f5944: am 06a86644: Merge "Fix wakelock leak for dozing" into mnc-dr-dev 
* commit '6abed0706be80764c4cffe46fcb8e01ec8d9be95':
  Fix wakelock leak for dozing
 2015-08-19 21:15:16 +00:00
Lorenzo Colitti
ab5e962e1d am d7121f56: am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit 'd7121f565138c8ec31bcc7a5d1cef57dc21cf546':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:09:43 +00:00
Adrian Roos
6abed0706b am 359f5944: am 06a86644: Merge "Fix wakelock leak for dozing" into mnc-dr-dev 
* commit '359f59445d872086ca0c01919d8112c47e2af8fa':
  Fix wakelock leak for dozing
 2015-08-19 21:09:37 +00:00
Chien-Yu Chen
b6aa2fdb5d am 84551d61: am 6fdab993: am 86d86c2e: am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev 
* commit '84551d61fd4942aa4afb677ea3ae6ce7674c866c':
  Camera2: Handle surface size change
 2015-08-19 21:07:43 +00:00
Chien-Yu Chen
84551d61fd am 6fdab993: am 86d86c2e: am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev 
* commit '6fdab993919a1784676782ad1c67068a7f8a7fdc':
  Camera2: Handle surface size change
 2015-08-19 21:02:37 +00:00
Lorenzo Colitti
d7121f5651 am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit '0257c82fa122243e97e4a1f4ef4bc4b8c21bd692':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:01:33 +00:00
Adrian Roos
359f59445d am 06a86644: Merge "Fix wakelock leak for dozing" into mnc-dr-dev 
* commit '06a86644cca0621696afc38db02f2fe2010f120c':
  Fix wakelock leak for dozing
 2015-08-19 21:01:28 +00:00
Lorenzo Colitti
0257c82fa1 am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit '11e84bde9e98cb4b777a67208989d259883e9375':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 20:54:48 +00:00
Chien-Yu Chen
6fdab99391 am 86d86c2e: am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev 
* commit '86d86c2e7c08a99b226820a1a5e53876d9171086':
  Camera2: Handle surface size change
 2015-08-19 20:53:16 +00:00
Tyler Gunn
1e9bfc6461 Fix incorrect android.telecom.Call.Details equality check. 
The the android.telecom.Call.Details class provides its own equals
implementation.  Recently added in M is to also check if the mExtras
and mIntentExtras are different.  Unfortunately, Bundles do not implement
equals.  As a result when Telecom calls are parceled and sent to the
InCallServices, this means that the internalUpdate method will always
assume that the Details of a call have changed, even if they have not.
This was causing a LOT of extra calls to onUpdate in the InCall UI (2x the
amount).  Although there is still room for improvement in the number of
callbacks from Telecom, this fix prevents a pretty significant regression
on that front.

Bug: 23218195
Change-Id: I128e996faf60376ed3df1dc848a97c4a7b0482ee
 2015-08-19 20:52:13 +00:00
Adrian Roos
06a86644cc Merge "Fix wakelock leak for dozing" into mnc-dr-dev 2015-08-19 20:50:04 +00:00
Lorenzo Colitti
11e84bde9e Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into mnc-dev 2015-08-19 20:48:31 +00:00
Amith Yamasani
50b1bd2485 am a79f37c3: am 6e6fbc93: am 7102fb5f: am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev 
* commit 'a79f37c31fb0605465d1d6a1ccfdbf9b821fcd96':
  Fix crashes when removing work profile
 2015-08-19 20:48:30 +00:00
Chien-Yu Chen
86d86c2e7c am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev 
* commit 'c3aa7f3a7564f36db58d8a9a5470fd64f6fa282b':
  Camera2: Handle surface size change
 2015-08-19 20:48:27 +00:00
Amith Yamasani
a79f37c31f am 6e6fbc93: am 7102fb5f: am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev 
* commit '6e6fbc932ac5355bc90cc1f98b38d46281b1aeaf':
  Fix crashes when removing work profile
 2015-08-19 20:40:52 +00:00
Chien-Yu Chen
c3aa7f3a75 Merge "Camera2: Handle surface size change" into mnc-dr-dev 2015-08-19 20:40:11 +00:00
Amith Yamasani
6e6fbc932a am 7102fb5f: am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev 
* commit '7102fb5f5282b2a0c68691a434c407539e334ada':
  Fix crashes when removing work profile
 2015-08-19 20:34:23 +00:00
Chris Craik
6daa13c5fa Change setMatrix behavior to only affect canvas-local matrix 
bug:22189925

This makes setMatrix(getMatrix()) work as expected, and makes setMatrix()
much more useful without changing behavior relative to a View's parent
hierarchy.

Change-Id: I608613bd27c1b9052ae583f8fd2119cf37a2f6d7
 2015-08-19 13:32:15 -07:00
Amith Yamasani
7102fb5f52 am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev 
* commit 'e1df482c173d975923dba2d3cf644f5a0fadee17':
  Fix crashes when removing work profile
 2015-08-19 20:25:26 +00:00
Amith Yamasani
e1df482c17 am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev 
* commit 'e3de6c5df5a94e627c5ee0f188cbb066233a3dd0':
  Fix crashes when removing work profile
 2015-08-19 20:19:28 +00:00
Jorim Jaggi
5fb4b98bdd Fix wakelock leak for dozing 
Bug: 23344235
Change-Id: I7f4233cfe15bdd3e8cc5f01a70707bdde9fc1737
 2015-08-19 13:14:28 -07:00
Amith Yamasani
e3de6c5df5 Merge "Fix crashes when removing work profile" into mnc-dev 2015-08-19 20:10:30 +00:00
Filip Gruszczynski
170192ab55 Improve animating from recents to multi window state. 
Previously all windows would start animating from a single thumbnail
that was clicked. Now each animates from its thumbnail, including
properly animating the thumbnail header. This involves System UI
providing information about the thumbnail setup and app transition code
using it to setup each individual animation.

Change-Id: I6f45c94af6bcbf6898b8ed757d83505af99ed6b1
 2015-08-19 12:20:46 -07:00
Dianne Hackborn
e264f9a51e am 5a1234fa: am 81b4616f: am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '5a1234fabf73224d107ce0715682728b35357203':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 19:01:16 +00:00
Ben Wagner
283e907af4 Merge "Use 'new' instead of 'SkNEW'." 2015-08-19 19:01:04 +00:00
Dianne Hackborn
5a1234fabf am 81b4616f: am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '81b4616f9f8ecf1be2db999acbd8504c33201eb9':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:53:24 +00:00
Dianne Hackborn
81b4616f9f am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit 'aa8c876e1dd159c37fa00d7ed6f3fd228c74e30b':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:45:41 +00:00