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

205893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
3bab515b19 Reload content description of KeyButtonView 
Reload the content description whenever the
configuration changes.

Bug: 24977838
Change-Id: I875f0d83976b7d007a9bb2e56b28ff8fb6365a38
 2015-10-16 23:53:12 +00:00
Selim Cinek
4135092ce9 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
 2015-10-16 23:40:12 +00:00
Selim Cinek
303e5c410c 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
 2015-10-16 23:34:43 +00:00
Selim Cinek
b9a73d2ce3 Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev 2015-10-16 23:28:46 +00:00
Selim Cinek
98713a4fcf Stopping chronometers now when the shade is closed 
Bug: 23978877
Change-Id: I01a9e756d7eeef7aa239ca0c67d4084624aaed12
 2015-10-16 15:58:10 -07:00
Bryce Lee
b70426b197 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.
 2015-10-16 22:29:32 +00:00
Matthew Williams
c85315acdf 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.
 2015-10-16 22:29:26 +00:00
Bryce Lee
4c9fcd5412 Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev 2015-10-16 22:26:48 +00:00
Matthew Williams
9a36519486 am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime. 
* commit '1f0ec16b6d5f20ed8b6156eb1b5abf4c73548645':
  DO NOT MERGE Sanity check loaded periodics and cap runtime.
 2015-10-16 22:25:12 +00:00
Roozbeh Pournader
0221328c33 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.
 2015-10-16 22:06:21 +00:00
Roozbeh Pournader
b3538082d7 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.
 2015-10-16 22:01:49 +00:00
Matthew Williams
1f0ec16b6d 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)
 2015-10-16 21:56:55 +00:00
Roozbeh Pournader
5362f273e9 Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 2015-10-16 21:54:12 +00:00
Adrian Roos
3c439c720d 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
 2015-10-16 20:54:40 +00:00
Adrian Roos
85fae34e81 am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 
* commit '70ea857859b78a708fb99ac708ead7bdaddf79a7':
  Fix wrongly laid out navigation color view
 2015-10-16 20:49:59 +00:00
Adrian Roos
70ea857859 Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 2015-10-16 20:43:32 +00:00
Svetoslav
ffb32b1f24 Don't allow concurrent permission requests. 
bug:24690277

Change-Id: Ie8c6eae230cd20e40d32cf688d30f6d40f9a9acd
 2015-10-16 13:42:32 -07:00
Chris Wren
063926bda7 count notification peeks by window action 
Bug: 20751989
Change-Id: I9b1093b98f303656a299c18b503c1d8c9f032335
 2015-10-16 16:26:41 -04:00
Julia Reynolds
542052dd83 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.
 2015-10-16 19:48:47 +00:00
Julia Reynolds
96faf5c8fa 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.
 2015-10-16 19:41:54 +00:00
Julia Reynolds
a762c210d2 Merge "Add 'until next alarm' option to QS zen panel." into mnc-dr-dev 2015-10-16 19:38:22 +00:00
Matthew Williams
6331753e3b 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
 2015-10-16 19:01:55 +00:00
Matthew Williams
b01a963a2d 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
 2015-10-16 18:55:33 +00:00
Matthew Williams
6875011626 Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev 2015-10-16 18:51:48 +00:00
Adam Powell
824347dd8a am d08f339b: am 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev 
* commit 'd08f339bcc80bbf368bb7c7b9ddb77d6a9d613fd':
  Fix ChooserTarget app scoring
 2015-10-16 18:21:58 +00:00
Adam Powell
d08f339bcc am 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev 
* commit '749334bffbc92aeaef27c274a1586fa7365cbfdc':
  Fix ChooserTarget app scoring
 2015-10-16 18:13:19 +00:00
Adam Powell
749334bffb Merge "Fix ChooserTarget app scoring" into mnc-dr-dev 2015-10-16 18:08:36 +00:00
Adam Powell
77a533f5b2 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
 2015-10-16 10:58:08 -07:00
Tyler Gunn
723900d76a 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.
 2015-10-16 17:45:31 +00:00
Tyler Gunn
95b84f5251 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.
 2015-10-16 17:40:19 +00:00
Tyler Gunn
a5917b71b0 Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev 2015-10-16 17:36:40 +00:00
Abodunrinwa Toki
85978d7c36 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.
 2015-10-16 16:49:19 +00:00
Roshan Pius
482e9d9984 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
 2015-10-16 09:45:29 -07:00
Abodunrinwa Toki
a3234f0192 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.
 2015-10-16 16:41:26 +00:00
Abodunrinwa Toki
9c76f61dea Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev 2015-10-16 16:36:28 +00:00
Jeff Sharkey
d56756fdee am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev 
* commit '535726f637d952f172e7758e4f0faf725a838add':
  Update docs to reflect adoptable behavior.
 2015-10-16 16:33:18 +00:00
Wale Ogunwale
ad8e78c703 am 29ffdc91: am be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev 
* commit '29ffdc91b8a6adeab036d56cb57cbd363a0196d0':
  Disassociate system windows from apps
 2015-10-16 16:28:26 +00:00
Jeff Sharkey
535726f637 am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev 
* commit '0c15693e8de6f89fab7ca3d582f0a8605a54df9f':
  Update docs to reflect adoptable behavior.
 2015-10-16 16:25:38 +00:00
Wale Ogunwale
29ffdc91b8 am be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev 
* commit 'be6555105a9325d0b7073c08a0bd4dc0b5ce1fb3':
  Disassociate system windows from apps
 2015-10-16 16:18:45 +00:00
Jeff Sharkey
0c15693e8d Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev 2015-10-16 16:18:38 +00:00
Wale Ogunwale
be6555105a Merge "Disassociate system windows from apps" into mnc-dr-dev 2015-10-16 16:14:45 +00:00
tiger_huang
20ebb4c2d4 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:
a5d29971f8
15ed2754a3
c3672cd3f7
41725dedc3

Bug: 24967303
Bug: https://code.google.com/p/android/issues/detail?id=189710

Change-Id: I515e47bafcf39a2b1bdf92f11f623bef8fb6263c
 2015-10-16 08:21:45 -07:00
Abodunrinwa Toki
a6200068af DO NOT MERGE: Reduce delay of floating toolbar appearance. 
Bug: 21956394
Change-Id: I3db39e84afd3474b5bb53522c5a4c738ec1511bf
 2015-10-16 16:01:00 +01:00
Roozbeh Pournader
431e506b53 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
 2015-10-16 02:49:13 -07:00
Sanket Padawe
cf471efd5f 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.
 2015-10-16 00:51:49 +00:00
Sanket Padawe
001a651e4b 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.
 2015-10-16 00:41:44 +00:00
Sanket Padawe
8d6d735fa8 Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev 2015-10-16 00:38:55 +00:00
Matthew Williams
b91987634b 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)
 2015-10-15 23:33:06 +00:00
Dianne Hackborn
401f68b93a 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
 2015-10-15 23:19:06 +00:00
Alan Viverette
b36aebbe69 am ffa8fd0e: am 6a032a3a: Don\'t project ripple for adequately tall spinners 
* commit 'ffa8fd0ed4a624833e1da10cbabeec175eef7b35':
  Don't project ripple for adequately tall spinners
 2015-10-15 23:19:00 +00:00