OSDN Git Service
ztenghui [Fri, 7 Feb 2014 22:09:39 +0000 (22:09 +0000)]
Merge "Add the clipToOutline by just using the clipPathOp"
Dianne Hackborn [Fri, 7 Feb 2014 21:56:45 +0000 (21:56 +0000)]
Merge "Battery stats: more events, fixes."
Dianne Hackborn [Fri, 7 Feb 2014 21:01:07 +0000 (13:01 -0800)]
Battery stats: more events, fixes.
Add new history events for top application package and
foreground application packages.
Doing this involved a fair amount of improvement to history
events. The event code is now separated out to have "start"
and "finish" identifies, and we use that to now keep track
of which events are active. With that, when resetting the
stats, we can spit out all of the currently active events at
the front of the new history.
Also fixed some problems when I re-arranged the history delta
int bits that were conflicting with the packing of the battery
status bits. These packing structures are changed to work
together correctly.
Change-Id: Ic8b815060dd8a50ff4a0a209efc2e1044215cd88
ztenghui [Thu, 6 Feb 2014 18:33:58 +0000 (10:33 -0800)]
Add the clipToOutline by just using the clipPathOp
Change-Id: I6ba23b589e579599d018600d0744be0efe2028c1
Derek Sollenberger [Fri, 7 Feb 2014 20:52:22 +0000 (20:52 +0000)]
Merge "Keep the SkPaint used when creating a layer."
John Spurlock [Fri, 7 Feb 2014 19:25:19 +0000 (19:25 +0000)]
Merge "Make QS battery composite color match others."
Chris Craik [Fri, 7 Feb 2014 18:47:57 +0000 (18:47 +0000)]
Merge "Rework and clean up DisplayList projection"
Derek Sollenberger [Wed, 5 Feb 2014 21:47:00 +0000 (16:47 -0500)]
Keep the SkPaint used when creating a layer.
This will allow us to inspect the paint for thing other than
color and xfermode, such as SkColorFilters and SkShaders.
bug:
10650594
Change-Id: I2c3ddd07a3966e1e77af34136307e2b59b2898c1
Kenny Root [Fri, 7 Feb 2014 17:12:48 +0000 (09:12 -0800)]
KeyChain: add explicit package for getPrivateKey
Bug:
9964538
Change-Id: If67c1938e9506d4fa81b241bcbce2193d1b194ef
Narayan Kamath [Fri, 7 Feb 2014 11:34:18 +0000 (11:34 +0000)]
Merge "Fix several bad function definitions."
Jim Miller [Thu, 6 Feb 2014 01:30:50 +0000 (17:30 -0800)]
Fix problem where input wasn't being requested
This fixes a bug where input wasn't being enabled when the security
method changed. The solution is to propagate changes back to the parent
Add missing copyright header to simplified keyguard view.
Bugs
12135931,
12879769
Change-Id: I0fc6cf8ef3b628c96a045797a5b9cdecd3a1007a
Jim Miller [Tue, 4 Feb 2014 01:57:23 +0000 (17:57 -0800)]
Add KeyguardSimpleHostView and make it the default
This adds a simplified KeyguardHostView that's intended to
be used as an overlay or dialog for asking the user's
credentials.
Bug
12135931
Change-Id: Iecede0715d671e88024e7bb77e7432cd1c7ec356
Jim Miller [Wed, 29 Jan 2014 02:22:42 +0000 (18:22 -0800)]
Move launch, verification and menu logic to base class
- Add simplified KeyguardHostView
- Move common functions to KeyguardViewBase.java
- Create new KeyguardSimpleHostView class for simplified view
implementation.
Bug
12135931
Change-Id: I8d6b0a61c36a0c7ceb87da4da54b1dfbed0054ff
Chris Craik [Thu, 6 Feb 2014 00:50:41 +0000 (16:50 -0800)]
Rework and clean up DisplayList projection
Move the projection surface to be a property of a DisplayList,
set to true for every background drawable.
Additionally, handle a projecting view background such that it doesn't
try to project onto itself (which is undesirable).
Change-Id: Ic70b17474bd87340e80767f8518f73b233419c7a
Chris Craik [Thu, 6 Feb 2014 23:22:27 +0000 (23:22 +0000)]
Merge "Simplify DisplayList matrices"
Adam Powell [Thu, 6 Feb 2014 22:41:14 +0000 (22:41 +0000)]
Merge "Refactoring of fitSystemWindows to applyWindowInsets for views"
Ricardo Cervera [Thu, 6 Feb 2014 21:29:59 +0000 (21:29 +0000)]
am
adb94013: am
8ff1f285: am
b7d456d4: am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
adb940131adf137023006fcd86663fd048fa6a54':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:26:03 +0000 (21:26 +0000)]
am
a5e35cb0: am
6ed26862: am
74d290fd: am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
a5e35cb002936291b79ff422c94eb2caabedfb3a':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:23:40 +0000 (21:23 +0000)]
am
8ff1f285: am
b7d456d4: am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
8ff1f285c93a1a44a7419ab216bee2f92518387a':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:20:28 +0000 (21:20 +0000)]
am
b7d456d4: am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
b7d456d4a410d1a17933ed0256fecd2144160615':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:19:50 +0000 (21:19 +0000)]
am
6ed26862: am
74d290fd: am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
6ed268623b9e4a10a080e15d64340c16d2dd8a28':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:17:12 +0000 (21:17 +0000)]
am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
8d65fc2c698ca1e91c669c3e04b45bf0d1c9dffc':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:16:28 +0000 (21:16 +0000)]
am
74d290fd: am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
74d290fd62dfec09708664f354805c548b3dc5eb':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:13:29 +0000 (21:13 +0000)]
am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
8756b0c3cea50d47ba7191d8a493f774b23a1631':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:13:21 +0000 (21:13 +0000)]
am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
d057fa6d40198e07844f702608b7959bad3bd48b':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:09:36 +0000 (21:09 +0000)]
am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
531939d151167e56b3106205f4c3d859a9f509ce':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:09:12 +0000 (21:09 +0000)]
Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
Ricardo Cervera [Thu, 6 Feb 2014 21:07:09 +0000 (21:07 +0000)]
Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
Craig Mautner [Thu, 6 Feb 2014 20:36:56 +0000 (20:36 +0000)]
am
43ef013c: (-s ours) am
38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.
* commit '
43ef013cbd769533737135af5a338898cc619602':
DO NOT MERGE. Test for Configuration differences before changing.
Craig Mautner [Thu, 6 Feb 2014 20:29:49 +0000 (20:29 +0000)]
am
38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.
* commit '
38f7dcd7dcb5d98d86f19f3c4725aea89f9792ff':
DO NOT MERGE. Test for Configuration differences before changing.
Craig Mautner [Thu, 6 Feb 2014 18:31:41 +0000 (10:31 -0800)]
DO NOT MERGE. Test for Configuration differences before changing.
Changing Configuration first and then testing for changes yields a
result indicating no change.
Fixes bug
12904769.
Change-Id: If7e39e843f15b1143d9877497d595511afabd020
John Reck [Thu, 6 Feb 2014 20:26:36 +0000 (20:26 +0000)]
Merge "Remove overdraw counter"
Adam Lesinski [Thu, 6 Feb 2014 20:25:51 +0000 (20:25 +0000)]
am
a5a93f55: am
7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev
* commit '
a5a93f559d337ad5b79716b05ea43707eb779dc8':
Check feature bits before loading optional services
Adam Lesinski [Thu, 6 Feb 2014 20:16:30 +0000 (20:16 +0000)]
am
7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev
* commit '
7f416631413e75a1756bd316a2e1906725d72f24':
Check feature bits before loading optional services
Adam Lesinski [Thu, 6 Feb 2014 20:13:20 +0000 (20:13 +0000)]
Merge "Check feature bits before loading optional services" into klp-modular-dev
John Reck [Thu, 6 Feb 2014 00:53:34 +0000 (16:53 -0800)]
Remove overdraw counter
Change-Id: Iee05362b9080b28714a4cca5a571f19ce81eadfd
Ricardo Cervera [Tue, 28 Jan 2014 01:47:39 +0000 (17:47 -0800)]
docs: Updated the retaining an object during conf change. Bug:
10303533
Replaced use of deprecated methods with retained fragments.
Change-Id: I0f0a045da88f9817077070729ef0af283bea93e4
Review: http://quixote.mtv.corp.google.com:8007/guide/topics/resources/runtime-changes.html
Jeff Sharkey [Thu, 6 Feb 2014 18:50:05 +0000 (18:50 +0000)]
Merge "Update DrmOutputStream to use raw FileDescriptor."
Craig Mautner [Thu, 6 Feb 2014 18:31:41 +0000 (10:31 -0800)]
Test for Configuration differences before changing.
Changing Configuration first and then testing for changes yields a
result indicating no change.
Fixes bug
12904769.
Change-Id: If7e39e843f15b1143d9877497d595511afabd020
Ricardo Cervera [Mon, 27 Jan 2014 19:02:39 +0000 (11:02 -0800)]
docs: Fixed links to Proguard manual. Bug:
12713887
The SourceForge manual cannot be linked to sections directly because
of JavaScript and HTML frames. I used the MIT links from the bug
report instead.
Review: http://quixote.mtv.corp.google.com:8001/tools/help/proguard.html
Change-Id: I1be210d392d78a7560a89f421074ba6d99499da0
Jeff Sharkey [Thu, 30 Jan 2014 23:01:22 +0000 (15:01 -0800)]
Update DrmOutputStream to use raw FileDescriptor.
This allows DownloadManager to use FDs, paving the way for downloading
directly to content:// Uris.
Also return flag indicating if deleteOlderFiles() actually deleted
anything. Update tests to verify.
Bug:
5287571
Change-Id: I2579e5e2113f31b2860d7b021bd61c91b6310963
Andreas Huber [Thu, 6 Feb 2014 17:10:30 +0000 (17:10 +0000)]
Merge "Remove no longer needed http proxy handling code, it's obsolete now"
Narayan Kamath [Thu, 6 Feb 2014 11:50:31 +0000 (11:50 +0000)]
Fix several bad function definitions.
We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).
bug:
12890271
Change-Id: I6a167a4f3aac1e22ddea33d067caaef6a11b418c
Jessica Hummel [Thu, 6 Feb 2014 10:23:00 +0000 (10:23 +0000)]
Merge "Extend DeviceOwner concept to accommodate ProfileOwners"
Adam Connors [Thu, 9 Jan 2014 10:42:56 +0000 (10:42 +0000)]
Extend DeviceOwner concept to accommodate ProfileOwners
ProfileOwners, like DeviceOwners, are Device Admins that have
additional priviledges. ProfileOwners however are scoped per
user.
Change-Id: I1e22c85878e0672121e6ebbe97fca38591f992b2
Deepanshu Gupta [Thu, 6 Feb 2014 03:15:37 +0000 (03:15 +0000)]
am
7bd287b7: am
ea2ec77f: am
3adb34ee: am
9fcfbfe2: am
3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '
7bd287b70a1c95c96663a6028e9809fd3844f55a':
Add methods for Time_Delegate
Deepanshu Gupta [Thu, 6 Feb 2014 03:15:33 +0000 (03:15 +0000)]
am
6a9cbd5a: am
a0023027: am
23de8dc2: am
28e049ef: am
0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '
6a9cbd5a2d56782e94b870735df51d32314684d8':
Optimize layout rendering in layoutlib
Deepanshu Gupta [Thu, 6 Feb 2014 03:15:30 +0000 (03:15 +0000)]
am
f9021e48: am
bd762373: am
096e4359: am
f2f108fe: am
a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit '
f9021e48bedc9fda9bff4e33244e689fb06e8ecb':
Add missing files to fix libphonenumber for layoutlib.
Deepanshu Gupta [Thu, 6 Feb 2014 03:15:26 +0000 (03:15 +0000)]
am
1bcc286d: am
db0427a0: am
5800b19a: am
50b0ce4e: am
fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '
1bcc286def646f98747bce2c4dedb0737d5fcf9d':
Fix the measurement of text bounds.
Deepanshu Gupta [Thu, 6 Feb 2014 03:15:22 +0000 (03:15 +0000)]
am
1bceb982: am
650d30c5: am
b156c019: am
d5129e75: am
8a892279: Fix a bug in Nine Patch library.
* commit '
1bceb9823f7af258489c91fa201214805744fa4a':
Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:38 +0000 (03:06 +0000)]
am
ea2ec77f: am
3adb34ee: am
9fcfbfe2: am
3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '
ea2ec77f9538de2ea795d3e257f19e8cff659665':
Add methods for Time_Delegate
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:35 +0000 (03:06 +0000)]
am
a0023027: am
23de8dc2: am
28e049ef: am
0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '
a0023027e5b7245e2cef304d96826a7ae1c361aa':
Optimize layout rendering in layoutlib
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:32 +0000 (03:06 +0000)]
am
bd762373: am
096e4359: am
f2f108fe: am
a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit '
bd762373964eb3cb71bdd79cbf82c27faa22699d':
Add missing files to fix libphonenumber for layoutlib.
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:29 +0000 (03:06 +0000)]
am
db0427a0: am
5800b19a: am
50b0ce4e: am
fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '
db0427a0ac986e0823e7bbe9b7c12a97aabe133e':
Fix the measurement of text bounds.
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:26 +0000 (03:06 +0000)]
am
650d30c5: am
b156c019: am
d5129e75: am
8a892279: Fix a bug in Nine Patch library.
* commit '
650d30c5ec3c0b345651a56c45eb334fabf51b17':
Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 03:03:54 +0000 (03:03 +0000)]
am
3adb34ee: am
9fcfbfe2: am
3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '
3adb34ee079504b5854d23bc7a38dafc0a985219':
Add methods for Time_Delegate
Deepanshu Gupta [Thu, 6 Feb 2014 03:03:50 +0000 (03:03 +0000)]
am
23de8dc2: am
28e049ef: am
0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '
23de8dc2625d4aeb4dc9085c5865ed571f96261a':
Optimize layout rendering in layoutlib
Deepanshu Gupta [Thu, 6 Feb 2014 03:03:45 +0000 (03:03 +0000)]
am
096e4359: am
f2f108fe: am
a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit '
096e43590381b218cec88adeac4261427c19e139':
Add missing files to fix libphonenumber for layoutlib.
Deepanshu Gupta [Thu, 6 Feb 2014 03:03:41 +0000 (03:03 +0000)]
am
5800b19a: am
50b0ce4e: am
fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '
5800b19a7a3422620cb28e2327a96bf824f5cc9c':
Fix the measurement of text bounds.
Deepanshu Gupta [Thu, 6 Feb 2014 03:03:36 +0000 (03:03 +0000)]
am
b156c019: am
d5129e75: am
8a892279: Fix a bug in Nine Patch library.
* commit '
b156c0197d052dd4be71ad2b858acc01f50ad49f':
Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 02:59:51 +0000 (02:59 +0000)]
am
9fcfbfe2: am
3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '
9fcfbfe296d7033ee031171f61b3a33044abee42':
Add methods for Time_Delegate
Deepanshu Gupta [Thu, 6 Feb 2014 02:59:48 +0000 (02:59 +0000)]
am
28e049ef: am
0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '
28e049ef73f5d9301a198ac53535442b697b7ef4':
Optimize layout rendering in layoutlib
Deepanshu Gupta [Thu, 6 Feb 2014 02:59:45 +0000 (02:59 +0000)]
am
f2f108fe: am
a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit '
f2f108fe86337a429a0940f264761dbc27f817fe':
Add missing files to fix libphonenumber for layoutlib.
Deepanshu Gupta [Thu, 6 Feb 2014 02:59:41 +0000 (02:59 +0000)]
am
50b0ce4e: am
fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '
50b0ce4e8ed353ed841782aeb58963bc084f2e16':
Fix the measurement of text bounds.
Deepanshu Gupta [Thu, 6 Feb 2014 02:59:38 +0000 (02:59 +0000)]
am
d5129e75: am
8a892279: Fix a bug in Nine Patch library.
* commit '
d5129e75968030620a1372e39fcfbc17fe584e17':
Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 02:56:45 +0000 (02:56 +0000)]
am
3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '
3bf38b4165877274067a385cfe6472639a203a58':
Add methods for Time_Delegate
Craig Mautner [Thu, 6 Feb 2014 02:56:44 +0000 (02:56 +0000)]
am
14d74b82: am
1bf2b873: Defer detach until animations are complete.
* commit '
14d74b82363e1a72b967590ee7118b239b276fb4':
Defer detach until animations are complete.
Deepanshu Gupta [Thu, 6 Feb 2014 02:56:42 +0000 (02:56 +0000)]
am
0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '
0db6e6a567e25d560586863c7be654a0c1da5795':
Optimize layout rendering in layoutlib
Deepanshu Gupta [Thu, 6 Feb 2014 02:56:39 +0000 (02:56 +0000)]
am
a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit '
a955314d905f8567c852226ce4f74994826e8777':
Add missing files to fix libphonenumber for layoutlib.
Craig Mautner [Thu, 6 Feb 2014 02:56:37 +0000 (02:56 +0000)]
am
481b54be: am
dc548483: Move activities from DisplayContent to TaskStack
* commit '
481b54be1acb990bab3933b6248964e351bdcd99':
Move activities from DisplayContent to TaskStack
Deepanshu Gupta [Thu, 6 Feb 2014 02:56:36 +0000 (02:56 +0000)]
am
fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '
fd8cba3ab83972eefc796fa122b0ec9222078b1c':
Fix the measurement of text bounds.
Deepanshu Gupta [Thu, 6 Feb 2014 02:56:32 +0000 (02:56 +0000)]
am
8a892279: Fix a bug in Nine Patch library.
* commit '
8a892279bd1b212311f4200f306a317985463918':
Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 02:06:02 +0000 (02:06 +0000)]
Merge "Add methods for Time_Delegate" into klp-dev
Deepanshu Gupta [Thu, 6 Feb 2014 02:05:42 +0000 (02:05 +0000)]
Merge "Optimize layout rendering in layoutlib" into klp-dev
Deepanshu Gupta [Thu, 6 Feb 2014 02:05:21 +0000 (02:05 +0000)]
Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
Deepanshu Gupta [Thu, 6 Feb 2014 02:04:49 +0000 (02:04 +0000)]
Merge "Fix the measurement of text bounds." into klp-dev
Alan Viverette [Thu, 6 Feb 2014 01:52:02 +0000 (17:52 -0800)]
Add prototype for borderless touch feedback drawable
Change-Id: I6366855b1fb838aa077bc6bdb62adc2134c51dca
Deepanshu Gupta [Thu, 6 Feb 2014 01:11:14 +0000 (17:11 -0800)]
Fix a bug in Nine Patch library.
The nine patches were not drawn correctly if they were not positioned at
the top left corner of the canvas.
Bug: http://b.android.com/29959
Change-Id: Icfed522ea07322a3ee9f3955067d3da26c4b0b5b
Craig Mautner [Thu, 6 Feb 2014 01:00:35 +0000 (01:00 +0000)]
am
1bf2b873: Defer detach until animations are complete.
* commit '
1bf2b873470d2ba8a4ac218da73516cc2b20aa76':
Defer detach until animations are complete.
Craig Mautner [Thu, 6 Feb 2014 01:00:32 +0000 (01:00 +0000)]
am
dc548483: Move activities from DisplayContent to TaskStack
* commit '
dc548483ae90ba26ad9e2e2cb79f4673140edb49':
Move activities from DisplayContent to TaskStack
John Spurlock [Thu, 6 Feb 2014 00:53:42 +0000 (00:53 +0000)]
Merge "Global system setting to override certain window policy."
Dianne Hackborn [Thu, 6 Feb 2014 00:41:48 +0000 (00:41 +0000)]
Merge "Improve logging of first wake lock, history size."
Dianne Hackborn [Wed, 5 Feb 2014 21:38:56 +0000 (13:38 -0800)]
Improve logging of first wake lock, history size.
We now try to have a better label for the first wake lock
that is acquired in the log. This is done in two ways:
- The alarm manager now sorts the alarms it is going to
execute so that wakeup alarms are first, which are more
important w.r.t. which one should be logged.
- There is a new power manager facility to make a wake lock
as "unimportant for logging," which just means in battery
stats that a wake lock acquired after that can be considered
the actual one to log. This is only used by the alarm manager
to mark its TIME_TICK alarms as unimportant for logging.
Also reworked the battery history code to be cleaner and a bit
smaller. There is no longer a separate EVENT command, instead
the event code and tag are just another thing that can be included
in an UPDATE command.
The bits used in the first history int are also re-arrange, so
that only the ones that really change a fair amount in the state
bits are up at the top and there is no longer space used for
the command code (since now it is always just UPDATE). This
allows us to have more room for the time delta at the bottom,
to better avoid situations where we need to write an int delta.
Change-Id: I1bb860ae5b558a248800b090b03a84fbf7acd68a
Chong Zhang [Thu, 6 Feb 2014 00:20:03 +0000 (00:20 +0000)]
Merge "MediaRecorderTest: add tests for getSurface() and SURFACE source"
Craig Mautner [Wed, 5 Feb 2014 23:37:40 +0000 (15:37 -0800)]
Defer detach until animations are complete.
Allowing the detach of ActivityStack from DisplayContent to happen
immediately was causing all sorts of problems associated with not
having a Display to complete the animations.
Waiting for animations to complete before either the detach or the
display removal fixes those problems.
Change-Id: I8a5663bfac5c3c1084ff4fcc451e0e38e8080265
Alan Viverette [Wed, 5 Feb 2014 22:16:25 +0000 (22:16 +0000)]
Merge "Adds hotspot support to LayerDrawable and InsetDrawable"
Alan Viverette [Wed, 5 Feb 2014 22:16:10 +0000 (22:16 +0000)]
Merge "Temporary fix for background invalidation"
Alan Viverette [Wed, 5 Feb 2014 22:05:51 +0000 (14:05 -0800)]
Adds hotspot support to LayerDrawable and InsetDrawable
Change-Id: Id17f460c8e4e0a6bf9fd39a4a7b8c79fa2df8d29
Alan Viverette [Wed, 5 Feb 2014 22:05:17 +0000 (14:05 -0800)]
Temporary fix for background invalidation
Not a complete solution, since we could be more efficient, but enough
to have both background display lists and proper invalidation.
Change-Id: I0216a104948c0930760275bb2b98318b0a4487e7
Christopher Tate [Wed, 5 Feb 2014 22:03:33 +0000 (22:03 +0000)]
Merge "Improve idle-service bind permission description"
Chris Craik [Wed, 5 Feb 2014 21:52:23 +0000 (21:52 +0000)]
am
2c764b20: am
0ec3ca6e: am
449273e2: Merge "Fix for positioning of glyphs within a bitmap"
* commit '
2c764b20e4a35c509f49e3d9430e135b4f3a0984':
Fix for positioning of glyphs within a bitmap
Zhijun He [Wed, 5 Feb 2014 21:49:55 +0000 (21:49 +0000)]
Merge "Camera2: update aeLock and transform matrix tag specs"
Zhijun He [Wed, 5 Feb 2014 21:48:09 +0000 (13:48 -0800)]
Camera2: update aeLock and transform matrix tag specs
Change-Id: I436f41ff2bf811a654de15b51739c07def354648
John Spurlock [Fri, 17 Jan 2014 20:22:06 +0000 (15:22 -0500)]
Global system setting to override certain window policy.
Specifically, the ability to force immersive-mode-like behavior
on the status bar, the navigation bar (or both) on a
package-by-package basis - and to disable immersive mode
confirmations for specific packages.
Change-Id: I2df7092a91eceeb815367ef917dd7289f4f2b27e
Chris Craik [Wed, 5 Feb 2014 21:43:48 +0000 (21:43 +0000)]
am
0ec3ca6e: am
449273e2: Merge "Fix for positioning of glyphs within a bitmap"
* commit '
0ec3ca6e08e5933016beda147ca9a82e96434b15':
Fix for positioning of glyphs within a bitmap
Chris Craik [Wed, 5 Feb 2014 21:40:22 +0000 (13:40 -0800)]
am
449273e2: Merge "Fix for positioning of glyphs within a bitmap"
* commit '
449273e2d575041ffe1a5d435666d36923de888b':
Fix for positioning of glyphs within a bitmap
Chris Craik [Wed, 5 Feb 2014 21:36:42 +0000 (21:36 +0000)]
Merge "Fix for positioning of glyphs within a bitmap"
Craig Mautner [Wed, 5 Feb 2014 21:35:24 +0000 (13:35 -0800)]
Move activities from DisplayContent to TaskStack
Now that activities and tasks can be detached from a display do not
keep their state within the DisplayContent class. All such state is
now moved to the TaskStack class with this change.
Change-Id: Ie6b1811e9ec3f545782bad8c3461bd4f2d336b93
Hui Shu [Wed, 5 Feb 2014 21:35:11 +0000 (21:35 +0000)]
Merge "Fix postUrl to call loadUrl when url is not a network url."
Hui Shu [Wed, 5 Feb 2014 17:30:36 +0000 (09:30 -0800)]
Fix postUrl to call loadUrl when url is not a network url.
Change-Id: I4be00611c220572b4e8ecea1a00409a6f5d2bb18