135751 Commits

Author SHA1 Message Date
Victoria Lease
49f0db3481 fix argument order in call to SkBlurDrawLooper constructor
This fixes all sorts of badness.

Bug: 15074512
Change-Id: I5e96983c58d19e0dc2d8fa61d1efa9dcff076ca1
2014-05-19 16:12:22 -07:00
Chris Craik
50b843883d am 3c769ec0: am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"
* commit '3c769ec02b8b82bec4dec2169bf76af58be94a9a':
  Use alpha channel instead of red in drawCachedGlyphBitmap
2014-05-19 19:35:59 +00:00
Chris Craik
3c769ec02b am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"
* commit '00fabcbeb035fb513293ea01d245002f40b3234f':
  Use alpha channel instead of red in drawCachedGlyphBitmap
2014-05-19 19:32:38 +00:00
Adrian Roos
45d50a1363 Merge "Speed up brightness transition if auto brightness adjustment is changed" 2014-05-19 19:30:15 +00:00
RoboErik
b19c192654 Merge "Rename session classes to have media prefix, hide routes" 2014-05-19 19:29:06 +00:00
RoboErik
b4f4f69e4c Merge "Move media key processing to sessions" 2014-05-19 19:28:54 +00:00
Chris Craik
00fabcbeb0 am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"
* commit 'b1708e9b764268a06d91219a5c39ee9efd32ab00':
  Use alpha channel instead of red in drawCachedGlyphBitmap
2014-05-19 19:27:52 +00:00
Chris Craik
b1708e9b76 Merge "Use alpha channel instead of red in drawCachedGlyphBitmap" 2014-05-19 19:23:07 +00:00
Michael Wright
d069cd5164 am dc0c52f4: am 7099995b: am a84d24c3: Merge "Extend support for nordic languages with Sami"
* commit 'dc0c52f4f592f6b9731939f0031e977a70515d4a':
  Extend support for nordic languages with Sami
2014-05-19 18:28:40 +00:00
Michael Wright
dc0c52f4f5 am 7099995b: am a84d24c3: Merge "Extend support for nordic languages with Sami"
* commit '7099995be5bfadcb03973d4ae952fd345bae264b':
  Extend support for nordic languages with Sami
2014-05-19 18:23:50 +00:00
Dirk Dougherty
0208462f7c am f0029f64: am 94fb0454: am 4d37d7ef: am c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
* commit 'f0029f644aa9d52e6fc1ebca8bea86cd67742c0a':
  Remove neg margin in wear css to resolve layout issue.
2014-05-19 18:23:44 +00:00
Scott Rowe
5d520df856 am 7a940a49: am 3d55247a: am a0144782: am 6d05170a: docs: b/14510382 ISO language code, add link
* commit '7a940a49745f51425e60bfde38b8c0dab454ef8b':
  docs: b/14510382 ISO language code, add link
2014-05-19 18:23:40 +00:00
Michael Wright
7099995be5 am a84d24c3: Merge "Extend support for nordic languages with Sami"
* commit 'a84d24c37a3e27cdd4f50807e9dc5fb6f14ea009':
  Extend support for nordic languages with Sami
2014-05-19 18:19:20 +00:00
Michael Wright
a84d24c37a Merge "Extend support for nordic languages with Sami" 2014-05-19 18:15:41 +00:00
Dirk Dougherty
f0029f644a am 94fb0454: am 4d37d7ef: am c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
* commit '94fb04547ca35c09409cfc6e3b930805acddc7d6':
  Remove neg margin in wear css to resolve layout issue.
2014-05-19 18:12:40 +00:00
Scott Rowe
7a940a4974 am 3d55247a: am a0144782: am 6d05170a: docs: b/14510382 ISO language code, add link
* commit '3d55247a3f8e488b13f7f467cbc70ac4864d2dd2':
  docs: b/14510382 ISO language code, add link
2014-05-19 18:12:37 +00:00
David Christie
3662ad4aec Merge "Fix bug where location provider fails on secondary users. Bug: 12592045" 2014-05-19 18:09:50 +00:00
Dirk Dougherty
94fb04547c am 4d37d7ef: am c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
* commit '4d37d7ef141beaf8f7d1b2bf1c19e3fb8c84203f':
  Remove neg margin in wear css to resolve layout issue.
2014-05-19 18:08:53 +00:00
Scott Rowe
3d55247a3f am a0144782: am 6d05170a: docs: b/14510382 ISO language code, add link
* commit 'a0144782b16b5b6a767a0c48fa5c3a79a5c74889':
  docs: b/14510382 ISO language code, add link
2014-05-19 18:08:45 +00:00
Robert Ly
3257984e55 am dbf711ea: am e5c9d855: Merge "docs: updates for changes to notification APIs" into klp-modular-dev
* commit 'dbf711ea88b01693db1974a3a6a346cff3da6daa':
  docs: updates for changes to notification APIs
2014-05-19 18:03:19 +00:00
Robert Greenwalt
5d2e896457 Fix the build
Change-Id: I18f78f6055f6f9c14571058d6834c8dec01aa732
2014-05-19 11:00:12 -07:00
Robert Ly
dbf711ea88 am e5c9d855: Merge "docs: updates for changes to notification APIs" into klp-modular-dev
* commit 'e5c9d8551b22c1708723b89e8e8d6f830168f292':
  docs: updates for changes to notification APIs
2014-05-19 17:59:48 +00:00
Robert Ly
e5c9d8551b Merge "docs: updates for changes to notification APIs" into klp-modular-dev 2014-05-19 17:56:18 +00:00
Robert Greenwalt
537023f172 Merge "Add javadoc and unhide new API" 2014-05-19 17:35:13 +00:00
Robert Greenwalt
d19c41c0bb Add javadoc and unhide new API
Change-Id: I12e475bbf4000c7acec4ca27b1d3bf8f870cc2cf
2014-05-19 10:34:36 -07:00
Dirk Dougherty
4d37d7ef14 am c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
* commit 'c385b1e4be928133930d9264a92c98f4747adedb':
  Remove neg margin in wear css to resolve layout issue.
2014-05-19 17:27:41 +00:00
Dirk Dougherty
c385b1e4be Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs 2014-05-19 17:23:33 +00:00
Scott Rowe
a0144782b1 am 6d05170a: docs: b/14510382 ISO language code, add link
* commit '6d05170a55ac6a9401e6089ba49d675857c3c25d':
  docs: b/14510382 ISO language code, add link
2014-05-19 17:04:53 +00:00
Ben Cheng
c12aab2afe Merge "Use default visibility for Snapshot::getLocalClip (attempt #2)." 2014-05-19 16:55:12 +00:00
Robert Greenwalt
34c83190bf Merge "Add docs for Linkproperties and unhide it." 2014-05-19 16:45:12 +00:00
Robert Greenwalt
4f05d55296 Add docs for Linkproperties and unhide it.
Preperation for ConnectivityManager API reveal.

Change-Id: Id2addf424213e796c6077def0b7f30cac9a0f75f
2014-05-19 09:43:36 -07:00
John Spurlock
53bccb7d8b Merge "Show current build number in the new bugreport tile." 2014-05-19 16:39:46 +00:00
John Spurlock
9ba2ffd86d Show current build number in the new bugreport tile.
Change-Id: I20c3894e115a4b3ff0a82016eb86d42f48fa6d54
2014-05-19 12:37:38 -04:00
Santos Cordon
dce9443f21 Merge "Fix build break." 2014-05-19 16:26:34 +00:00
Winson Chung
958e559b98 Merge "Initial changes to enable keyboard support with alternate Recents. (Bug 14067913)" 2014-05-19 16:25:40 +00:00
Santos Cordon
cb9086c5bf Fix build break.
Change-Id: If80984f9a62809829b3767193eff981ccb1185c7
2014-05-19 09:25:13 -07:00
John Spurlock
b82bbf6113 Merge "VolumeZen: Unify ringer + zen status bar icons." 2014-05-19 16:18:51 +00:00
Winson Chung
9aeb607399 Merge "Enabling alternate recents on all form factors." 2014-05-19 16:18:38 +00:00
Adrian Roos
c47bb2a323 Merge "Fix cropping for fullscreen windows" 2014-05-19 16:13:34 +00:00
Robert Greenwalt
f16f5788fa Merge "Apply Doc fixes to RouteInfo" 2014-05-19 15:53:15 +00:00
Robert Greenwalt
b26e44416a Merge "Add docs to Network" 2014-05-19 15:52:05 +00:00
Robert Greenwalt
99774edcfd Merge "Add javadoc for NetworkRequest." 2014-05-19 15:51:11 +00:00
Adrian Roos
22458ab380 Merge "Improve trust handling on dimsissing keyguard" 2014-05-19 15:26:15 +00:00
Santos Cordon
94a873de0f Merge "Remove methods added in TelephonyManager." 2014-05-19 15:18:51 +00:00
Robert Greenwalt
34524f06fb Add javadoc for NetworkRequest.
Also moved the requestId serial number out of this public class into CS.

Had to leave NetworkRequest hidden for now because the docs refer to things still hidden
in ConnectivityManager.

Change-Id: I14d1fe52d992adf5e4dc197b8f5433e40b0adfe6
2014-05-19 08:17:05 -07:00
Adrian Roos
336be7f7a4 Improve trust handling on dimsissing keyguard
The check for whether the device is in trusted mode happened at
the wrong time previously. Now it is checked when trying to dismiss
the keyguard.

Bug: 15072996
Change-Id: I81a3793ba1cf25468d3c923b2075f4c987b79e53
2014-05-19 17:11:18 +02:00
Robert Greenwalt
85956263c1 Add docs to Network
Still must be hidden until we unhide the new API in ConnectivityManager.

Change-Id: I4749e56777199093cdba9223eb3d721c3174047d
2014-05-19 07:59:16 -07:00
Robert Greenwalt
386aba8bd1 Apply Doc fixes to RouteInfo
Change-Id: Ib76df135d5514f7b8baafbbe91fa3d1cdd632f00
2014-05-19 07:27:46 -07:00
John Spurlock
ba2c6a084f VolumeZen: Unify ringer + zen status bar icons.
- Remove zen mode indicator from LHS.
- Update ringer mode icons to latest design.
- Zen mode trumps ringer mode in slot if enabled (as it will in QS).

Change-Id: I48bd7e8fdb2a19333b0b6d24d34cc98aa142691f
2014-05-19 10:10:42 -04:00
Robert Greenwalt
2631da82ae Merge "Update the docs for NetworkCapabilities" 2014-05-19 14:06:07 +00:00