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

3034 Commits

Author SHA1 Message Date
Dianne Hackborn
3b35226300 am 42d9bf66: am a6d2789c: Merge "Add new empty app test entry points." into lmp-mr1-dev 
automerge: 5b01f08

* commit '5b01f0894dacec272ce02fe07e879369ecd2ed93':
  Add new empty app test entry points.
 2014-11-21 01:53:27 +00:00
Dianne Hackborn
5b01f0894d am 42d9bf66: am a6d2789c: Merge "Add new empty app test entry points." into lmp-mr1-dev 
* commit '42d9bf665598ae316bfae3fd28cbb5c8f2c95824':
  Add new empty app test entry points.
 2014-11-21 00:43:57 +00:00
Dianne Hackborn
4f0e4a9ada Add new empty app test entry points. 
Change-Id: Ib899c95de6b7bb936d2114e86bec4c5aef5f7eda
 2014-11-19 14:21:07 -08:00
ztenghui
2f96e233de am bac3f5a6: am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev 
* commit 'bac3f5a6f055876d8892ff27fb8db7355a188a68':
  Fix the starting pen's position when a path close.
 2014-11-14 19:17:00 +00:00
ztenghui
bac3f5a6f0 am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev 
* commit '9f67155332e49686ef622b096b715ee62845d401':
  Fix the starting pen's position when a path close.
 2014-11-14 00:03:16 +00:00
ztenghui
5e7a29f677 Fix the starting pen's position when a path close. 
We have to cache the starting point for the latest "move", then apply it after
we close the path.

b/18214929

Change-Id: I8e8e5c810d720a1c194b8f59d74867a0efbb7662
 2014-11-13 12:55:16 -08:00
Dianne Hackborn
35ed2f4c39 am 95ef0ac7: am 525da301: am 85d558cd: Add Activity API to get referrer information. 
* commit '95ef0ac77738eac98e4952fe1e94db64c1560f5e':
  Add Activity API to get referrer information.
 2014-11-11 01:03:02 +00:00
Dianne Hackborn
95ef0ac777 am 525da301: am 85d558cd: Add Activity API to get referrer information. 
* commit '525da301930e554dc331828adee35613f945c250':
  Add Activity API to get referrer information.
 2014-11-11 00:55:10 +00:00
Dianne Hackborn
85d558cd48 Add Activity API to get referrer information. 
This expands the use of EXTRA_REFERRER to be relevant anywhere,
allowing apps to supply referrer information if they want.  However,
if they don't explicitly supply it, then the platform now keeps
track of package names that go with Intents when delivering them
to apps, which it can be returned as the default value.

The new method Activity.getReferrer() is used to retrieve this
referrer information.  It knows about EXTRA_REFERRER, it can return
the default package name tracked internally, and it also can return
a new EXTRA_REFERRER_NAME if that exists.  The latter is needed
because we can't use EXTRA_REFERRER in some cases since it is a Uri,
and things like #Intent; URI extras can only generate primitive type
extras.  We really need to support this syntax for referrers, so we
need to have this additional extra field as an option.

When a referrer is to a native app, we are adopting the android-app
scheme.  Since we are doing this, Intent's URI creation and parsing
now supports this scheme, and we improve its syntax to be able to build
intents with custom actions and stuff, instead of being all hung up
on custom schemes.

While doing this, fixed a problem when parsing both intent: and new
android-app: schemes with a selector portion, where we were not
respecting any scheme that was specified.

Change-Id: I06e55221e21a8156c1d6ac755a254fea386917a2
 2014-11-11 00:42:18 +00:00
ztenghui
b9af7dfac8 am c220b48a: am 9b14422a: am 786d0a03: Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev 
* commit 'c220b48ab7f27f460155028716bc3af907f8b180':
  VD:test:Remove open animation AVD
 2014-11-06 21:08:12 +00:00
ztenghui
c220b48ab7 am 9b14422a: am 786d0a03: Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev 
* commit '9b14422a5045d908ae8a3ba78b4c4972f652b29f':
  VD:test:Remove open animation AVD
 2014-11-06 19:31:43 +00:00
ztenghui
786d0a0353 Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev 2014-11-06 18:54:49 +00:00
ztenghui
86ec6088b5 VD:test:Remove open animation AVD 
This is for unbundle apps, so it is not a good idea to put in open source.

b/18171696

Change-Id: I4272a9cd12904b90b4421e88304795a292ceec58
 2014-11-04 15:59:46 -08:00
Wale Ogunwale
a9868fbd7b am 2749a5e6: am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill process if it still has tasks. 
* commit '2749a5e6cec41cbdc019134db6fc96e5283db9b4':
  Fix issue #17305377: Don't kill process if it still has tasks.
 2014-11-04 19:22:25 +00:00
Wale Ogunwale
2749a5e6ce am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill process if it still has tasks. 
* commit 'e54553c841f3ca1ebcb822e8b9ab6a412e7bd895':
  Fix issue #17305377: Don't kill process if it still has tasks.
 2014-11-04 19:14:49 +00:00
Wale Ogunwale
d54b578e47 Fix issue #17305377: Don't kill process if it still has tasks. 
We previously killed a process when one of its task was
swiped away in the recents UI. This had negative performance
implications for apps with multiple tasks in recents. Now we
will only kill the process if there are no more tasks associated
with it.

Changed also removes the need for the
ActivityManager.REMOVE_TASK_KILL_PROCESS since ActivityManager
will now only kill a task process if it process has no out
standing tasks.

Bug: 17305377
Change-Id: Ibc39bb328d13c7eab05c04798c2f14887923d9d4
 2014-11-04 10:59:31 -08:00
Kenny Root
d130ba8b00 am affff329: am d00ced98: am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'affff329088e569158e0ee45ee0e580b3c285722':
  Track change to Conscrypt
 2014-11-03 18:58:09 +00:00
Kenny Root
affff32908 am d00ced98: am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'd00ced983ee235f72a9261fd967309a2638dde05':
  Track change to Conscrypt
 2014-11-03 18:50:21 +00:00
Kenny Root
d00ced983e am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
  Track change to Conscrypt
 2014-11-03 18:40:55 +00:00
Kenny Root
b0cb07348e Merge "Track change to Conscrypt" 2014-11-03 18:34:00 +00:00
Narayan Kamath
d449a008a0 am cd4910ef: am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit 'cd4910ef606e1fa8c974c348174ee55a65541cb6':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:42:49 +00:00
Narayan Kamath
cd4910ef60 am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit '2e1bd46a1567fa987df04dd8eef66e91b50ef4f3':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:38:02 +00:00
Narayan Kamath
2e1bd46a15 am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:31:11 +00:00
Narayan Kamath
ef5d43a7cf Merge "Revert "Revert "Remove unused apache related API.""" 2014-11-03 14:24:17 +00:00
Narayan Kamath
4b8f1846ca Revert "Revert "Remove unused apache related API."" 
This reverts commit 31f54ef8150019e4a8c501181806199ef7699fea.

Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
 2014-11-03 13:32:10 +00:00
Kenny Root
8a97063720 Track change to Conscrypt 
Change way in which an outside caller can get the preferred SSLContext.

Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
 2014-10-31 12:06:09 -07:00
Narayan Kamath
f0c7066742 am 78b3f5ab: am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit '78b3f5ab70300548776e3b98ee6d8fb6b1f5318f':
  Revert "Remove unused apache related API."
 2014-10-29 19:42:13 +00:00
Elliott Hughes
99e08b70aa am b5ce284a: resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp 
* commit 'b5ce284aa8e738de051572ab37a01d52fa7b1dac':
  Remove unused apache related API.
 2014-10-29 19:38:05 +00:00
Narayan Kamath
78b3f5ab70 am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f':
  Revert "Remove unused apache related API."
 2014-10-29 19:34:10 +00:00
Elliott Hughes
b5ce284aa8 resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp 
Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770
 2014-10-29 12:31:48 -07:00
Narayan Kamath
99562bf065 am 7192f0d2: am b27ea563: am 00fd3639: Merge "Remove tests/SslLoad." 
* commit '7192f0d2acafb2599988d463a42a2dcfd80c25bc':
  Remove tests/SslLoad.
 2014-10-29 17:56:07 +00:00
Narayan Kamath
7192f0d2ac am b27ea563: am 00fd3639: Merge "Remove tests/SslLoad." 
* commit 'b27ea56312692c5ee0f38dad38e2a3832086b40a':
  Remove tests/SslLoad.
 2014-10-29 17:47:15 +00:00
Narayan Kamath
fa945c105b am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'e87d36f8925a34f85ba80c886757d07ad03fed42':
  Revert "Remove unused apache related API."
 2014-10-29 11:30:11 +00:00
Narayan Kamath
d3389e2f32 resolved conflicts for merge of 9834af9c to stage-aosp-master 
Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
 2014-10-29 11:23:45 +00:00
Narayan Kamath
b27ea56312 am 00fd3639: Merge "Remove tests/SslLoad." 
* commit '00fd36399fd8dd9566b582c24817d130982bc270':
  Remove tests/SslLoad.
 2014-10-29 05:47:26 +00:00
Narayan Kamath
e87d36f892 Merge "Revert "Remove unused apache related API."" 2014-10-27 16:55:42 +00:00
Narayan Kamath
31f54ef815 Revert "Remove unused apache related API." 
This reverts commit 3f2714e18bfd979aefefa1d45c50a69fca21cf14.

Change-Id: Ie0e51897ab509d112dc37ca7b90b4139b0a82d8d
 2014-10-27 16:55:14 +00:00
Narayan Kamath
9834af9ccf Merge "Remove unused apache related API." 2014-10-27 16:17:21 +00:00
Narayan Kamath
3f2714e18b Remove unused apache related API. 
Hidden and used only in unit tests.

Change-Id: I492b735f0f7e129946e28c31ad9d91c98aacf987
 2014-10-24 14:27:07 +01:00
Narayan Kamath
3f2d1a460a Remove tests/SslLoad. 
Crufty code that hasn't been touched in the past five years.
The test seems generally useless and there are dozens of richer
tests and benchmarks in conscrypt and libcore.

Change-Id: Ifbec8d419fd37f3b6323c9c74f47d0b7c85c9d4b
 2014-10-24 14:16:41 +01:00
John Reck
7ab73f1e98 am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 
automerge: 76f24bd

* commit '76f24bde7816dd97ed2375ec41c9817be0330d9f':
  Surface:lockHardwareCanvas
 2014-10-21 23:34:46 +00:00
John Reck
76f24bde78 am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 
* commit 'e73a54f33c029552469fcf1cda46eed2f360a38e':
  Surface:lockHardwareCanvas
 2014-10-21 21:39:36 +00:00
John Reck
bb2d0cc7e1 Surface:lockHardwareCanvas 
Bug: 17440886

Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
 2014-10-21 13:23:56 -07:00
ztenghui
6189bdd883 am 6a7335ac: am 3406be85: am 5237c0c3: Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev 
* commit '6a7335acd862babb40435f678348e3e651d77c89':
  Support negative value in exponential data in the pathData.
 2014-10-10 22:08:02 +00:00
Sandeep Siddhartha
2d1cd5b20b am f9c45add: am a591efe2: am dbc9aa2c: am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'f9c45addceed8d98f5a9a8a7486e91e4980b1fec':
  Add tests for model management [SDK Only]
 2014-10-10 22:06:43 +00:00
ztenghui
6a7335acd8 am 3406be85: am 5237c0c3: Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev 
* commit '3406be853d21af58d551adbde805706f43ef51e2':
  Support negative value in exponential data in the pathData.
 2014-10-10 20:12:06 +00:00
ztenghui
5237c0c3c9 Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev 2014-10-10 19:59:23 +00:00
ztenghui
846d53c1d5 am 39af6ae0: am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data did." into lmp-mr1-dev 
* commit '39af6ae064399ad58023752732ed2d388e897736':
  Support dot separation as the svg path data did.
 2014-10-10 18:39:43 +00:00
ztenghui
897f6daeff Support negative value in exponential data in the pathData. 
Now "1e-5" will not be separated as "1e" and "-5".

Add one test for this use case.
Make sure we print out the pathData when path parsing has error.

b/17919923

Change-Id: I10a00ce21166cfb5a009c49c1a93f40eeb956d83
 2014-10-10 11:11:34 -07:00
Sandeep Siddhartha
f9c45addce am a591efe2: am dbc9aa2c: am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'a591efe2839d45fe40928e97bf8c3c8c16e6ac82':
  Add tests for model management [SDK Only]
 2014-10-10 17:14:23 +00:00