OSDN Git Service
Geoff Mendal [Wed, 25 Feb 2015 17:26:40 +0000 (17:26 +0000)]
am
dd535604: (-s ours) am
53ddd69e: (-s ours) Import translations. DO NOT MERGE
* commit '
dd535604fc1e77da28a259a9e9e073efa5618f17':
Import translations. DO NOT MERGE
Joe Fernandez [Wed, 25 Feb 2015 17:26:33 +0000 (17:26 +0000)]
am
20928cae: am
4e3e6fb1: am
9afbbb2e: am
8ffb574a: am
f7224396: am
c427b721: am
41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
* commit '
20928caef4c4f90793408afc91e6d48f0551b4a5':
docs: Android for Work developer landing page
Andrew Solovay [Wed, 25 Feb 2015 17:26:25 +0000 (17:26 +0000)]
am
3999d0fd: am
2557fb07: am
d7cddbd2: am
7391b0a1: am
e64301e6: am
790b1bc8: am
d3cd0948: docs: New doc for creating an AfW Work Policy Controller
* commit '
3999d0fdd7eb6d4ffea6deb35c4b840aef74a135':
docs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Wed, 25 Feb 2015 17:26:17 +0000 (17:26 +0000)]
am
79d543eb: am
d6f1fbe0: am
9ac09b6c: am
93df7f07: am
032e931a: am
6ffe1058: am
a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
* commit '
79d543eb26e841c2d18a972adfcc4ad3fc1e8d75':
docs: New "implementing app restrictions" doc
Chris Craik [Wed, 25 Feb 2015 17:26:07 +0000 (17:26 +0000)]
am
40d8cd6f: am
7914fa5c: am
661b54ae: am
7fc5b5a1: am
a9ad0fc7: am
f2525ed3: am
ea2a0648: Explain behavior of boundless ripple projection
* commit '
40d8cd6ffa8febc6eab8a8690ace34a03b78e33a':
Explain behavior of boundless ripple projection
Geoff Mendal [Wed, 25 Feb 2015 17:11:49 +0000 (17:11 +0000)]
am
53ddd69e: (-s ours) Import translations. DO NOT MERGE
* commit '
53ddd69ea737a20541735bce28b950feeab2d0a8':
Import translations. DO NOT MERGE
Joe Fernandez [Wed, 25 Feb 2015 17:11:17 +0000 (17:11 +0000)]
am
4e3e6fb1: am
9afbbb2e: am
8ffb574a: am
f7224396: am
c427b721: am
41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
* commit '
4e3e6fb16e091815bee4a0be657f462a9f0e4229':
docs: Android for Work developer landing page
Andrew Solovay [Wed, 25 Feb 2015 17:11:11 +0000 (17:11 +0000)]
am
2557fb07: am
d7cddbd2: am
7391b0a1: am
e64301e6: am
790b1bc8: am
d3cd0948: docs: New doc for creating an AfW Work Policy Controller
* commit '
2557fb070a54a65277c320f20cedde828febb1e2':
docs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Wed, 25 Feb 2015 17:11:05 +0000 (17:11 +0000)]
am
d6f1fbe0: am
9ac09b6c: am
93df7f07: am
032e931a: am
6ffe1058: am
a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
* commit '
d6f1fbe04cd7e099c1fa95967c1b7ddfad8669d3':
docs: New "implementing app restrictions" doc
Chris Craik [Wed, 25 Feb 2015 17:10:59 +0000 (17:10 +0000)]
am
7914fa5c: am
661b54ae: am
7fc5b5a1: am
a9ad0fc7: am
f2525ed3: am
ea2a0648: Explain behavior of boundless ripple projection
* commit '
7914fa5ce6c521d4aa7b16a37a2f2df9263b123b':
Explain behavior of boundless ripple projection
Wale Ogunwale [Wed, 25 Feb 2015 15:41:52 +0000 (15:41 +0000)]
Merge "Revert "Have AMS.setFocusedActivityLocked() move the focus stack to the front""
Wale Ogunwale [Wed, 25 Feb 2015 15:28:55 +0000 (07:28 -0800)]
Revert "Have AMS.setFocusedActivityLocked() move the focus stack to the front"
This reverts commit
af0e44885992b0675d7881c391caeff88414695f.
Unblock the release while I figure-out how the change broke things...
Bug:
19505341
Bug:
19507107
Geoff Mendal [Wed, 25 Feb 2015 15:35:22 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 25 Feb 2015 15:33:55 +0000 (07:33 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie511cef0bf2d54e3ca9064a2391955b2cf301ddd
Auto-generated-cl: translation import
Geoff Mendal [Wed, 25 Feb 2015 15:04:41 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 25 Feb 2015 15:01:14 +0000 (07:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I897dff4093f9cce29524a64a9cc4fc08a6655e57
Auto-generated-cl: translation import
Geoff Mendal [Wed, 25 Feb 2015 14:53:11 +0000 (14:53 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 25 Feb 2015 14:46:25 +0000 (06:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iaf416dc2326ddaf2601b5c37d0e86b2b6fb8e307
Auto-generated-cl: translation import
Geoff Mendal [Wed, 25 Feb 2015 14:42:55 +0000 (14:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 25 Feb 2015 14:40:41 +0000 (06:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5e23004d3660fc0ce296391f908e6a042e8da16d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 25 Feb 2015 14:25:08 +0000 (06:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: If17993f8a25da1cb9a868150bb787d8c1b9810bd
Auto-generated-cl: translation import
Geoff Mendal [Wed, 25 Feb 2015 13:35:06 +0000 (05:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: I14e100832a693f7e5cfa8d53edd90ebb1745c064
Auto-generated-cl: translation import
Joe Fernandez [Wed, 25 Feb 2015 13:27:07 +0000 (13:27 +0000)]
am
9afbbb2e: am
8ffb574a: am
f7224396: am
c427b721: am
41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
* commit '
9afbbb2e600936ef7a402fecd0402a3e59cf864e':
docs: Android for Work developer landing page
Adrian Roos [Wed, 25 Feb 2015 13:27:02 +0000 (13:27 +0000)]
Merge "Prevent regular processes from accessing the password history"
Andrew Solovay [Wed, 25 Feb 2015 13:27:03 +0000 (13:27 +0000)]
am
d7cddbd2: am
7391b0a1: am
e64301e6: am
790b1bc8: am
d3cd0948: docs: New doc for creating an AfW Work Policy Controller
* commit '
d7cddbd2d595cd5ee2cb9e7e05af8a760f265f84':
docs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Wed, 25 Feb 2015 13:26:58 +0000 (13:26 +0000)]
am
9ac09b6c: am
93df7f07: am
032e931a: am
6ffe1058: am
a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
* commit '
9ac09b6c553060d0104aa8fb3f38f4dfd81a8957':
docs: New "implementing app restrictions" doc
Chris Craik [Wed, 25 Feb 2015 13:26:53 +0000 (13:26 +0000)]
am
661b54ae: am
7fc5b5a1: am
a9ad0fc7: am
f2525ed3: am
ea2a0648: Explain behavior of boundless ripple projection
* commit '
661b54ae2a55461aa70c07d069550b911c14f800':
Explain behavior of boundless ripple projection
Joe Fernandez [Wed, 25 Feb 2015 13:16:20 +0000 (13:16 +0000)]
am
8ffb574a: am
f7224396: am
c427b721: am
41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
* commit '
8ffb574a5087b2099cef5f629568375caa0ddc9c':
docs: Android for Work developer landing page
Andrew Solovay [Wed, 25 Feb 2015 13:16:15 +0000 (13:16 +0000)]
am
7391b0a1: am
e64301e6: am
790b1bc8: am
d3cd0948: docs: New doc for creating an AfW Work Policy Controller
* commit '
7391b0a177f9ecf3c8e3a9657bbf1ae7000ce528':
docs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Wed, 25 Feb 2015 13:16:11 +0000 (13:16 +0000)]
am
93df7f07: am
032e931a: am
6ffe1058: am
a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
* commit '
93df7f0740a6d2044c29227ac6f684c74aa49ff7':
docs: New "implementing app restrictions" doc
Chris Craik [Wed, 25 Feb 2015 13:16:06 +0000 (13:16 +0000)]
am
7fc5b5a1: am
a9ad0fc7: am
f2525ed3: am
ea2a0648: Explain behavior of boundless ripple projection
* commit '
7fc5b5a129a3599c4a213117415e113a85d09745':
Explain behavior of boundless ripple projection
Joe Fernandez [Wed, 25 Feb 2015 13:09:56 +0000 (13:09 +0000)]
am
f7224396: am
c427b721: am
41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
* commit '
f7224396ee8416630b9387995a79faae1ee68b7c':
docs: Android for Work developer landing page
Andrew Solovay [Wed, 25 Feb 2015 13:09:33 +0000 (13:09 +0000)]
am
e64301e6: am
790b1bc8: am
d3cd0948: docs: New doc for creating an AfW Work Policy Controller
* commit '
e64301e639e73f346a78584af2727bc98f3d81ae':
docs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Wed, 25 Feb 2015 13:09:29 +0000 (13:09 +0000)]
am
032e931a: am
6ffe1058: am
a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
* commit '
032e931a806d21d5fa190d1d28f8d65ee0fb4926':
docs: New "implementing app restrictions" doc
Chris Craik [Wed, 25 Feb 2015 13:09:24 +0000 (13:09 +0000)]
am
a9ad0fc7: am
f2525ed3: am
ea2a0648: Explain behavior of boundless ripple projection
* commit '
a9ad0fc793e3479e678441f2ed7abd47994ab74d':
Explain behavior of boundless ripple projection
Joe Fernandez [Wed, 25 Feb 2015 08:06:01 +0000 (08:06 +0000)]
am
c427b721: am
41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
* commit '
c427b721b681b19f40e45ed82ae0c628f3f5b528':
docs: Android for Work developer landing page
Keisuke Kuroyanagi [Wed, 25 Feb 2015 08:00:29 +0000 (08:00 +0000)]
Merge "Paste as plain text by Ctrl-Shift-V"
Joe Fernandez [Wed, 25 Feb 2015 07:59:48 +0000 (07:59 +0000)]
am
41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
* commit '
414188262311ec48235095a5dec622b24f7e69ef':
docs: Android for Work developer landing page
Joe Fernandez [Wed, 25 Feb 2015 07:52:29 +0000 (07:52 +0000)]
Merge "docs: Android for Work developer landing page" into lmp-docs
Andrew Solovay [Wed, 25 Feb 2015 07:49:37 +0000 (07:49 +0000)]
am
790b1bc8: am
d3cd0948: docs: New doc for creating an AfW Work Policy Controller
* commit '
790b1bc864d9066ff691b0e12a4e14ef85566c50':
docs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Wed, 25 Feb 2015 07:42:44 +0000 (07:42 +0000)]
am
d3cd0948: docs: New doc for creating an AfW Work Policy Controller
* commit '
d3cd0948c8c4662c8711433b756c82fbe2f7a3ad':
docs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Fri, 20 Feb 2015 01:57:50 +0000 (17:57 -0800)]
docs: New doc for creating an AfW Work Policy Controller
See first comment for doc stage location.
Change-Id: I0c9c0f849c049d33fc66e2bd8ac5ba284c7b9415
Christopher Tate [Wed, 25 Feb 2015 02:30:34 +0000 (02:30 +0000)]
Merge "Don't crash when backup timeout races with agent completion"
Wale Ogunwale [Wed, 25 Feb 2015 01:55:30 +0000 (01:55 +0000)]
Merge "Have AMS.setFocusedActivityLocked() move the focus stack to the front"
Christopher Tate [Wed, 25 Feb 2015 01:27:09 +0000 (17:27 -0800)]
Don't crash when backup timeout races with agent completion
There's a narrow window of time in which an agent reporting that its
operation has completed races with timeouts such that we wind up
handling the completion callback just after certain fundamental state
has been reset. Detect this race and proceed gracefully instead of
crashing.
Bug
19498669
Change-Id: I5a475527db1a55a8e567366ddfb10112e427682e
Wale Ogunwale [Tue, 24 Feb 2015 20:27:31 +0000 (12:27 -0800)]
Have AMS.setFocusedActivityLocked() move the focus stack to the front
Bug:
19219490
Change-Id: I089c42a6cf6277f5975064103c9804c2ab05dcd6
Joe Fernandez [Fri, 20 Feb 2015 07:56:07 +0000 (23:56 -0800)]
docs: Android for Work developer landing page
Change-Id: I9886e82bd33357c3fc7296859d70c98747d8c14a
Andrew Solovay [Wed, 25 Feb 2015 01:14:58 +0000 (01:14 +0000)]
am
6ffe1058: am
a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
* commit '
6ffe1058463e5f4e65aa131796b37c0443d1b44b':
docs: New "implementing app restrictions" doc
Christopher Tate [Wed, 25 Feb 2015 01:11:21 +0000 (01:11 +0000)]
Merge "Check DUMP permission in the backup service trampoline"
Andrew Solovay [Wed, 25 Feb 2015 01:07:25 +0000 (01:07 +0000)]
am
a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
* commit '
a2ae6c9dbffe76bd5bc452fbd85ae92e5e3b9a5c':
docs: New "implementing app restrictions" doc
Andrew Solovay [Wed, 25 Feb 2015 01:01:55 +0000 (01:01 +0000)]
Merge "docs: New "implementing app restrictions" doc" into lmp-docs
Chris Craik [Wed, 25 Feb 2015 00:26:51 +0000 (00:26 +0000)]
am
f2525ed3: am
ea2a0648: Explain behavior of boundless ripple projection
* commit '
f2525ed3f4fbb61f7a5e28d2673a3557fbb7773f':
Explain behavior of boundless ripple projection
Andrew Solovay [Wed, 11 Feb 2015 21:12:18 +0000 (13:12 -0800)]
docs: New "implementing app restrictions" doc
New doc on app restrictions, aimed primarily at developers of
enterprise apps. See first comment for doc stage location.
Change-Id: I561780d218c78ae0dc4e4e54d925302c718f96ac
Chris Craik [Wed, 25 Feb 2015 00:18:51 +0000 (00:18 +0000)]
am
ea2a0648: Explain behavior of boundless ripple projection
* commit '
ea2a0648a85a059f7235fbae69df87ba511832cf':
Explain behavior of boundless ripple projection
Chris Craik [Tue, 24 Feb 2015 21:58:26 +0000 (13:58 -0800)]
Explain behavior of boundless ripple projection
Change-Id: I27d5c194750313d5d4e0d9dd541f3157b75340ab
Christopher Tate [Tue, 24 Feb 2015 23:08:08 +0000 (15:08 -0800)]
Check DUMP permission in the backup service trampoline
Make sure that even if backup is disabled outright (and hence there
is no underlying service implementation for the trampoline to delegate
to), the DUMP permission exception is thrown as expected.
Bug
19422232
Change-Id: I6d1a17c5f85adcfad75af969b521920e786c05a8
Chong Zhang [Tue, 24 Feb 2015 22:22:09 +0000 (22:22 +0000)]
Merge "MediaRecorder: pass capture fps in float"
Jeff Brown [Tue, 24 Feb 2015 20:17:43 +0000 (20:17 +0000)]
Merge "To help assess latency, dump the time a broadcast was enqueued."
Michael Wright [Tue, 24 Feb 2015 20:17:12 +0000 (20:17 +0000)]
Merge "Clean-up stale inputflinger binaries and associated libs."
Michael Wright [Tue, 24 Feb 2015 20:11:37 +0000 (12:11 -0800)]
Clean-up stale inputflinger binaries and associated libs.
Change-Id: I7ea2591e701140430ab2060ae0ce51af114c3acf
Jeff Brown [Mon, 29 Sep 2014 22:32:12 +0000 (15:32 -0700)]
To help assess latency, dump the time a broadcast was enqueued.
Previously we only dumped the time when a broadcast started dispatch.
Start tracking the time when a broadcast was enqueued so that
we can determine whether the broadcast queue was stalled and for
how long. Together with other information in the dump, this can help
to ascertain whether broadcast latency is being caused by the sender,
the dispatcher, or the receiver.
Bug:
17695520
Change-Id: I4f2e4bb92f9178f5d095b9124a15eb2e5f13b9f6
Craig Mautner [Tue, 24 Feb 2015 19:36:07 +0000 (19:36 +0000)]
Merge "Cleanup the activity before the task and stack"
Craig Mautner [Tue, 24 Feb 2015 18:53:03 +0000 (10:53 -0800)]
Cleanup the activity before the task and stack
The method cleanupActivityLocked() should be called before
removeActivityFromHistoryLocked(). Previously it didn't matter but
now that we null TaskRecord.stack when removing the last activity
from the task it does.
Fixes NPE in bug
19491381.
Change-Id: Ia6f8f560c0fe4df330577f313e24d7dd02c18409
Wale Ogunwale [Tue, 24 Feb 2015 18:32:56 +0000 (18:32 +0000)]
Merge "Added ActivityManager API and AM command to resize a task."
Jorim Jaggi [Tue, 24 Feb 2015 18:13:18 +0000 (18:13 +0000)]
Merge "Do not forceLayout when window is resized"
Jorim Jaggi [Mon, 16 Feb 2015 17:35:58 +0000 (18:35 +0100)]
Change status bar height to 24dp
Bug:
18410023
Change-Id: Ia8afcaddbf8d78372117806d2b6202cac0364ca9
Wale Ogunwale [Mon, 23 Feb 2015 23:42:52 +0000 (15:42 -0800)]
Added ActivityManager API and AM command to resize a task.
Also fixed issue with ActivityStackSupervisor.moveTaskToStackLocked()
functionality not working correctly.
Change-Id: Ia13f1e92a7c59ce6543c226533ac8ea623488290
John Spurlock [Tue, 24 Feb 2015 17:20:32 +0000 (17:20 +0000)]
Merge "MediaProjectionPermissionActivity: Fix NPE."
John Spurlock [Tue, 24 Feb 2015 17:14:06 +0000 (12:14 -0500)]
MediaProjectionPermissionActivity: Fix NPE.
Avoid dismissing a null dialog.
Bug:
19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
Wale Ogunwale [Sat, 21 Feb 2015 01:19:49 +0000 (17:19 -0800)]
Improved back button behavior in multi-window mode.
Pressing the back button on the last activity in a stack that isn't
full screen causes the home stack to move forward and hide all other
visible stacks. This change allows the affected stack to be removed
while keeping the other stack visible.
Bug:
19423645
Change-Id: I30d84f84d525c114ee4993c1e4178af70fe47440
Adrian Roos [Tue, 24 Feb 2015 16:08:48 +0000 (17:08 +0100)]
Prevent regular processes from accessing the password history
Bug:
19019350
Change-Id: Iee410d62827fe0f9d43e08dd8869e8eea590382f
James Cook [Tue, 24 Feb 2015 14:55:47 +0000 (14:55 +0000)]
Merge "Change UndoManager mOwners from HashMap to ArrayMap"
Jason Monk [Tue, 24 Feb 2015 13:23:29 +0000 (13:23 +0000)]
Merge "Move non-ui bt settings code to SettingsLib"
Jason Monk [Tue, 24 Feb 2015 13:16:24 +0000 (13:16 +0000)]
Merge "Some Tethering code to SettingsLib and use in QS"
Narayan Kamath [Tue, 24 Feb 2015 13:09:55 +0000 (13:09 +0000)]
am
287c53f4: am
76507a64: am
72dc62ea: Merge "Track removal of refcounts from FileMap."
* commit '
287c53f4a8bade1cb6c2dd2fe858da9c303e3e3d':
Track removal of refcounts from FileMap.
Narayan Kamath [Tue, 24 Feb 2015 13:04:43 +0000 (13:04 +0000)]
am
76507a64: am
72dc62ea: Merge "Track removal of refcounts from FileMap."
* commit '
76507a64b530c757dc284f1f4d0807ffbfd9a701':
Track removal of refcounts from FileMap.
Narayan Kamath [Tue, 24 Feb 2015 12:56:52 +0000 (12:56 +0000)]
am
72dc62ea: Merge "Track removal of refcounts from FileMap."
* commit '
72dc62ead214bdec5c46d42f4e859b139dba0a00':
Track removal of refcounts from FileMap.
Narayan Kamath [Tue, 24 Feb 2015 12:50:55 +0000 (12:50 +0000)]
Merge "Track removal of refcounts from FileMap."
Narayan Kamath [Tue, 24 Feb 2015 10:28:12 +0000 (10:28 +0000)]
am
fd335f84: am
948682d1: am
6e208cdd: Merge "Remove wrong javadoc comment"
* commit '
fd335f8467259410c0a55733331e10531141e76e':
Remove wrong javadoc comment
Narayan Kamath [Tue, 24 Feb 2015 10:18:39 +0000 (10:18 +0000)]
am
948682d1: am
6e208cdd: Merge "Remove wrong javadoc comment"
* commit '
948682d15f1a4a6676318213a49b50b967cfae27':
Remove wrong javadoc comment
Narayan Kamath [Tue, 24 Feb 2015 10:11:52 +0000 (10:11 +0000)]
am
6e208cdd: Merge "Remove wrong javadoc comment"
* commit '
6e208cddad3315c4e38accdb801908b2b9b5cbbd':
Remove wrong javadoc comment
Narayan Kamath [Tue, 24 Feb 2015 10:04:31 +0000 (10:04 +0000)]
Merge "Remove wrong javadoc comment"
Chad Jones [Tue, 24 Feb 2015 05:17:58 +0000 (21:17 -0800)]
resolved conflicts for merge of
57bb5f5c to master
Change-Id: Id5dfe7fc919305658312771a031c0764cef5515c
Chad Brubaker [Tue, 24 Feb 2015 04:54:41 +0000 (04:54 +0000)]
am
f271fa33: am
cdc70256: am
f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"
* commit '
f271fa33f148b0c410e8ee06aceb1f2b57cd62c7':
Add new IKeystoreService methods to KeyStore
Chad Brubaker [Tue, 24 Feb 2015 04:54:34 +0000 (04:54 +0000)]
am
3576ca1f: am
1629f954: am
598f9b2a: Merge "Add Keymaster 0.4 binder API"
* commit '
3576ca1f9bd1e46101ad940cc5923ac9965cfafe':
Add Keymaster 0.4 binder API
Deepanshu Gupta [Tue, 24 Feb 2015 04:52:35 +0000 (04:52 +0000)]
am
01d5286f: am
8f022fd3: am
5ed4fc9e: am
99142d29: am
3f8e2b93: am
30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '
01d5286f388303551a2eb8f57e210f6d7a690cb5':
Set forceFramework correctly for included layouts.
Keisuke Kuroyanagi [Tue, 24 Feb 2015 03:51:46 +0000 (12:51 +0900)]
Paste as plain text by Ctrl-Shift-V
Detect Ctrl-Shft-V in onKeyShortcut() and perform paste
as plain text.
Bug:
19287899
Change-Id: I0b27bf6155222a042eeb61dfbd4544c8312904ce
Alan Viverette [Tue, 24 Feb 2015 01:22:16 +0000 (01:22 +0000)]
Merge "Always apply color filter passed to DrawableContainer.setColorFilter"
Alan Viverette [Tue, 24 Feb 2015 01:21:24 +0000 (17:21 -0800)]
Always apply color filter passed to DrawableContainer.setColorFilter
Bug:
19461256
Change-Id: Id44d276739b868e504139cdf767992039f3e4336
Joe LaPenna [Tue, 24 Feb 2015 00:46:48 +0000 (00:46 +0000)]
am
c0c39516: Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev
* commit '
c0c395162ff14b83694158663470ad60e065d9a9':
Hold a wake lock while dozing when display updates are pending.
Joe LaPenna [Tue, 24 Feb 2015 00:37:14 +0000 (00:37 +0000)]
Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev
James Cook [Tue, 24 Feb 2015 00:17:28 +0000 (16:17 -0800)]
Change UndoManager mOwners from HashMap to ArrayMap
The number of undo operation owners is small (and usually one),
so save memory by switching to ArrayMap.
Bug:
19332904
Change-Id: Ic32cd49c292db2eaab1739cea8e8e518e68bd826
Chris Craik [Tue, 24 Feb 2015 00:20:05 +0000 (00:20 +0000)]
Merge "Fix atrace saveLayer flag logging"
Chris Craik [Wed, 18 Feb 2015 00:42:36 +0000 (16:42 -0800)]
Fix atrace saveLayer flag logging
Change-Id: I5da85284c15316c9db4cc74011b855ef8c2f7cdd
David Friedman [Mon, 23 Feb 2015 23:03:35 +0000 (23:03 +0000)]
Merge "resolved conflicts for merge of
6248cdd5 to master"
Mike Lockwood [Mon, 23 Feb 2015 23:03:35 +0000 (23:03 +0000)]
Merge "Add MIDI Manager API tweaks:"
Chad Brubaker [Mon, 23 Feb 2015 22:53:07 +0000 (22:53 +0000)]
am
cdc70256: am
f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"
* commit '
cdc70256f47b1797520f2bb5c63b21bd441ed8d9':
Add new IKeystoreService methods to KeyStore
Chad Brubaker [Mon, 23 Feb 2015 22:53:01 +0000 (22:53 +0000)]
am
1629f954: am
598f9b2a: Merge "Add Keymaster 0.4 binder API"
* commit '
1629f9543a48e93515395a10c50d0394f8be2774':
Add Keymaster 0.4 binder API
Wale Ogunwale [Mon, 23 Feb 2015 22:51:43 +0000 (22:51 +0000)]
Merge "Don't delete home stack when last task is removed."
Chad Brubaker [Mon, 23 Feb 2015 22:45:11 +0000 (22:45 +0000)]
am
f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"
* commit '
f3c117ca0d116b01174732790be1939282d0a5a0':
Add new IKeystoreService methods to KeyStore