OSDN Git Service
Roozbeh Pournader [Fri, 16 Oct 2015 22:12:46 +0000 (22:12 +0000)]
am
0221328c: am
b3538082: am
5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
* commit '
0221328c3381680631d783c2b9733430f8b0555d':
Fix line height problem with inline images in StaticLayout.
Roozbeh Pournader [Fri, 16 Oct 2015 22:06:21 +0000 (22:06 +0000)]
am
b3538082: am
5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
* commit '
b3538082d78284165ff0dbe5a04992afe2018d0b':
Fix line height problem with inline images in StaticLayout.
Roozbeh Pournader [Fri, 16 Oct 2015 22:01:49 +0000 (22:01 +0000)]
am
5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
* commit '
5362f273e91885041b7cb246667cff3ceca74703':
Fix line height problem with inline images in StaticLayout.
Roozbeh Pournader [Fri, 16 Oct 2015 21:54:12 +0000 (21:54 +0000)]
Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
Adrian Roos [Fri, 16 Oct 2015 21:12:06 +0000 (21:12 +0000)]
am
3c439c72: am
85fae34e: am
70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev
* commit '
3c439c720d460266358c10d8d2eea9ef9e79beb0':
Fix wrongly laid out navigation color view
Adrian Roos [Fri, 16 Oct 2015 20:54:40 +0000 (20:54 +0000)]
am
85fae34e: am
70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev
* commit '
85fae34e8146eaa25aea7f1d9a68effa0db3ce8e':
Fix wrongly laid out navigation color view
Adrian Roos [Fri, 16 Oct 2015 20:49:59 +0000 (20:49 +0000)]
am
70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev
* commit '
70ea857859b78a708fb99ac708ead7bdaddf79a7':
Fix wrongly laid out navigation color view
Adrian Roos [Fri, 16 Oct 2015 20:43:32 +0000 (20:43 +0000)]
Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev
Julia Reynolds [Fri, 16 Oct 2015 19:55:25 +0000 (19:55 +0000)]
am
542052dd: am
96faf5c8: am
a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev
* commit '
542052dd83e89f7cebc07aa0004a8592efc12364':
Add 'until next alarm' option to QS zen panel.
Julia Reynolds [Fri, 16 Oct 2015 19:48:47 +0000 (19:48 +0000)]
am
96faf5c8: am
a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev
* commit '
96faf5c8fad5114dda807eee1c94a1c0dc021fe8':
Add 'until next alarm' option to QS zen panel.
Julia Reynolds [Fri, 16 Oct 2015 19:41:54 +0000 (19:41 +0000)]
am
a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev
* commit '
a762c210d2901bedce5b7972eb139c4d5e59dcd1':
Add 'until next alarm' option to QS zen panel.
Matthew Williams [Fri, 16 Oct 2015 19:39:23 +0000 (19:39 +0000)]
am
6331753e: am
b01a963a: am
68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev
* commit '
6331753e3ba9d6c66c562836f28f3b6e1e178ecd':
DO NOT MERGE Change scheduling logic to run network jobs sooner
Julia Reynolds [Fri, 16 Oct 2015 19:38:22 +0000 (19:38 +0000)]
Merge "Add 'until next alarm' option to QS zen panel." into mnc-dr-dev
Matthew Williams [Fri, 16 Oct 2015 19:01:55 +0000 (19:01 +0000)]
am
b01a963a: am
68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev
* commit '
b01a963a2dd3e4e84eee18f691efdc7856d16ff0':
DO NOT MERGE Change scheduling logic to run network jobs sooner
Matthew Williams [Fri, 16 Oct 2015 18:55:33 +0000 (18:55 +0000)]
am
68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev
* commit '
6875011626e5815473b5d19ddc92d4888bad29f4':
DO NOT MERGE Change scheduling logic to run network jobs sooner
Matthew Williams [Fri, 16 Oct 2015 18:51:48 +0000 (18:51 +0000)]
Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev
Adam Powell [Fri, 16 Oct 2015 18:27:05 +0000 (18:27 +0000)]
am
824347dd: am
d08f339b: am
749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev
* commit '
824347dd8afc3b8b40e28e4b5d0743b56e341b98':
Fix ChooserTarget app scoring
Adam Powell [Fri, 16 Oct 2015 18:21:58 +0000 (18:21 +0000)]
am
d08f339b: am
749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev
* commit '
d08f339bcc80bbf368bb7c7b9ddb77d6a9d613fd':
Fix ChooserTarget app scoring
Adam Powell [Fri, 16 Oct 2015 18:13:19 +0000 (18:13 +0000)]
am
749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev
* commit '
749334bffbc92aeaef27c274a1586fa7365cbfdc':
Fix ChooserTarget app scoring
Adam Powell [Fri, 16 Oct 2015 18:08:36 +0000 (18:08 +0000)]
Merge "Fix ChooserTarget app scoring" into mnc-dr-dev
Adam Powell [Fri, 16 Oct 2015 17:47:32 +0000 (10:47 -0700)]
Fix ChooserTarget app scoring
An initial sorting step before applying modifiers to the ChooserTarget
scores provided by apps was backwards, causing subsequent target
scores to be heavily penalized. Targets are then heavily influenced by
the lowest score in the set relative to the targets from other apps.
Bug
25013559
Change-Id: I39d5d7c601712fc6a19e694d5846d2c8d17a214f
Tyler Gunn [Fri, 16 Oct 2015 17:52:17 +0000 (17:52 +0000)]
am
723900d7: am
95b84f52: am
a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev
* commit '
723900d76a45e8974f357333b72a7df0a7ec4fca':
DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
Tyler Gunn [Fri, 16 Oct 2015 17:45:31 +0000 (17:45 +0000)]
am
95b84f52: am
a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev
* commit '
95b84f52517548adbd0dff7a22c41c5c4d249c44':
DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
Tyler Gunn [Fri, 16 Oct 2015 17:40:19 +0000 (17:40 +0000)]
am
a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev
* commit '
a5917b71b0e2f98fa6906b795b28cab059cc092b':
DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
Tyler Gunn [Fri, 16 Oct 2015 17:36:40 +0000 (17:36 +0000)]
Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev
Abodunrinwa Toki [Fri, 16 Oct 2015 16:56:38 +0000 (16:56 +0000)]
am
85978d7c: am
a3234f01: am
9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev
* commit '
85978d7c36e94f107bd72166bc18f893b4817cf9':
DO NOT MERGE: Reduce delay of floating toolbar appearance.
Abodunrinwa Toki [Fri, 16 Oct 2015 16:49:19 +0000 (16:49 +0000)]
am
a3234f01: am
9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev
* commit '
a3234f01927e6908cc4e08ddcff9c1646d5a91bb':
DO NOT MERGE: Reduce delay of floating toolbar appearance.
Roshan Pius [Fri, 14 Aug 2015 19:58:08 +0000 (12:58 -0700)]
DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network. Setting it to 100ms by default.
This is based on a similar set of changes for IMS calls: ag/747865.
BUG:
19118840
Change-Id: Ifb64fe406509fe7c401ad1c4b4e906d6643e327b
Abodunrinwa Toki [Fri, 16 Oct 2015 16:41:26 +0000 (16:41 +0000)]
am
9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev
* commit '
9c76f61dea69e21eba3b89adbc2a00bcb522584e':
DO NOT MERGE: Reduce delay of floating toolbar appearance.
Jeff Sharkey [Fri, 16 Oct 2015 16:38:29 +0000 (16:38 +0000)]
am
d56756fd: am
535726f6: am
0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev
* commit '
d56756fdee9fce3d08bea769710d7173bcbc263a':
Update docs to reflect adoptable behavior.
Abodunrinwa Toki [Fri, 16 Oct 2015 16:36:28 +0000 (16:36 +0000)]
Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev
Wale Ogunwale [Fri, 16 Oct 2015 16:33:48 +0000 (16:33 +0000)]
am
ad8e78c7: am
29ffdc91: am
be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev
* commit '
ad8e78c7033b2f5977f779ff8d85a4a8a690d362':
Disassociate system windows from apps
Jeff Sharkey [Fri, 16 Oct 2015 16:33:18 +0000 (16:33 +0000)]
am
535726f6: am
0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev
* commit '
535726f637d952f172e7758e4f0faf725a838add':
Update docs to reflect adoptable behavior.
Wale Ogunwale [Fri, 16 Oct 2015 16:28:26 +0000 (16:28 +0000)]
am
29ffdc91: am
be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev
* commit '
29ffdc91b8a6adeab036d56cb57cbd363a0196d0':
Disassociate system windows from apps
Jeff Sharkey [Fri, 16 Oct 2015 16:25:38 +0000 (16:25 +0000)]
am
0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev
* commit '
0c15693e8de6f89fab7ca3d582f0a8605a54df9f':
Update docs to reflect adoptable behavior.
Wale Ogunwale [Fri, 16 Oct 2015 16:18:45 +0000 (16:18 +0000)]
am
be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev
* commit '
be6555105a9325d0b7073c08a0bd4dc0b5ce1fb3':
Disassociate system windows from apps
Jeff Sharkey [Fri, 16 Oct 2015 16:18:38 +0000 (16:18 +0000)]
Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev
Wale Ogunwale [Fri, 16 Oct 2015 16:14:45 +0000 (16:14 +0000)]
Merge "Disassociate system windows from apps" into mnc-dr-dev
tiger_huang [Tue, 13 Oct 2015 13:38:19 +0000 (21:38 +0800)]
Disassociate system windows from apps
With the original logic, if an app creates a system window, when the
user goes to home screen, the system window will be still there and
become unable to receive input events, because the system window will
be also changed to the stopped state with the app window, and the
current logic of ViewRootImpl forbid a stopped window receiving input
events.
This change prevents assigning the token of the app window to system
windows created by the app, so that when the app goes to the stopped
state, its system windows won't be affected (can still receive input
events).
This change is related to the following changes:
https://android.googlesource.com/platform/frameworks/base/+/
a5d29971f8f4d463348e9de0f7af7e2e92a377a0
https://android.googlesource.com/platform/frameworks/base/+/
15ed2754a308546a54ab1061b4e365d6fe9b898d
https://android.googlesource.com/platform/frameworks/base/+/
c3672cd3f7e2bd87d6de9dada499de82b62fae84
https://android.googlesource.com/platform/frameworks/base/+/
41725dedc33906aaafee36b2d6523596e2a8a52e
Bug:
24967303
Bug: https://code.google.com/p/android/issues/detail?id=189710
Change-Id: I515e47bafcf39a2b1bdf92f11f623bef8fb6263c
Abodunrinwa Toki [Fri, 16 Oct 2015 14:54:53 +0000 (15:54 +0100)]
DO NOT MERGE: Reduce delay of floating toolbar appearance.
Bug:
21956394
Change-Id: I3db39e84afd3474b5bb53522c5a4c738ec1511bf
Wale Ogunwale [Fri, 16 Oct 2015 14:00:47 +0000 (14:00 +0000)]
am
fceaedda: am
75693994: Merge "Disassociate system windows from apps"
* commit '
fceaedda41f9133a4d4213720b15950ef43dd00c':
Disassociate system windows from apps
Wale Ogunwale [Fri, 16 Oct 2015 13:54:54 +0000 (13:54 +0000)]
am
75693994: Merge "Disassociate system windows from apps"
* commit '
75693994f60bdec9a10db98ddb8addd2bc3f8bbb':
Disassociate system windows from apps
Wale Ogunwale [Fri, 16 Oct 2015 13:50:35 +0000 (13:50 +0000)]
Merge "Disassociate system windows from apps"
Roozbeh Pournader [Fri, 16 Oct 2015 09:27:03 +0000 (02:27 -0700)]
Fix line height problem with inline images in StaticLayout.
Previously, paragraphs with ImageSpans in their middle would continue to
carry the height of the image into the line height of next lines. This was
a regression from L.
The bug was due to StaticLayout's out() method almost always
modifying the value of its parameter "fm", although that was only
intended when there were LineHeightSpans in the text. The method
generate() was assuming that it can restore fmTop etc to metrics of
the current span by setting them from "fm" after out() was run, while
"fm" was modified by out() and its original values was lost!
The fix makes sure to set chooseHt back to null if there were no
LineHeightSpans, so out() would not modify "fm" unless necessary.
AOSP bug: https://code.google.com/p/android/issues/detail?id=188042
Bug:
24548073
Change-Id: I0d00af384c35a9d863377972318da9db7668118f
tiger_huang [Tue, 13 Oct 2015 13:38:19 +0000 (21:38 +0800)]
Disassociate system windows from apps
With the original logic, if an app creates a system window, when the
user goes to home screen, the system window will be still there and
become unable to receive input events, because the system window will
be also changed to the stopped state with the app window, and the
current logic of ViewRootImpl forbid a stopped window receiving input
events.
This change prevents assigning the token of the app window to system
windows created by the app, so that when the app goes to the stopped
state, its system windows won't be affected (can still receive input
events).
This change is related to the following changes:
https://android.googlesource.com/platform/frameworks/base/+/
a5d29971f8f4d463348e9de0f7af7e2e92a377a0
https://android.googlesource.com/platform/frameworks/base/+/
15ed2754a308546a54ab1061b4e365d6fe9b898d
https://android.googlesource.com/platform/frameworks/base/+/
c3672cd3f7e2bd87d6de9dada499de82b62fae84
https://android.googlesource.com/platform/frameworks/base/+/
41725dedc33906aaafee36b2d6523596e2a8a52e
Bug:
https://code.google.com/p/android/issues/detail?id=189710
Change-Id: I515e47bafcf39a2b1bdf92f11f623bef8fb6263c
Sanket Padawe [Fri, 16 Oct 2015 00:57:02 +0000 (00:57 +0000)]
am
cf471efd: am
001a651e: am
8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev
* commit '
cf471efd5f722a4cb7c1094e30b111ef312ef133':
Mask IccId which gets printed in bug reports & radio logs.
Sanket Padawe [Fri, 16 Oct 2015 00:51:49 +0000 (00:51 +0000)]
am
001a651e: am
8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev
* commit '
001a651e4b0919239f09b25ae99d132585b5d382':
Mask IccId which gets printed in bug reports & radio logs.
Sanket Padawe [Fri, 16 Oct 2015 00:41:44 +0000 (00:41 +0000)]
am
8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev
* commit '
8d6d735fa8cea74f53ba29063b72b856fef69d8e':
Mask IccId which gets printed in bug reports & radio logs.
Sanket Padawe [Fri, 16 Oct 2015 00:38:55 +0000 (00:38 +0000)]
Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev
Matthew Williams [Thu, 15 Oct 2015 23:08:05 +0000 (16:08 -0700)]
DO NOT MERGE Change scheduling logic to run network jobs sooner
BUG:
24385082
BUG:
23144425
BUG:
18117279
Run jobs with connectivity constraints as soon as the developer-allotted
delay has expired, rather than waiting for the override deadline. This
is more in tune with what developers expect, although it reduces the
amount of batching the scheduler can theoretically do.
This will also have the side effect of fixing several failing cts
tests that started breaking b/c the signal to 'run connectivity
jobs early' was removed in M and nothing was put in to replace it.
Change-Id: I7e63c2b62f2882ee906f748445bbf10c32e19c5f
(cherry picked from commit
aa9843198dec910a581bdc509d3937a9ea6ceca9)
Dianne Hackborn [Thu, 15 Oct 2015 23:22:10 +0000 (23:22 +0000)]
am
401f68b9: am
510f03c5: am
56f41971: Merge "Fix issue #
24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev
* commit '
401f68b93aa9eca88d8dd126b92128bdc3371064':
Fix issue #
24571425: Device does not come out of idle mode for maintenance
Alan Viverette [Thu, 15 Oct 2015 23:22:04 +0000 (23:22 +0000)]
am
b36aebbe: am
ffa8fd0e: am
6a032a3a: Don\'t project ripple for adequately tall spinners
* commit '
b36aebbe69c368294694a0c7c84e692167132037':
Don't project ripple for adequately tall spinners
Dianne Hackborn [Thu, 15 Oct 2015 23:19:06 +0000 (23:19 +0000)]
am
510f03c5: am
56f41971: Merge "Fix issue #
24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev
* commit '
510f03c5ac057122569264bd005b2e26f96236ae':
Fix issue #
24571425: Device does not come out of idle mode for maintenance
Alan Viverette [Thu, 15 Oct 2015 23:19:00 +0000 (23:19 +0000)]
am
ffa8fd0e: am
6a032a3a: Don\'t project ripple for adequately tall spinners
* commit '
ffa8fd0ed4a624833e1da10cbabeec175eef7b35':
Don't project ripple for adequately tall spinners
Dianne Hackborn [Thu, 15 Oct 2015 23:12:39 +0000 (23:12 +0000)]
am
56f41971: Merge "Fix issue #
24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev
* commit '
56f41971483647e954179301ae40180063d0eba8':
Fix issue #
24571425: Device does not come out of idle mode for maintenance
Alan Viverette [Thu, 15 Oct 2015 23:12:34 +0000 (23:12 +0000)]
am
6a032a3a: Don\'t project ripple for adequately tall spinners
* commit '
6a032a3aba3741ce55679b97c2f048b523d465de':
Don't project ripple for adequately tall spinners
Dianne Hackborn [Thu, 15 Oct 2015 23:11:12 +0000 (23:11 +0000)]
Merge "Fix issue #
24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev
Alan Viverette [Thu, 15 Oct 2015 22:50:21 +0000 (15:50 -0700)]
Don't project ripple for adequately tall spinners
Bug:
24674907
Change-Id: I1674c14f321600a40ca20adab1d40459963d2d1b
Sanket Padawe [Thu, 15 Oct 2015 22:46:39 +0000 (15:46 -0700)]
Mask IccId which gets printed in bug reports & radio logs.
Bug:
24941148
Change-Id: Ibe397f5d9b0da245e3e64f626937db4792c7f3c2
Adrian Roos [Thu, 15 Oct 2015 22:38:38 +0000 (15:38 -0700)]
Fix wrongly laid out navigation color view
The SystemUI visibility listener in DecorView
gets called between the measure and layout passes
and is therefore not allowed to change layout parameters.
This change makes sure that changes to the color view
layout parameters are applied eagerly when the insets
change instead of waiting for the views to become visible.
Bug:
24614374
Change-Id: If9df18f582163d0869c28a852c36697b1ce50621
Dianne Hackborn [Thu, 15 Oct 2015 21:51:06 +0000 (14:51 -0700)]
Fix issue #
24571425: Device does not come out of idle mode for maintenance
Don't allow alarms to push the idle maintenance alarm later
than it was set for.
Change-Id: I947718ffc9d2b984a793d7e4f2d027d8ddeee41b
Julia Reynolds [Thu, 1 Oct 2015 18:34:22 +0000 (14:34 -0400)]
Add 'until next alarm' option to QS zen panel.
Unlike the implementation in LMR1, this is a countdown condition
(a countdown until the time of what was the next alarm when the
rule was created). The rule will not change if alarms change.
Also, alarms up to 7 days in the future will be considered.
Bug:
21648799
Change-Id: Id7fa9dbdbad1539e4da19b1d0e0c4395bb13e6cb
(cherry picked from commit
0842fe87b27b9e4a7aecfec25b93dba2d39f398a)
Rob Carr [Thu, 15 Oct 2015 18:53:59 +0000 (18:53 +0000)]
am
0a543fac: am
111b378a: am
575b629e: Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-dev
* commit '
0a543fac0f30c38d791cb108e521998333363104':
WindowStateAnimation: Clear transformation clip rect.
Rob Carr [Thu, 15 Oct 2015 18:46:57 +0000 (18:46 +0000)]
am
111b378a: am
575b629e: Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-dev
* commit '
111b378a4e20b9eb2deada94458bae16b91601ff':
WindowStateAnimation: Clear transformation clip rect.
Rob Carr [Thu, 15 Oct 2015 18:42:07 +0000 (18:42 +0000)]
am
575b629e: Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-dev
* commit '
575b629ef8e21cca5a40acaafeee7653d90956fe':
WindowStateAnimation: Clear transformation clip rect.
Rob Carr [Thu, 15 Oct 2015 18:38:28 +0000 (18:38 +0000)]
Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-dev
Brian Carlstrom [Thu, 15 Oct 2015 16:12:20 +0000 (16:12 +0000)]
am
b9a28ae1: am
f916524f: Merge "Add support for --user to "pm path" for work profile use"
* commit '
b9a28ae199ad44b07682f7417bc146acdc411c2a':
Add support for --user to "pm path" for work profile use
Brian Carlstrom [Thu, 15 Oct 2015 16:02:57 +0000 (16:02 +0000)]
am
f916524f: Merge "Add support for --user to "pm path" for work profile use"
* commit '
f916524f44c9955e7c747e5319d17c46a61a3c4c':
Add support for --user to "pm path" for work profile use
Brian Carlstrom [Thu, 15 Oct 2015 15:55:45 +0000 (15:55 +0000)]
Merge "Add support for --user to "pm path" for work profile use"
Julia Reynolds [Thu, 15 Oct 2015 13:59:47 +0000 (13:59 +0000)]
am
cad75a26: am
627bc805: am
ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-dev
* commit '
cad75a2636ea53017686d6d565c60e92cdfac161':
Update volume slider on device changed.
Julia Reynolds [Thu, 15 Oct 2015 13:53:30 +0000 (13:53 +0000)]
am
627bc805: am
ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-dev
* commit '
627bc805b839b953fedd5a72d107fafed47aff6f':
Update volume slider on device changed.
Julia Reynolds [Thu, 15 Oct 2015 13:48:21 +0000 (13:48 +0000)]
am
ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-dev
* commit '
ae5a53d78cac72b73574b874a4d12ae9de708101':
Update volume slider on device changed.
Julia Reynolds [Thu, 15 Oct 2015 13:44:04 +0000 (13:44 +0000)]
Merge "Update volume slider on device changed." into mnc-dr-dev
Julia Reynolds [Thu, 15 Oct 2015 13:43:17 +0000 (13:43 +0000)]
am
86fdb662: am
4f836839: am
67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev
* commit '
86fdb662a3d9c34099248910756ca18cd0b3b2f1':
Selectively show zen footer.
Julia Reynolds [Thu, 15 Oct 2015 13:39:28 +0000 (13:39 +0000)]
am
4f836839: am
67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev
* commit '
4f836839c19aed433e7b1913ce05ccb129743fd7':
Selectively show zen footer.
Julia Reynolds [Thu, 15 Oct 2015 13:33:35 +0000 (13:33 +0000)]
am
67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev
* commit '
67ea77ec3fd838e1a367ad6f367970599e599a99':
Selectively show zen footer.
Julia Reynolds [Thu, 15 Oct 2015 13:29:51 +0000 (13:29 +0000)]
Merge "Selectively show zen footer." into mnc-dr-dev
Chris Thornton [Thu, 15 Oct 2015 01:43:57 +0000 (01:43 +0000)]
am
11543a1b: am
ea5ad487: am
d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev
* commit '
11543a1b852e5e87d37f5fbe95131d0f1d9afbee':
Don't call StopRecognition when recognition was aborted.
Chris Thornton [Thu, 15 Oct 2015 01:33:36 +0000 (01:33 +0000)]
am
ea5ad487: am
d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev
* commit '
ea5ad4872ec9efb27c33796e60458b4a1e3905f4':
Don't call StopRecognition when recognition was aborted.
Chris Thornton [Thu, 15 Oct 2015 01:28:39 +0000 (01:28 +0000)]
am
d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev
* commit '
d8ef44bc51a4a27cd9a57c880a367636a1377082':
Don't call StopRecognition when recognition was aborted.
Chris Thornton [Thu, 15 Oct 2015 01:24:45 +0000 (01:24 +0000)]
Merge "Don't call StopRecognition when recognition was aborted." into mnc-dr-dev
Dianne Hackborn [Thu, 15 Oct 2015 01:16:00 +0000 (01:16 +0000)]
am
522222bc: am
f96ca344: am
75765dbe: am
e34445f1: Merge "Docs only change: update build version docs." into mnc-dev
* commit '
522222bc9bbfb6d62e101eaa6af2668277143e19':
Docs only change: update build version docs.
Dianne Hackborn [Thu, 15 Oct 2015 01:12:35 +0000 (01:12 +0000)]
am
f96ca344: am
75765dbe: am
e34445f1: Merge "Docs only change: update build version docs." into mnc-dev
* commit '
f96ca3441ea1a22e4d9e4402942ddce4a3234860':
Docs only change: update build version docs.
Dianne Hackborn [Thu, 15 Oct 2015 01:05:54 +0000 (01:05 +0000)]
am
75765dbe: am
e34445f1: Merge "Docs only change: update build version docs." into mnc-dev
* commit '
75765dbe48ed38d7044f458062510a9082750049':
Docs only change: update build version docs.
Dianne Hackborn [Thu, 15 Oct 2015 01:01:12 +0000 (01:01 +0000)]
am
e34445f1: Merge "Docs only change: update build version docs." into mnc-dev
* commit '
e34445f11a6a14dd30ba0e018b82e852ef82ecbc':
Docs only change: update build version docs.
Dianne Hackborn [Thu, 15 Oct 2015 00:56:05 +0000 (00:56 +0000)]
Merge "Docs only change: update build version docs." into mnc-dev
Adrian Roos [Thu, 15 Oct 2015 00:54:34 +0000 (00:54 +0000)]
am
67255b44: am
c007c150: am
8630e18a: am
31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev
* commit '
67255b4403df91d8405506ecac6965367093cd6b':
Send next alarm's show intent via PendingIntent
Robert Carr [Fri, 25 Sep 2015 21:56:38 +0000 (14:56 -0700)]
WindowStateAnimation: Clear transformation clip rect.
Ensure the clip rect taken from transformations is cleared
when there is no transformation. Normally the failure to
clear the clip would not cause a problem, as the final clip
would be equal to the window size. However, in the event that
the window scale goes on to change (WindowState::m(H/V)Scale that is)
the clip will now be specified at the inappropriate scale (notice the
way the clip must be divided by H/VScale as SurfaceFlinger will apply
the surface transform to the clip).
Bug:
24298694
Change-Id: I4548e8ecea8d66d4942e99823653a7b05f87cea0
(cherry picked from commit
2f0fe62c5426533ccdf9ec7ef28027c367286979)
Adrian Roos [Thu, 15 Oct 2015 00:45:23 +0000 (00:45 +0000)]
am
c007c150: am
8630e18a: am
31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev
* commit '
c007c150d5f56305e84af44d7993d8f2e6a4fc78':
Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 15 Oct 2015 00:40:45 +0000 (00:40 +0000)]
am
8630e18a: am
31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev
* commit '
8630e18a297801238efcba8760e8d850d8920a80':
Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 15 Oct 2015 00:35:33 +0000 (00:35 +0000)]
am
31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev
* commit '
31f19c444f5f9d22c81fcb339e51bee465ba10f9':
Send next alarm's show intent via PendingIntent
Roozbeh Pournader [Thu, 15 Oct 2015 00:31:44 +0000 (00:31 +0000)]
am
f12a7499: am
9407aa7c: am
63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev
* commit '
f12a7499dee29904ef15d4f7f9ef60e0ebc4c341':
Load binary hyphen data files
Adrian Roos [Thu, 15 Oct 2015 00:29:56 +0000 (00:29 +0000)]
Merge "Send next alarm's show intent via PendingIntent" into mnc-dev
Roozbeh Pournader [Thu, 15 Oct 2015 00:27:29 +0000 (00:27 +0000)]
am
9407aa7c: am
63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev
* commit '
9407aa7cf0b369d31bd6c69f9c26bdf6a1f44fe9':
Load binary hyphen data files
Roozbeh Pournader [Thu, 15 Oct 2015 00:22:43 +0000 (00:22 +0000)]
am
63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev
* commit '
63aa02e47fa0fdd877b9fde7f1f6eda75b645f92':
Load binary hyphen data files
Roozbeh Pournader [Thu, 15 Oct 2015 00:18:36 +0000 (00:18 +0000)]
Merge "Load binary hyphen data files" into mnc-dr-dev
Adam Powell [Thu, 15 Oct 2015 00:08:14 +0000 (00:08 +0000)]
am
bd4d81b0: am
b248077a: am
2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev
* commit '
bd4d81b08cc5d961da294c683a73c6c13e3eb931':
Fix bugs introduced in ChooserActivity
Adam Powell [Thu, 15 Oct 2015 00:01:29 +0000 (00:01 +0000)]
am
b248077a: am
2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev
* commit '
b248077a8a239fe6fe28775a7472a89ff42fdec3':
Fix bugs introduced in ChooserActivity
Amit Mahajan [Wed, 14 Oct 2015 23:54:08 +0000 (23:54 +0000)]
am
a41ea5e9: am
8fb8c37c: am
7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev
* commit '
a41ea5e95092674983ab4ae97788184c27ed64b6':
Adding config to allow/disallow user to add APNs.
Adam Powell [Wed, 14 Oct 2015 23:52:14 +0000 (23:52 +0000)]
am
2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev
* commit '
2eac005bbfc94a774c0a3f870fd393a3e7389f8c':
Fix bugs introduced in ChooserActivity
OSDN Git Service
