OSDN Git Service
Adam Powell [Tue, 20 Oct 2015 01:12:40 +0000 (01:12 +0000)]
Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in" into mnc-dr-dev am:
4ecfbcfdea
am:
eeed032eae
* commit '
eeed032eae1ac03509155fe7002189df054bb8af':
DO NOT MERGE Fix jank when intent resolver/chooser windows animate in
Adam Powell [Tue, 20 Oct 2015 00:54:34 +0000 (00:54 +0000)]
Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in" into mnc-dr-dev
am:
4ecfbcfdea
* commit '
4ecfbcfdeaed67c3a08002069a530fa58582a48b':
DO NOT MERGE Fix jank when intent resolver/chooser windows animate in
Adam Powell [Tue, 20 Oct 2015 00:33:37 +0000 (00:33 +0000)]
Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in" into mnc-dr-dev
Adam Powell [Mon, 19 Oct 2015 23:25:08 +0000 (16:25 -0700)]
DO NOT MERGE Fix jank when intent resolver/chooser windows animate in
An old optimization in ViewRoot prevents updating a window surface
while a window animation is playing. SystemUI and other small system
components that blend these animations disable this for a smoother
experience. Disable it in ResolverActivity as well.
Bug
24989381
Change-Id: Iac7d1c7b1101ed8d2bc4c3557277a773ce871beb
Adrian Roos [Mon, 19 Oct 2015 23:50:19 +0000 (23:50 +0000)]
Merge "Reload content description of KeyButtonView" into mnc-dr-dev am:
9a345f31f2
am:
574b5f71e8
* commit '
574b5f71e80cb5b205dcca2d9ef33820e33a850e':
Reload content description of KeyButtonView
Adrian Roos [Mon, 19 Oct 2015 23:43:32 +0000 (23:43 +0000)]
Merge "Reload content description of KeyButtonView" into mnc-dr-dev
am:
9a345f31f2
* commit '
9a345f31f23fc581f9ce501e854c821e865920ca':
Reload content description of KeyButtonView
Todd Kennedy [Mon, 19 Oct 2015 23:32:29 +0000 (23:32 +0000)]
Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev
am:
ec8a4ecc92
* commit '
ec8a4ecc9210fa509283a860bb91814f28d28a4f':
Todd Kennedy [Mon, 19 Oct 2015 23:31:34 +0000 (23:31 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev am:
986d4b482d
am:
d419d86952
* commit '
d419d86952fd962e34011eb3d989f748e678691d':
Set host when restoring a fragment
Mathieu Chartier [Mon, 19 Oct 2015 23:29:56 +0000 (23:29 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am:
7f2deeeef5
am:
df0cc41a7b
* commit '
df0cc41a7bfa480ce5584420bceda850ad0c56c8':
Fix read_mapinfo to recognize free list large object space
Svetoslav Ganov [Mon, 19 Oct 2015 23:28:55 +0000 (23:28 +0000)]
Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am:
e199016a82
am:
aebff7f1ad
* commit '
aebff7f1ad23299d1ed71e83a3e76619a1a03574':
Don't allow concurrent permission requests.
Adrian Roos [Mon, 19 Oct 2015 23:26:47 +0000 (23:26 +0000)]
Merge "Reload content description of KeyButtonView" into mnc-dr-dev
Todd Kennedy [Mon, 19 Oct 2015 23:25:04 +0000 (23:25 +0000)]
Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev
Todd Kennedy [Mon, 19 Oct 2015 23:22:57 +0000 (23:22 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev
am:
986d4b482d
* commit '
986d4b482da952cd07e329b3bd11c935edd7ec01':
Set host when restoring a fragment
Todd Kennedy [Mon, 19 Oct 2015 23:19:51 +0000 (23:19 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev
am:
986d4b482d
* commit '
986d4b482da952cd07e329b3bd11c935edd7ec01':
Set host when restoring a fragment
Mathieu Chartier [Mon, 19 Oct 2015 23:17:09 +0000 (23:17 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev
am:
7f2deeeef5
* commit '
7f2deeeef53887dcad74b8aed86936983353cec4':
Fix read_mapinfo to recognize free list large object space
Svetoslav Ganov [Mon, 19 Oct 2015 23:13:46 +0000 (23:13 +0000)]
Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev
am:
e199016a82
* commit '
e199016a82329b645a86db345c2d39322c8ad03a':
Don't allow concurrent permission requests.
Todd Kennedy [Mon, 19 Oct 2015 22:52:27 +0000 (22:52 +0000)]
Merge "Set host when restoring a fragment" into mnc-dr-dev
Mathieu Chartier [Mon, 19 Oct 2015 22:47:45 +0000 (22:47 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev
Mathieu Chartier [Mon, 19 Oct 2015 20:48:34 +0000 (13:48 -0700)]
Fix read_mapinfo to recognize free list large object space
Bug:
25081604
(cherry picked from commit
6421da8f46e2a60da55939d8a4f7d91ab286dfcf)
Change-Id: If676c2309e3e397676fa8cef21405c34db7d5db2
Svetoslav Ganov [Mon, 19 Oct 2015 22:41:35 +0000 (22:41 +0000)]
Merge "Don't allow concurrent permission requests." into mnc-dr-dev
Aravind Akella [Mon, 19 Oct 2015 21:36:10 +0000 (21:36 +0000)]
am
005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am:
a817c90a7a
* commit '
005d36d1b0653fccc5aaea2af36a2622f6d74f34':
Fix a possible race condition in SensorManager initialization.
Aravind Akella [Mon, 19 Oct 2015 21:32:25 +0000 (21:32 +0000)]
Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev
am:
a817c90a7a
* commit '
a817c90a7ab296473345b0e106acc9be4e5b678c':
Fix a possible race condition in SensorManager initialization.
Aravind Akella [Mon, 19 Oct 2015 21:15:28 +0000 (21:15 +0000)]
Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev
Todd Kennedy [Mon, 19 Oct 2015 19:48:55 +0000 (12:48 -0700)]
Set host when restoring a fragment
When we restore a fragment [i.e. on configuration change], we need to
make sure the host is set prior to calling into lifecycle methods
such as onInflate(). These use data contained within the host.
Bug:
22512520
Change-Id: I709365a858cfc555ec5b7fc200629fa8d022faad
Aravind Akella [Fri, 16 Oct 2015 21:18:40 +0000 (14:18 -0700)]
Fix a possible race condition in SensorManager initialization.
Bug:
24526176
Change-Id: Ib8bae6eee16a5b787d3c2da6ef03af311cfdfadc
Geoff Mendal [Mon, 19 Oct 2015 16:02:57 +0000 (16:02 +0000)]
am
a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
7ba59c3559 -s ours
* commit '
a6e7b3ae756946212937054bb079da1d472c0cda':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 15:59:20 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
7ba59c3559 -s ours
* commit '
7ba59c35596bd53ebc9b5bed40b2d7bd2e5ac94d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 15:55:17 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 19 Oct 2015 15:03:19 +0000 (08:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I76444ef3a3911763f41010e0cd0f5015a2f756e9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Oct 2015 14:17:11 +0000 (14:17 +0000)]
am
2a09706e: (-s ours) Import translations. DO NOT MERGE am:
5e4863205e -s ours
* commit '
2a09706e86794f6482f005f5bcca2ee513a3b1d9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:11:34 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE
am:
5e4863205e -s ours
* commit '
5e4863205ee459cd8813f45e91b2e67c603d38ef':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:01:55 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie8f3e950a4c69ad49e6f370b97398b507d488111
Auto-generated-cl: translation import
Chris Wren [Sat, 17 Oct 2015 21:41:39 +0000 (21:41 +0000)]
am
3472f18e: am
c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev
* commit '
3472f18e0218c7d7a991da50db8251471fd8c25d':
count notification peeks by window action
Chris Wren [Sat, 17 Oct 2015 21:35:25 +0000 (21:35 +0000)]
am
c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev
* commit '
c7f2058cefd00bdce31a77646afa407bdf269809':
count notification peeks by window action
Chris Wren [Sat, 17 Oct 2015 21:30:37 +0000 (21:30 +0000)]
Merge "count notification peeks by window action" into mnc-dr-dev
Ruben Brunk [Sat, 17 Oct 2015 07:07:32 +0000 (07:07 +0000)]
am
7a027807: am
c03443b2: Fix lens shading map origin calculation.
* commit '
7a027807a73aaa578d8f7a457438daac73158af0':
Fix lens shading map origin calculation.
Ruben Brunk [Sat, 17 Oct 2015 07:01:19 +0000 (07:01 +0000)]
am
c03443b2: Fix lens shading map origin calculation.
* commit '
c03443b23de0b474080168d892cd685283c3285b':
Fix lens shading map origin calculation.
Ruben Brunk [Thu, 15 Oct 2015 00:46:52 +0000 (17:46 -0700)]
Fix lens shading map origin calculation.
Bug:
24816235
Change-Id: Id4609f3349f86c811cbc3d5e1839f880da926486
Adrian Roos [Fri, 16 Oct 2015 23:51:04 +0000 (16:51 -0700)]
Reload content description of KeyButtonView
Reload the content description whenever the
configuration changes.
Bug:
24977838
Change-Id: I875f0d83976b7d007a9bb2e56b28ff8fb6365a38
Selim Cinek [Fri, 16 Oct 2015 23:40:12 +0000 (23:40 +0000)]
am
303e5c41: am
b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev
* commit '
303e5c410c17b2be84051b3692635e6e24e37530':
Stopping chronometers now when the shade is closed
Selim Cinek [Fri, 16 Oct 2015 23:34:43 +0000 (23:34 +0000)]
am
b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev
* commit '
b9a73d2ce34b35684a282c8521d65f52fea1197a':
Stopping chronometers now when the shade is closed
Selim Cinek [Fri, 16 Oct 2015 23:28:46 +0000 (23:28 +0000)]
Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev
Selim Cinek [Mon, 21 Sep 2015 13:47:20 +0000 (15:47 +0200)]
Stopping chronometers now when the shade is closed
Bug:
23978877
Change-Id: I01a9e756d7eeef7aa239ca0c67d4084624aaed12
Bryce Lee [Fri, 16 Oct 2015 22:29:32 +0000 (22:29 +0000)]
am
4c9fcd54: Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev
* commit '
4c9fcd5412a190c6e73f25346cf13c67286fa01e':
Add capability to identify phone accounts that are emergency only.
Matthew Williams [Fri, 16 Oct 2015 22:29:26 +0000 (22:29 +0000)]
am
9a365194: am
1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.
* commit '
9a365194861e78dd5edbebf292aaa7e48804ab46':
DO NOT MERGE Sanity check loaded periodics and cap runtime.
Bryce Lee [Fri, 16 Oct 2015 22:26:48 +0000 (22:26 +0000)]
Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev
Matthew Williams [Fri, 16 Oct 2015 22:25:12 +0000 (22:25 +0000)]
am
1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.
* commit '
1f0ec16b6d5f20ed8b6156eb1b5abf4c73548645':
DO NOT MERGE Sanity check loaded periodics and cap runtime.
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.
Matthew Williams [Thu, 15 Oct 2015 22:59:12 +0000 (15:59 -0700)]
DO NOT MERGE Sanity check loaded periodics and cap runtime.
BUG:
24900376
We've seen an issue where periodic run times can be massively
inflated after loading from disk.
As a safeguard, cap the period's loaded runtime to be [p, 2p]
from the time of loading.
Change-Id: Ie4464490c8d6702fee8efe9190c3da5dc5f013f6
(cherry picked from commit
fa8e5084eed63ab8d92c71fcff656690a30293c3)
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 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
Svetoslav [Thu, 15 Oct 2015 23:54:00 +0000 (16:54 -0700)]
Don't allow concurrent permission requests.
bug:
24690277
Change-Id: Ie8c6eae230cd20e40d32cf688d30f6d40f9a9acd
Chris Wren [Fri, 16 Oct 2015 20:24:20 +0000 (16:24 -0400)]
count notification peeks by window action
Bug:
20751989
Change-Id: I9b1093b98f303656a299c18b503c1d8c9f032335
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.
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: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: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: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.
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
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
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
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: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: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
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.