vandwalle
f0807353aa
fix configure 5GHz RSSI thresholds, Bug:17514073
...
Change-Id: I5cdecabdfc7a085d4b277096d05cc215f7db4104
2014-09-17 14:55:10 -07:00
John Reck
f93a4c0103
am 5c19146f: am 8523ad90: Merge "Change default fbo cache size to 0" into lmp-dev
...
* commit '5c19146fc6d096a29b0da5dbf9581b85f25e9637':
Change default fbo cache size to 0
2014-09-17 21:54:35 +00:00
Michael Wright
77ebdcbaaa
Merge "Remove Rhodi keylayout" into lmp-dev
2014-09-17 21:44:57 +00:00
David Christie
2e0d1cb458
am 4233ee4b: am b2e91428: Merge "Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515" into lmp-dev
...
* commit '4233ee4be72d801e2ddf0508b7df2a58b7168a17':
Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515
2014-09-17 21:43:07 +00:00
John Reck
f98dc4f2e6
am 8523ad90: Merge "Change default fbo cache size to 0" into lmp-dev
...
* commit '8523ad90bbbdee595ca302e775f0cf3ff8c41424':
Change default fbo cache size to 0
2014-09-17 21:42:47 +00:00
John Reck
5083943ff8
Merge "Change default fbo cache size to 0" into lmp-dev
2014-09-17 21:35:02 +00:00
David Christie
a1a97a4c8d
am b2e91428: Merge "Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515" into lmp-dev
...
* commit 'b2e914287fc6a7cc4894ea67ec527830c53f0039':
Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515
2014-09-17 21:31:07 +00:00
David Christie
61ee1eda0a
Merge "Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515" into lmp-dev
2014-09-17 21:20:27 +00:00
Yigit Boyar
9c568e6592
am bb837c51: am 7fa36f26: Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev
...
* commit 'bb837c5128bf370d7fef208ccd913ccf4d99db1b':
Handle action mode changes properly for actionbar tabs
2014-09-17 21:18:56 +00:00
John Reck
e9cd97ee88
Change default fbo cache size to 0
...
Bug: 17479800
FBO cache is very expensive and no longer necessary, disable
it by just setting size to 0.
Change-Id: I664616f262c8339919e1d20baaafa5de2b628d7e
2014-09-17 14:09:26 -07:00
Yigit Boyar
27abd85f5c
am 7fa36f26: Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev
...
* commit '7fa36f26c6705346e41f81f6d3f2f8a22dd3b42c':
Handle action mode changes properly for actionbar tabs
2014-09-17 21:08:23 +00:00
Yigit Boyar
fd20f196b1
Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev
2014-09-17 21:00:40 +00:00
Sandeep Siddhartha
d6f566890b
am aea51189: am e80c6f17: Merge "Fix issues with multiple languages and multi-users" into lmp-dev
...
* commit 'aea511894e97fbb279e28b0552d153167fbcd028':
Fix issues with multiple languages and multi-users
2014-09-17 20:27:08 +00:00
Sandeep Siddhartha
329489abdd
am e80c6f17: Merge "Fix issues with multiple languages and multi-users" into lmp-dev
...
* commit 'e80c6f17079155855aa11eae47b619af0ebb591c':
Fix issues with multiple languages and multi-users
2014-09-17 20:21:05 +00:00
Dianne Hackborn
bb8aa5a1e9
Work on issue #17506095 : Add ability to lock IME for specified apps
...
Add a new configuration to speciify apps that partcipate in the
feature.
Change-Id: I8f5139b5ea09e758bff4472b2294df8becc74614
2014-09-17 13:20:38 -07:00
Sandeep Siddhartha
80ea66b102
Merge "Fix issues with multiple languages and multi-users" into lmp-dev
2014-09-17 20:06:43 +00:00
Dianne Hackborn
6cfbb71890
Fix issue #17536024 : The am start's wait option doesn't...
...
...give time in some cases
This switch to multiple stacks broke the check to determine if it
should actually wait for a new activity to be shown. The new check
now also requires that the top activity be resumed, which means
we may get some false positives where we decide to wait and shouldn't,
but that is better than consistently not deciding to wait in some
cases when we should. (And we will always finish waiting then next
time something becomes visible).
Also add another time, which is how long it took from the startActivity
call to return with the result. And fix when we decide to report that
we are done so that, in the case where we are bringing an existing
activity to the foreground, we don't wait until its animation is complete.
Change-Id: Id38ca0070f04e7bf8c73e131fb055808553a0e2f
2014-09-17 12:47:35 -07:00
Alan Viverette
8e55f80d07
am 7f5b034a: am f0ea4ce6: Merge "Revert body font size to 14sp, fix ActionBar menu text color" into lmp-dev
...
* commit '7f5b034aa4fe64835fbb7a9bc199addb306a1d91':
Revert body font size to 14sp, fix ActionBar menu text color
2014-09-17 19:37:17 +00:00
ztenghui
1c0ee98779
am f7a66534: am b20b6f24: Merge "Fix badge asset alpha issue" into lmp-dev
...
* commit 'f7a66534b9e619cbd9b3151a6c1887afc867c7ce':
Fix badge asset alpha issue
2014-09-17 19:37:13 +00:00
Alan Viverette
f4a130fb62
am f0ea4ce6: Merge "Revert body font size to 14sp, fix ActionBar menu text color" into lmp-dev
...
* commit 'f0ea4ce63510be154cbf737a3ed60deb0cbd5289':
Revert body font size to 14sp, fix ActionBar menu text color
2014-09-17 19:27:32 +00:00
ztenghui
842731dfaf
am b20b6f24: Merge "Fix badge asset alpha issue" into lmp-dev
...
* commit 'b20b6f24c0b7426601d1ea62fc2013b6690ff05c':
Fix badge asset alpha issue
2014-09-17 19:27:28 +00:00
Jeff Sharkey
9d18913d34
am a7b20bba: am bfd9a30f: Merge "NetworkStats always needs arrays." into lmp-dev
...
* commit 'a7b20bbab240d10a0e5bb29d182d59a41facace6':
NetworkStats always needs arrays.
2014-09-17 19:25:14 +00:00
Alan Viverette
ae1990f406
Merge "Revert body font size to 14sp, fix ActionBar menu text color" into lmp-dev
2014-09-17 19:20:33 +00:00
Alan Viverette
59b2d80f88
Revert body font size to 14sp, fix ActionBar menu text color
...
BUG: 17549070
BUG: 17538527
Change-Id: Id4d412ae3c035c6f76ae10569658a0d97e36a0e8
2014-09-17 12:19:56 -07:00
ztenghui
d25e864dde
Merge "Fix badge asset alpha issue" into lmp-dev
2014-09-17 19:17:25 +00:00
Jeff Sharkey
9213ab323b
am bfd9a30f: Merge "NetworkStats always needs arrays." into lmp-dev
...
* commit 'bfd9a30f528dff00ae925a0e1f0ec18f669b3f1b':
NetworkStats always needs arrays.
2014-09-17 19:12:05 +00:00
Svetoslav
726b113bb7
am 809041d8: am 84ad5f75: Merge "Page content sometimes disappears when scrolling a long doc in print preview." into lmp-dev
...
* commit '809041d8a43fdaa8f33311063759d2dad8dd08eb':
Page content sometimes disappears when scrolling a long doc in print preview.
2014-09-17 19:11:57 +00:00
Svetoslav
6cdeaaa291
am 84ad5f75: Merge "Page content sometimes disappears when scrolling a long doc in print preview." into lmp-dev
...
* commit '84ad5f75e1c7d4f4d5113b413e814bde3aaa1747':
Page content sometimes disappears when scrolling a long doc in print preview.
2014-09-17 19:03:44 +00:00
Jeff Sharkey
9d375ecbe6
Merge "NetworkStats always needs arrays." into lmp-dev
2014-09-17 19:01:13 +00:00
Svetoslav
a732950ade
Merge "Page content sometimes disappears when scrolling a long doc in print preview." into lmp-dev
2014-09-17 18:52:19 +00:00
Craig Mautner
5f77319128
am 40a640a0: am d14816b6: Merge "Eliminate misleading warning." into lmp-dev
...
* commit '40a640a0db01bd6776a95268645be6c5d9f21067':
Eliminate misleading warning.
2014-09-17 18:41:26 +00:00
Craig Mautner
4d95986196
am f3ea780b: am 951df81d: Merge "Add optimizations to keep TaskPersister queue small." into lmp-dev
...
* commit 'f3ea780bbe464a2dbc487bb4af6b53a19f30a867':
Add optimizations to keep TaskPersister queue small.
2014-09-17 18:41:23 +00:00
Craig Mautner
e0bb73718d
am d14816b6: Merge "Eliminate misleading warning." into lmp-dev
...
* commit 'd14816b6f33d8edbec43f5c226d50ed529daf19b':
Eliminate misleading warning.
2014-09-17 18:32:00 +00:00
Sailesh Nepal
392e35feb8
am d3edb391: am 86f939e8: Merge "Include code when converting unknown causes to string" into lmp-dev
...
* commit 'd3edb391f6588b8935dc1053352989e96e3ffbad':
Include code when converting unknown causes to string
2014-09-17 18:31:56 +00:00
Craig Mautner
f8c6ce7638
am 951df81d: Merge "Add optimizations to keep TaskPersister queue small." into lmp-dev
...
* commit '951df81d02a9ed21c9e3cb0e81b0ebf9b08a527c':
Add optimizations to keep TaskPersister queue small.
2014-09-17 18:31:56 +00:00
ztenghui
45fb8735b2
Fix badge asset alpha issue
...
b/17544362
Change-Id: Ibf22918ccfebe082a25f28f0d4c1991e700a1fd2
2014-09-17 11:24:04 -07:00
Svetoslav
7fd5ada98a
Page content sometimes disappears when scrolling a long doc in print preview.
...
The operations of the remote renderer have to be performed in order, open,
render some pages, close. One of the tasks was executed on the wrong executor
resuling in a race and an occassional bad state.
Also fixed a NPE if the preview list is flinged and then the user presses
back.
bug:17537922
Change-Id: I5048078ba2b875a2a8335f3a4324afaa34d014a2
2014-09-17 11:11:08 -07:00
Craig Mautner
36e793c73b
Merge "Eliminate misleading warning." into lmp-dev
2014-09-17 18:02:44 +00:00
Craig Mautner
941aa1afe3
Merge "Add optimizations to keep TaskPersister queue small." into lmp-dev
2014-09-17 18:01:46 +00:00
Sailesh Nepal
2853267816
am 86f939e8: Merge "Include code when converting unknown causes to string" into lmp-dev
...
* commit '86f939e832c257b5fa2606aed00e9dfaeaef90cd':
Include code when converting unknown causes to string
2014-09-17 17:47:54 +00:00
Sailesh Nepal
b181492258
Merge "Include code when converting unknown causes to string" into lmp-dev
2014-09-17 17:33:11 +00:00
Robert Ly
f68fb6552c
am c1c9987d: am 446bd890: am 4243ec2a: am 9efd9f60: am fc95c477: docs: edu changes for launch
...
* commit 'c1c9987dc9c9ead79dd541ffcc179c49f0651dc4':
docs: edu changes for launch
2014-09-17 17:23:54 +00:00
Andrew Solovay
c18a762493
am 14d0d8aa: am 37fce2bc: am 67267dcf: am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
...
* commit '14d0d8aa58541da3b1b597f060e531aa266c8c92':
Docs: Updated to include new Subscriptions functionality.
2014-09-17 17:23:41 +00:00
Chris Craik
024227830b
am c7f97b61: am b5a27aee: Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into lmp-dev
...
* commit 'c7f97b619b382d355b09bc4083443bec862b1871':
Handle premultiplication correctly for ColorMatrixColorFilters
2014-09-17 17:23:37 +00:00
Robert Ly
0d336cccc4
am 446bd890: am 4243ec2a: am 9efd9f60: am fc95c477: docs: edu changes for launch
...
* commit '446bd8900b2c3b69d5440c893649a80981d75665':
docs: edu changes for launch
2014-09-17 17:20:05 +00:00
Andrew Solovay
7c4d93e818
am 37fce2bc: am 67267dcf: am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
...
* commit '37fce2bca37c59ee4c733a6ced3c5be48c77aef6':
Docs: Updated to include new Subscriptions functionality.
2014-09-17 17:20:01 +00:00
Chris Craik
ea3f59fd65
am b5a27aee: Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into lmp-dev
...
* commit 'b5a27aee532343a3c66d91c04c8d238ff35b31db':
Handle premultiplication correctly for ColorMatrixColorFilters
2014-09-17 17:12:21 +00:00
Robert Ly
5b75935416
am 4243ec2a: am 9efd9f60: am fc95c477: docs: edu changes for launch
...
* commit '4243ec2a84e9e42237e8e5bfd5cfb675f765d84f':
docs: edu changes for launch
2014-09-17 17:10:01 +00:00
Andrew Solovay
b1c066fa5c
am 67267dcf: am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
...
* commit '67267dcf909e080ea3adf902c8a9df115bd1b279':
Docs: Updated to include new Subscriptions functionality.
2014-09-17 17:09:46 +00:00
Chris Craik
ba9d58516c
Merge "Handle premultiplication correctly for ColorMatrixColorFilters" into lmp-dev
2014-09-17 17:01:35 +00:00