211867 Commits

Author SHA1 Message Date
Deepanshu Gupta
034d10bf6c am e5d3baf2: LayoutLib: Fix bitmap scaling.
* commit 'e5d3baf22f046d0a579128fc258f6b92e700ca02':
  LayoutLib: Fix bitmap scaling.
2015-10-05 23:22:18 +00:00
Deepanshu Gupta
e5d3baf22f LayoutLib: Fix bitmap scaling.
Bug: http://b.android.com/187939
Change-Id: I20bf61746e8af3bb87ba9cfcc9bf58854ac7c5be
2015-10-05 16:08:54 -07:00
Nick Armstrong-Crews
dd62fb4392 am f107709f: am 13a71fbc: Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev
* commit 'f107709fb3f884f904deb1f3c09a88dd411ea30d':
  Fix the logging of wake time saved by Ungaze.
2015-10-05 18:34:57 +00:00
Nick Armstrong-Crews
f107709fb3 am 13a71fbc: Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev
* commit '13a71fbcf056d34421a7740a75e2c8dc11d30eb6':
  Fix the logging of wake time saved by Ungaze.
2015-10-05 18:29:24 +00:00
Nick Armstrong-Crews
13a71fbcf0 Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev 2015-10-05 18:23:12 +00:00
Nick Armstrong-Crews
024872ea70 Fix the logging of wake time saved by Ungaze.
The logging of saved time was erroneously being called more than once
per wake period. Moved the logging logic to be called from
finishWakefulnessChange(), which is only called once per wake period.

Change-Id: I268ef44edce5807644fcc8fb0dcaa1a96cae6c9e
2015-10-05 18:22:54 +00:00
Geoff Mendal
5c6fff5431 am ad111b65: (-s ours) am 3daab8e7: (-s ours) am faebbe82: (-s ours) Import translations. DO NOT MERGE
* commit 'ad111b653251e0af212da964d56112cda7d628d9':
  Import translations. DO NOT MERGE
2015-10-05 14:16:19 +00:00
Geoff Mendal
ad111b6532 am 3daab8e7: (-s ours) am faebbe82: (-s ours) Import translations. DO NOT MERGE
* commit '3daab8e7a7e68ceb8f15cfcb0d8becf4e86a6c05':
  Import translations. DO NOT MERGE
2015-10-05 14:09:18 +00:00
Geoff Mendal
3daab8e7a7 am faebbe82: (-s ours) Import translations. DO NOT MERGE
* commit 'faebbe82fa72036db75d679d366681822d2d551c':
  Import translations. DO NOT MERGE
2015-10-05 14:05:00 +00:00
Geoff Mendal
faebbe82fa Import translations. DO NOT MERGE
Change-Id: I21cc5a0ce2710498f3aa76c904e653b90a14ecda
Auto-generated-cl: translation import
2015-10-05 06:58:33 -07:00
Stephen Hines
697e3dd6b9 am ee144b1e: resolved conflicts for bd57dac5 to stage-aosp-master
* commit 'ee144b1e60a88e8f097113e046813f0b61c38b9b':
  Don't unregister Fonts from renderer at destruction
2015-10-03 00:46:17 +00:00
Stephen Hines
ee144b1e60 resolved conflicts for bd57dac5 to stage-aosp-master
Change-Id: I5107af13712d7cc908d8699e5c15a002f0a3ec85
2015-10-02 17:34:05 -07:00
Pirama Arumuga Nainar
3cb53543e2 am 24f02483: am 67775422: Retry if interrupted before mMessageThread has joined
* commit '24f02483172a9802222da29e9db3832b93dd46a6':
  Retry if interrupted before mMessageThread has joined
2015-10-02 22:59:51 +00:00
Pirama Arumuga Nainar
24f0248317 am 67775422: Retry if interrupted before mMessageThread has joined
* commit '677754225d9dcd3982d486bc4ead31d6f74de89b':
  Retry if interrupted before mMessageThread has joined
2015-10-02 22:54:04 +00:00
Pirama Arumuga Nainar
677754225d Retry if interrupted before mMessageThread has joined
Bug: 24342101

If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing.  Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.

Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
(cherry picked from commit 2f25ce7753f7f1f6a0cc549a0df0082286bd5f85)
2015-10-02 15:30:33 -07:00
Chris Craik
bd57dac5d5 Merge "Don't unregister Fonts from renderer at destruction" 2015-10-02 22:30:09 +00:00
Pirama Arumuga Nainar
e3ae9e71b3 am 5fbb2452: am ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined"
* commit '5fbb245230317b5ca312556b73380195871827eb':
  Retry if interrupted before mMessageThread has joined
2015-10-02 22:16:20 +00:00
Pirama Arumuga Nainar
5fbb245230 am ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined"
* commit 'ca3e5aeaa65ae1d77ce92f082ab789933eb18237':
  Retry if interrupted before mMessageThread has joined
2015-10-02 22:08:11 +00:00
Pirama Arumuga Nainar
ca3e5aeaa6 Merge "Retry if interrupted before mMessageThread has joined" 2015-10-02 21:58:50 +00:00
Pirama Arumuga Nainar
2f25ce7753 Retry if interrupted before mMessageThread has joined
Bug: 24342101

If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing.  Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.

Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
2015-10-02 21:42:12 +00:00
Chris Craik
148c78f825 Don't unregister Fonts from renderer at destruction
bug:24584749

Fonts are only destroyed when the renderer is destroyed, this prevents
modifying the FontRenderer's LruCache while it's being iterated through
in FontRenderer::~FontRenderer.

Change-Id: I0e2c9f87981bfa50454ec8689df05851839e288e
2015-10-02 14:21:46 -07:00
Tim Murray
e6a4f90261 am 0e28d919: am 3af80eff: am 79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '0e28d9196deb28af89c0ea075a91ca45c989fde9':
  Send POWER_HINT_INTERACTION on rotate.
2015-10-02 20:59:09 +00:00
Tim Murray
0e28d9196d am 3af80eff: am 79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '3af80eff608b2ee2de7291f82b9163d5df4b15cf':
  Send POWER_HINT_INTERACTION on rotate.
2015-10-02 20:54:58 +00:00
Tim Murray
3af80eff60 am 79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '791763796e5f21e34c3ae81c1faad2a4c1a515dd':
  Send POWER_HINT_INTERACTION on rotate.
2015-10-02 20:48:04 +00:00
Tim Murray
791763796e Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev 2015-10-02 20:43:30 +00:00
Jorim Jaggi
99d661ffc0 am c69f4b96: am 54afa2bd: am 8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev
* commit 'c69f4b962e1111ed44399c1243829384f83b9f2f':
  Add minimum time for double tap gesture
2015-10-02 20:15:06 +00:00
Jorim Jaggi
c69f4b962e am 54afa2bd: am 8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev
* commit '54afa2bdc2be09542feea634f7a87a0f2f9defac':
  Add minimum time for double tap gesture
2015-10-02 20:08:11 +00:00
Jorim Jaggi
54afa2bdc2 am 8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev
* commit '8c66fa94361b51f39f87530f6d1f714120437cc6':
  Add minimum time for double tap gesture
2015-10-02 20:00:34 +00:00
Jorim Jaggi
8c66fa9436 Merge "Add minimum time for double tap gesture" into mnc-dr-dev 2015-10-02 19:55:26 +00:00
Jean-Michel Trivi
182e628711 am 11568be8: am 5f48baef: am 24806db8: AudioService: alternative way of handling device rotation
* commit '11568be85e943063c43a9528da0a6b5fb2a92b3b':
  AudioService: alternative way of handling device rotation
2015-10-02 08:27:01 +00:00
Jianing Wei
5a15b95291 am 98e0cec2: am 3c708be3: am 6ffe9f05: am 2813b0fa: Camera2: Update video stabilization API doc.
* commit '98e0cec203cd5463c9dd314455ef02781e241b44':
  Camera2: Update video stabilization API doc.
2015-10-02 08:26:54 +00:00
Jean-Michel Trivi
11568be85e am 5f48baef: am 24806db8: AudioService: alternative way of handling device rotation
* commit '5f48baef5f42dd39fff9bc03b3ac8ba222955b86':
  AudioService: alternative way of handling device rotation
2015-10-02 02:56:39 +00:00
Jean-Michel Trivi
5f48baef5f am 24806db8: AudioService: alternative way of handling device rotation
* commit '24806db8f6f523542510097ce0af4a32beeda83b':
  AudioService: alternative way of handling device rotation
2015-10-02 02:52:40 +00:00
Jianing Wei
98e0cec203 am 3c708be3: am 6ffe9f05: am 2813b0fa: Camera2: Update video stabilization API doc.
* commit '3c708be364d4c2a45aacc66ca027cdcb19d7dda5':
  Camera2: Update video stabilization API doc.
2015-10-02 02:23:10 +00:00
Jianing Wei
3c708be364 am 6ffe9f05: am 2813b0fa: Camera2: Update video stabilization API doc.
* commit '6ffe9f05de81fab8e3cb4031a784e26c2c0acce1':
  Camera2: Update video stabilization API doc.
2015-10-02 02:11:55 +00:00
Jean-Michel Trivi
24806db8f6 AudioService: alternative way of handling device rotation
For devices that monitor orientation (primarily for channel assignment
 to stereo speakers):
The com.android.server.policy.WindowOrientationListener API is more
 power efficient than simply monitoring the device's orientation. When
 supported, use it instead of android.view.OrientationEventListener.
When WindowOrientationListener reports an orientation change, start
 a thread to poll the UI orientation, as its change may lag behind
 the observed rotation. Gradually increasing delays between polls
 are stored in a table.

Bug 24415763

Change-Id: I69bf68da6107af24cd02a48961dd17ceab557816
2015-10-01 18:40:26 -07:00
Tim Murray
1f407647d1 Send POWER_HINT_INTERACTION on rotate.
Send a POWER_HINT_INTERACTION to improve redraw performance when the
phone is rotated.

bug 24583227

Change-Id: I1978f0dfb9a25c00ad4da5b44d10410ad7412001
2015-10-01 17:07:12 -07:00
Jorim Jaggi
d3f84d4a9a Add minimum time for double tap gesture
Bug: 24304031
Change-Id: I15629d6b05175aea9b0d02571f6245966094f162
2015-10-01 14:13:04 -07:00
Jianing Wei
6ffe9f05de am 2813b0fa: Camera2: Update video stabilization API doc.
* commit '2813b0fae99fed1096dc23c3899e223459a54cec':
  Camera2: Update video stabilization API doc.
2015-10-01 16:40:21 +00:00
Sergio Giro
31e5ded687 am 6706b71d: am 86e67d70: Merge "frameworks/base: delete TinyHashMap"
* commit '6706b71d7cfb9a916fd482189c04a0d59c19c103':
  frameworks/base: delete TinyHashMap
2015-10-01 10:22:39 +00:00
Sergio Giro
6706b71d7c am 86e67d70: Merge "frameworks/base: delete TinyHashMap"
* commit '86e67d708d738807c843850a3b6c9170e514ff8f':
  frameworks/base: delete TinyHashMap
2015-10-01 10:16:44 +00:00
Sergio Giro
86e67d708d Merge "frameworks/base: delete TinyHashMap" 2015-10-01 10:10:10 +00:00
Miao Wang
454835c608 am 05420e77: am 134c504a: Merge "[RenderScript] pass correct length of ains to BLAS functions"
* commit '05420e77f5358fc7a8996b39daf3aa976b826b53':
  [RenderScript] pass correct length of ains to BLAS functions
2015-10-01 00:00:04 +00:00
Miao Wang
05420e77f5 am 134c504a: Merge "[RenderScript] pass correct length of ains to BLAS functions"
* commit '134c504a3ea687a0ea875057792e66705ddbfce7':
  [RenderScript] pass correct length of ains to BLAS functions
2015-09-30 23:44:22 +00:00
Miao Wang
134c504a3e Merge "[RenderScript] pass correct length of ains to BLAS functions" 2015-09-30 22:53:18 +00:00
Miao Wang
0b34f2a3c5 [RenderScript] pass correct length of ains to BLAS functions
bug: 24540091
Change-Id: Ia541bcbee07125c4caf3e0f4863702a3c0b929d5
2015-09-30 15:38:07 -07:00
Deepanshu Gupta
21af84d3e4 am 7a9f771f: Merge "Don\'t break error string (easier grepping)" into mnc-ub-dev
* commit '7a9f771fe010c697c6a9fb143f0a26778d440c8c':
  Don't break error string (easier grepping)
2015-09-30 22:22:09 +00:00
Deepanshu Gupta
7a9f771fe0 Merge "Don't break error string (easier grepping)" into mnc-ub-dev 2015-09-30 22:16:22 +00:00
Daniel Erat
f0e8744620 am d3e3d889: am c3f37589: Merge "Update instructions in IPowerManager.aidl."
* commit 'd3e3d8896ea0f2eba1424b57ac8a5b5d9287000c':
  Update instructions in IPowerManager.aidl.
2015-09-30 21:39:01 +00:00
Daniel Erat
d3e3d8896e am c3f37589: Merge "Update instructions in IPowerManager.aidl."
* commit 'c3f37589e04a52c109c63f6411db444500d4f92c':
  Update instructions in IPowerManager.aidl.
2015-09-30 21:30:31 +00:00