Commit Graph

181883 Commits

Author SHA1 Message Date
Chris Craik
08fa43fdeb Fix Glop vertex alpha blending
Need to force blending if vertices have alpha attribute

Change-Id: I821792db6b613b4d0243cf9c7a045cba014acdc1
2015-02-09 19:08:02 -08:00
Chris Craik
2ab95d780b Glop support for indexed quads
bug:19014311
Change-Id: If35a873421b41cc4508b0d8ac1b4d900c9bb3717
2015-02-09 11:04:31 -08:00
Adrian Roos
92b2fe5d0d am 270496ef: am 4e4c37a2: am 991db77a: Only request IME if password view is showing
automerge: fc7e8f0

* commit 'fc7e8f0b024ab119e7b06e5d3b6d5a1f4e00edba':
  Only request IME if password view is showing
2015-02-09 16:41:32 +00:00
Adrian Roos
fc7e8f0b02 am 270496ef: am 4e4c37a2: am 991db77a: Only request IME if password view is showing
* commit '270496ef13b6baba1f0749d8c282262b021ff18e':
  Only request IME if password view is showing
2015-02-09 16:38:42 +00:00
Geoff Mendal
5acdb7c537 am c59db2ea: (-s ours) am fba2dcc0: (-s ours) Import translations. DO NOT MERGE
automerge: 75a10fe  -s ours

* commit '75a10fe80778f4ac31caaf33ef2c052a391869c9':
  Import translations. DO NOT MERGE
2015-02-09 16:34:45 +00:00
Geoff Mendal
75a10fe807 am c59db2ea: (-s ours) am fba2dcc0: (-s ours) Import translations. DO NOT MERGE
* commit 'c59db2ea443610566d4c0e9b6cc590dfed3e8775':
  Import translations. DO NOT MERGE
2015-02-09 16:31:31 +00:00
Adrian Roos
270496ef13 am 4e4c37a2: am 991db77a: Only request IME if password view is showing
* commit '4e4c37a2da064cf0d4bbd508a186a6c44563d966':
  Only request IME if password view is showing
2015-02-09 16:30:40 +00:00
Adrian Roos
4e4c37a2da am 991db77a: Only request IME if password view is showing
* commit '991db77a44f3352a8cf6351f79cad67bf955e4e4':
  Only request IME if password view is showing
2015-02-09 16:07:32 +00:00
Geoff Mendal
c59db2ea44 am fba2dcc0: (-s ours) Import translations. DO NOT MERGE
* commit 'fba2dcc023c9fb5d215fb66528d7d9d69ba80971':
  Import translations. DO NOT MERGE
2015-02-09 16:07:09 +00:00
Geoff Mendal
3f42f91b92 Merge "Import translations. DO NOT MERGE" 2015-02-09 15:40:36 +00:00
Geoff Mendal
539a4c3c86 Import translations. DO NOT MERGE
Change-Id: I8d832447a67fdffa8340958872179c28cc37a063
Auto-generated-cl: translation import
2015-02-09 09:37:53 -06:00
Geoff Mendal
55d512f2d2 Merge "Import translations. DO NOT MERGE" 2015-02-09 15:03:30 +00:00
Geoff Mendal
fba2dcc023 Import translations. DO NOT MERGE
Change-Id: I37f95c49e5696a1aed7c2eb5ff75798571116c8a
Auto-generated-cl: translation import
2015-02-09 06:53:05 -08:00
Geoff Mendal
ca6964d2c2 Import translations. DO NOT MERGE
Change-Id: I0636cbe07799e0bd53c2157bf4074d9e7a5f5b1c
Auto-generated-cl: translation import
2015-02-09 08:44:13 -06:00
Chris Wren
acea074310 Merge "Don't let the heads up close too quickly." 2015-02-09 14:28:03 +00:00
Adrian Roos
991db77a44 Only request IME if password view is showing
Bug: 19250277
Change-Id: I881b08ebc6900ba43289b772ed0d039dbb62149c
2015-02-09 13:26:02 +00:00
Sander Alewijnse
8f6afec2aa Merge "Move the check for launcher managed profile support." 2015-02-09 10:17:57 +00:00
Zhijun He
6de4c88271 am 9f8e82ed: am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b
automerge: 0b039b0

* commit '0b039b031557d77e112e88925904e9668f764aa7':
  camera-metadata: clarify the AE precapture trigger spec
2015-02-08 21:29:18 +00:00
Zhijun He
0b039b0315 am 9f8e82ed: am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b
* commit '9f8e82ed968115d14a564397c6b316af3ba42caf':
  camera-metadata: clarify the AE precapture trigger spec
2015-02-08 21:23:05 +00:00
Zhijun He
9f8e82ed96 am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b
* commit 'f7f131105d479d30b53b2366e29278fd09f36065':
  camera-metadata: clarify the AE precapture trigger spec
2015-02-08 21:12:44 +00:00
Zhijun He
f7f131105d Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev
automerge: 07c745b

* commit '07c745b525d39309a9ea93605fb5f85c295502f1':
  camera-metadata: clarify the AE precapture trigger spec
2015-02-08 21:04:38 +00:00
Zhijun He
07c745b525 Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev 2015-02-08 17:38:03 +00:00
Joe Fernandez
6bfe8325b9 am e3bc656a: am a8b341cd: am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
automerge: 843b2c7

* commit '843b2c7aa9e38f39732a279d7901f66893b37ab7':
  docs: remove + annotations in version references
2015-02-07 01:56:15 +00:00
Joe Fernandez
843b2c7aa9 am e3bc656a: am a8b341cd: am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit 'e3bc656a623b34d523001e628e779fe2f69e0fb1':
  docs: remove + annotations in version references
2015-02-07 01:53:04 +00:00
Zhijun He
dd72be5971 camera-metadata: clarify the AE precapture trigger spec
Doc only change.

Bug: 19301706
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b
2015-02-06 17:51:34 -08:00
Joe Fernandez
e3bc656a62 am a8b341cd: am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit 'a8b341cdf00e169beb944c0205c98977f835424e':
  docs: remove + annotations in version references
2015-02-07 01:47:32 +00:00
Joe Fernandez
a8b341cdf0 am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit '5ac30e10ab484fdb7ba3c56b8c162a9061601f8e':
  docs: remove + annotations in version references
2015-02-07 01:22:13 +00:00
Joe Fernandez
5ac30e10ab am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit '66c06cf9bb4fa3ba1477e120843e8fdb8a360e4e':
  docs: remove + annotations in version references
2015-02-07 01:13:52 +00:00
Joe Fernandez
66c06cf9bb am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit 'd224fb8a6c86b0c26c5db570cead5f19ff7133bd':
  docs: remove + annotations in version references
2015-02-07 01:08:46 +00:00
Joe Fernandez
d224fb8a6c am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit 'ba20f98c88b754b3a69d55963275e20ab2fba6bf':
  docs: remove + annotations in version references
2015-02-07 01:00:53 +00:00
Joe Fernandez
ba20f98c88 Merge "docs: remove + annotations in version references" into lmp-docs 2015-02-07 00:55:17 +00:00
Bryce Lee
f5a3fee9d6 am 1d97aa4d: Merge "Allow single press of physical button to go home without sleeping." into lmp-mr1-modular-dev
automerge: d1444b6

* commit 'd1444b63a173ce21f8588e09fd17f3cc83528c24':
  Allow single press of physical button to go home without sleeping.
2015-02-07 00:41:29 +00:00
Bryce Lee
d1444b63a1 am 1d97aa4d: Merge "Allow single press of physical button to go home without sleeping." into lmp-mr1-modular-dev
* commit '1d97aa4d209d7019402a2925c2ca7eb2e36901c7':
  Allow single press of physical button to go home without sleeping.
2015-02-07 00:39:18 +00:00
Bryce Lee
1d97aa4d20 Merge "Allow single press of physical button to go home without sleeping." into lmp-mr1-modular-dev 2015-02-07 00:32:27 +00:00
Svet Ganov
11f51ffad2 am eb642b60: am ff9b2525: am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
automerge: f89c6f3

* commit 'f89c6f3c8068bc90557a6ade5b0541da4b2ff622':
  Accessibility: ignore children of a view with node provider.
2015-02-07 00:16:13 +00:00
Svet Ganov
e7fad2fa90 am 763ce6c0: am 41daba00: am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
automerge: 033c2a2

* commit '033c2a21f857948416eeaa36e6a613743b548eff':
  Accessibility: Handle a missed case when clicking focused views.
2015-02-07 00:14:54 +00:00
Svet Ganov
f89c6f3c80 am eb642b60: am ff9b2525: am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
* commit 'eb642b60e7b1d2a62331303e699df874a50ad527':
  Accessibility: ignore children of a view with node provider.
2015-02-07 00:11:05 +00:00
Svet Ganov
033c2a21f8 am 763ce6c0: am 41daba00: am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
* commit '763ce6c0c48416a67a36919d1b7ac67d6b73c430':
  Accessibility: Handle a missed case when clicking focused views.
2015-02-07 00:10:59 +00:00
Svet Ganov
eb642b60e7 am ff9b2525: am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
* commit 'ff9b2525db61d4c175d9d61a0847586001cd4a11':
  Accessibility: ignore children of a view with node provider.
2015-02-06 23:58:52 +00:00
Svet Ganov
763ce6c0c4 am 41daba00: am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
* commit '41daba0052f4a9146aad4977da9eccf3c72450ce':
  Accessibility: Handle a missed case when clicking focused views.
2015-02-06 23:58:49 +00:00
Bryce Lee
3e2e16b614 am a7404dbd: Merge "Add voice assist action for global actions." into lmp-mr1-modular-dev
automerge: 35dd319

* commit '35dd319e4a652518ab8b89012e5a8cf73a82090d':
  Add voice assist action for global actions.
2015-02-06 23:10:45 +00:00
Bryce Lee
35dd319e4a am a7404dbd: Merge "Add voice assist action for global actions." into lmp-mr1-modular-dev
* commit 'a7404dbde991d36353440546ff8c92e44d218dfe':
  Add voice assist action for global actions.
2015-02-06 23:08:54 +00:00
Chris Craik
f7ccbfbd98 Merge "Glop ColorFilter & VertexBuffer support, initial enable" 2015-02-06 23:06:44 +00:00
Bryce Lee
a7404dbde9 Merge "Add voice assist action for global actions." into lmp-mr1-modular-dev 2015-02-06 23:05:05 +00:00
Svet Ganov
ff9b2525db am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
* commit '34123f1ce83e39a5a6045b1a90a148cd4c514e7e':
  Accessibility: ignore children of a view with node provider.
2015-02-06 21:51:15 +00:00
Svet Ganov
41daba0052 am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
* commit '060bca7444b8bf34fa95a6a71daf72fa8a85d78e':
  Accessibility: Handle a missed case when clicking focused views.
2015-02-06 21:51:11 +00:00
Svet Ganov
34123f1ce8 Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev 2015-02-06 21:49:02 +00:00
Svet Ganov
060bca7444 Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 2015-02-06 21:46:25 +00:00
Chris Craik
117bdbcfa3 Glop ColorFilter & VertexBuffer support, initial enable
Enables Glop rendering for supported Rects and VertexBuffers
Also removes unused Query object

Change-Id: Ibe227bc362685a153159f75077664f0947764e06
2015-02-06 13:42:25 -08:00
Jason Monk
12271e2201 Merge "Remove dead/obsolete carrier label code" 2015-02-06 21:34:01 +00:00