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

201979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
ef396b57c6 Set the bounds on the drawable for ChangeBounds reparenting. 
Bug 24993183

The bounds for the drawable weren't being set, so the
drawable was never drawn to the correct size.

Change-Id: I992951f28ee6fac2ce8752d2dc0e23f51d3cf584
(cherry picked from commit f2a3703696f5dc8b1a0d243051e0db65c2145452)
 2015-10-19 23:42:38 +00:00
Todd Kennedy
2ee19c7f46 Retain fragment loaders 
Remove the partial fix [it did not work for child fragment managers]
and replace with a more general fix that works with all fragments.

Bug: 23838271
Change-Id: I88b465f6a06a6ad627b9651b9e2eea41fae08972
 2015-10-19 16:40:03 -07:00
Adrian Roos
9a345f31f2 Merge "Reload content description of KeyButtonView" into mnc-dr-dev 2015-10-19 23:26:47 +00:00
Todd Kennedy
ec8a4ecc92 Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev 2015-10-19 23:25:04 +00:00
Todd Kennedy
d419d86952 Merge "Set host when restoring a fragment" into mnc-dr-dev 
am: 986d4b482d

* commit '986d4b482da952cd07e329b3bd11c935edd7ec01':
  Set host when restoring a fragment
 2015-10-19 23:22:57 +00:00
Todd Kennedy
17b2b27f64 Merge "Set host when restoring a fragment" into mnc-dr-dev 
am: 986d4b482d

* commit '986d4b482da952cd07e329b3bd11c935edd7ec01':
  Set host when restoring a fragment
 2015-10-19 23:19:51 +00:00
Mathieu Chartier
df0cc41a7b 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
 2015-10-19 23:17:09 +00:00
Svetoslav Ganov
aebff7f1ad Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev 
am: e199016a82

* commit 'e199016a82329b645a86db345c2d39322c8ad03a':
  Don't allow concurrent permission requests.
 2015-10-19 23:13:46 +00:00
Todd Kennedy
986d4b482d Merge "Set host when restoring a fragment" into mnc-dr-dev 2015-10-19 22:52:27 +00:00
Mathieu Chartier
7f2deeeef5 Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev 2015-10-19 22:47:45 +00:00
Mathieu Chartier
2e2069d053 Fix read_mapinfo to recognize free list large object space 
Bug: 25081604

(cherry picked from commit 6421da8f46e2a60da55939d8a4f7d91ab286dfcf)

Change-Id: If676c2309e3e397676fa8cef21405c34db7d5db2
 2015-10-19 15:44:26 -07:00
Svetoslav Ganov
e199016a82 Merge "Don't allow concurrent permission requests." into mnc-dr-dev 2015-10-19 22:41:35 +00:00
Aravind Akella
005d36d1b0 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.
 2015-10-19 21:32:25 +00:00
Aravind Akella
a817c90a7a Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev 2015-10-19 21:15:28 +00:00
Todd Kennedy
ac0e6ca0d2 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
 2015-10-19 12:55:19 -07:00
Aravind Akella
a05df455e8 Fix a possible race condition in SensorManager initialization. 
Bug: 24526176
Change-Id: Ib8bae6eee16a5b787d3c2da6ef03af311cfdfadc
 2015-10-19 12:18:37 -07:00
Geoff Mendal
a6e7b3ae75 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
am: 7ba59c3559  -s ours

* commit '7ba59c35596bd53ebc9b5bed40b2d7bd2e5ac94d':
  Import translations. DO NOT MERGE
 2015-10-19 15:59:20 +00:00
Geoff Mendal
7ba59c3559 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-19 15:55:17 +00:00
Geoff Mendal
c555378f4c Import translations. DO NOT MERGE 
Change-Id: I76444ef3a3911763f41010e0cd0f5015a2f756e9
Auto-generated-cl: translation import
 2015-10-19 08:03:19 -07:00
Geoff Mendal
2a09706e86 Import translations. DO NOT MERGE 
am: 5e4863205e  -s ours

* commit '5e4863205ee459cd8813f45e91b2e67c603d38ef':
  Import translations. DO NOT MERGE
 2015-10-19 14:11:34 +00:00
Geoff Mendal
5e4863205e Import translations. DO NOT MERGE 
Change-Id: Ie8f3e950a4c69ad49e6f370b97398b507d488111
Auto-generated-cl: translation import
 2015-10-19 07:01:55 -07:00
Chris Wren
3472f18e02 am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev 
* commit 'c7f2058cefd00bdce31a77646afa407bdf269809':
  count notification peeks by window action
 2015-10-17 21:35:25 +00:00
Chris Wren
c7f2058cef Merge "count notification peeks by window action" into mnc-dr-dev 2015-10-17 21:30:37 +00:00
Ruben Brunk
7a027807a7 am c03443b2: Fix lens shading map origin calculation. 
* commit 'c03443b23de0b474080168d892cd685283c3285b':
  Fix lens shading map origin calculation.
 2015-10-17 07:01:19 +00:00
Ruben Brunk
c03443b23d Fix lens shading map origin calculation. 
Bug: 24816235
Change-Id: Id4609f3349f86c811cbc3d5e1839f880da926486
 2015-10-17 06:55:15 +00:00
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
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
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
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
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
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
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
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
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
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