Vinit Deshapnde
0d870c11e5
am 734ccfbc: (-s ours) am 2585e15e: am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
...
* commit '734ccfbc7b29a136e09e6a2ae788673fbd52f3b4':
Don't reset country code once it is persisted
2014-04-17 23:21:25 +00:00
Jeff Brown
aaea4d3a48
am 18a69b93: am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
...
* commit '18a69b936afa6bdb8c65b6b582989c4dcdac45ee':
Add support for dynamically setting the virtual display surface.
2014-04-17 22:59:59 +00:00
Simon Wilson
3e2cb07d52
am ef059b03: am 3c8bbe24: Check that mRemotePlayer is not null before use
...
* commit 'ef059b039407610fa00e6463b8354cbcc21b6ee9':
Check that mRemotePlayer is not null before use
2014-04-17 22:59:55 +00:00
Mark Salyzyn
4037847c02
am 73258630: Merge "jni: binder 64-bit compile issues"
...
* commit '7325863013e5c34d493e4e92ecadf4fea87554e7':
jni: binder 64-bit compile issues
2014-04-17 22:57:25 +00:00
Mindy Pereira
03f7f44250
am cb54f978: Merge "Update window alpha at the same time as translating" into klp-modular-dev
...
* commit 'cb54f978b565459210e80054e95becd1f8cae173':
Update window alpha at the same time as translating
2014-04-17 22:57:23 +00:00
Mindy Pereira
cb54f978b5
Merge "Update window alpha at the same time as translating" into klp-modular-dev
2014-04-17 22:53:24 +00:00
Mark Salyzyn
7325863013
Merge "jni: binder 64-bit compile issues"
2014-04-17 22:52:58 +00:00
Mark Salyzyn
cfd91e7852
jni: binder 64-bit compile issues
...
Change-Id: I8a3083e7e9389bbb84c2dd061fef059e0595800d
2014-04-17 15:40:01 -07:00
Jason Sams
53ad398074
Merge "Unhide RenderScript resize intrinsic"
2014-04-17 22:34:22 +00:00
RoboErik
0a57a1112f
Merge "Add RouteProviders to the new Media APIs"
2014-04-17 22:13:30 +00:00
Jianing Wei
5a4b02be33
Camera2 API: fix wrong logic in handling last frame number.
...
Change-Id: I23bdceada2460238c1e7fc45524ae491268b4243
2014-04-17 15:12:26 -07:00
Vinit Deshapnde
734ccfbc7b
am 2585e15e: am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
...
* commit '2585e15ef722c7bd8c320e57ded8ad67da121245':
Don't reset country code once it is persisted
2014-04-17 22:03:16 +00:00
RoboErik
07c7077c54
Add RouteProviders to the new Media APIs
...
Compiles and works with OneMedia. This currently is a rough test of
the system for finding, connecting to, and sending messages to routes.
This will just connect to the first route it finds when a request to
open the route picker is made (and disconnect when another request is
made).
Change-Id: I5de5521a079471b9e02664be4654c0591dfd9a6d
2014-04-17 15:02:33 -07:00
Vinit Deshapnde
2585e15ef7
am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
...
* commit '72358802d6135c633dd158f44b988e4f4075e6fd':
Don't reset country code once it is persisted
2014-04-17 21:57:12 +00:00
Jeff Brown
18a69b936a
am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
...
* commit '8e1e40066bae030d6a6e8f3f3f8f69ccd6ec1848':
Add support for dynamically setting the virtual display surface.
2014-04-17 21:53:34 +00:00
Mindy Pereira
b0ea484615
Update window alpha at the same time as translating
...
Note: algorithm for alpha per progress may be updated
This is a first pass proof of concept
Change-Id: Ia043200ea737ff9d132e350449e17ba0fde10d65
2014-04-17 14:53:24 -07:00
Jeff Brown
8e1e40066b
Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
2014-04-17 21:49:49 +00:00
Simon Wilson
ef059b0394
am 3c8bbe24: Check that mRemotePlayer is not null before use
...
* commit '3c8bbe245e7b0f937c36620c1427726fe9de50a6':
Check that mRemotePlayer is not null before use
2014-04-17 21:33:44 +00:00
Chris Craik
c306ad61a7
Add convenience methods to encourage usage of ALL_SAVE_FLAG
...
Change-Id: I7a3bb2b83ca0463282764898e755b5f1a71ac557
2014-04-17 14:28:18 -07:00
Simon Wilson
3c8bbe245e
Check that mRemotePlayer is not null before use
...
Bug: 14138829
Change-Id: Ie7ddb54ef3b82b9566ac41d4f0ff335976d3c907
2014-04-17 14:16:52 -07:00
Kenny Root
16c6b177ee
Use hidden API to validate APK chains
...
Bug: 13678484
Change-Id: I28dedab74b0e24d47ab9f2190298156c909e9d54
2014-04-17 14:03:33 -07:00
Jason Sams
18033abaaf
Unhide RenderScript resize intrinsic
...
Change-Id: I450c83ad00bcb7d999aaf7d4bd7ea88d63ab8fea
2014-04-17 13:52:26 -07:00
Zhijun He
f60194b115
Merge "Camera2: Update sync.frameNumber tag"
2014-04-17 20:40:19 +00:00
Zhijun He
4f91e2a459
Camera2: Update sync.frameNumber tag
...
This is from the type mismapping bug fix in metadata generation.
Change-Id: Icaa9916e00e76b30cdc5688c3d3b7e9cadf84794
2014-04-17 13:20:21 -07:00
Jorim Jaggi
bf19fa4fe6
Merge "Move bouncer to the bottom, but only on phones."
2014-04-17 19:57:25 +00:00
Jorim Jaggi
9a6eba3ce7
Move bouncer to the bottom, but only on phones.
...
Change-Id: Ibe03964a10a8cab9e179ff0618a6ed312c8b1b4a
2014-04-17 21:44:53 +02:00
Jason Sams
c99a9b28ef
am 5170476c: am a4af5726: am 112d1b94: Merge "Add BiCubic resize instrinsic"
...
* commit '5170476c5bf470b57616380aa7b15b44e5a24bea':
Add BiCubic resize instrinsic
2014-04-17 19:36:40 +00:00
Baligh Uddin
61e3991bf6
am 177d9b9a: (-s ours) am b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '177d9b9a25296d9cbe0f96497a8abf2fe28aa1da':
Import translations. DO NOT MERGE
2014-04-17 19:36:15 +00:00
Griff Hazen
d36e8df724
am 84f4adc9: Merge commit \'59dfbb91\' into klp-modular-dev-plus-aosp
...
* commit '84f4adc9a5e3cc818ed972dc7fecbafb131a779a':
Fix build [DO NOT MERGE]
2014-04-17 19:36:04 +00:00
Scott Main
1b866eeb58
am 2b7345e4: am b04f3f74: am cb38ee51: am a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs
...
* commit '2b7345e4e3eaa7fcf2f24ba4d03ae00a265adedc':
add image itemprop to specify image for search result snippet
2014-04-17 19:35:31 +00:00
Ricardo Cervera
004263eda2
am f162266c: am f64feec2: am 4aa68e97: am dc9ca02c: docs: Watermark images with easter eggs
...
* commit 'f162266cc44aa83e6a5b95fc4f629c80cf603416':
docs: Watermark images with easter eggs
2014-04-17 19:35:20 +00:00
Ricardo Cervera
a3b13847b0
docs: Added the play from search intent. Bug: 13473141.
...
Change-Id: Icf483b5e0446e064b32a782717408484d5806859
2014-04-17 12:31:18 -07:00
Raph Levien
0613657426
Merge changes Ia693f512,If3b7d41f
...
* changes:
Enable elegant text metrics in Quantum theme
Add elegantTextHeight text appearance attribute
2014-04-17 19:21:14 +00:00
Jorim Jaggi
56d46cc95f
Merge "Fix global screen rotation issue."
2014-04-17 19:08:37 +00:00
Vinit Deshapnde
72358802d6
am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
...
* commit '45e746766676681e4e191d0b7e521b8b3f6c284c':
Don't reset country code once it is persisted
2014-04-17 18:59:54 +00:00
Vinit Deshapnde
45e7467666
Merge "Don't reset country code once it is persisted" into klp-dev
2014-04-17 18:54:58 +00:00
Jorim Jaggi
ca36cf7bca
Fix global screen rotation issue.
...
Bug: 14080683
Change-Id: I0144faafa0e01c14c8c8e6a6c9fc81a10d25f47d
2014-04-17 20:49:30 +02:00
Jorim Jaggi
b91dfd95b1
Merge "Fix not being able to unlock SIM PIN."
2014-04-17 18:23:05 +00:00
Stephen Hines
f0aa4cc0f2
am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
...
* commit 'a48985349cb26757b6c4be18acc496ab6d1110e5':
Fix improper use of JNI_ABORT for operations where Java objects are written.
2014-04-17 18:20:47 +00:00
Jorim Jaggi
fa9189fd74
Fix not being able to unlock SIM PIN.
...
Bug: 14120902
Change-Id: I812d9679000242eabea617ea75cf8355d16926b2
2014-04-17 20:17:30 +02:00
Raph Levien
37938fca72
Enable elegant text metrics in Quantum theme
...
This changes the default quantum theme to use elegant text metrics,
which make use of a bit of extra vertical space to better render complex
scripts. It depends on the new elegantMetrics text attribute being
available.
Change-Id: Ia693f5129057fe8b9a633609c72eef388b988fea
2014-04-17 11:16:56 -07:00
Raph Levien
53c0077256
Add elegantTextHeight text appearance attribute
...
This patch adds an elegantTextHeight text appearance attribute and
plumbs it through to the paint. This attribute selects the elegant
variant of fonts (when appropriate, which is typically Arabic and indic
scripts), and also specifies larger vertical metrics, to avoid clipping.
The intent is for this to be the default for quantum themes, but this
patch doesn't change any default behavior, just adds the attribute.
The larger vertical metrics are applied to top and bottom, but should
not affect line spacing in the common case. Also, with the setting,
metrics are no longer dependent on the font, so setting a custom font
will preserve layout and spacing.
Change-Id: If3b7d41f141deff50ca078f479ca90c2aa07829a
2014-04-17 11:16:46 -07:00
Stephen Hines
a48985349c
Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
2014-04-17 18:15:38 +00:00
Alan Viverette
f805b40c44
Merge changes Ia2bf4d17,I8242523d
...
* changes:
Fix alert dialog alignment and touch feedback masking
Fix VectorDrawable states
2014-04-17 18:06:57 +00:00
Vinit Deshapnde
b5ee95edf9
Don't reset country code once it is persisted
...
This change simply ignores resetting of country code by cellular
networks to avoid disconnecting existing wifi connections. It also
defers setting newly found country code until after existing Wifi
connection is torn down.
Also removes some dead code related to resetting of country codes.
Bug: 13894807
Change-Id: Ie2fcfdd4b3be8ba94542772c132fb1acb6a2c683
2014-04-17 11:05:21 -07:00
Winson Chung
ecd9b3031c
Initial changes to add search bar.
...
- Scaling touch overscroll
Change-Id: Iee0523ca32efaae3491cbf5dbf3ea2e388f9d644
2014-04-17 10:52:34 -07:00
Leon Scroggins
7085d138b2
Merge "Call SkShader::isOpaque() to determine opaqueness."
2014-04-17 17:25:22 +00:00
Jason Sams
5170476c5b
am a4af5726: am 112d1b94: Merge "Add BiCubic resize instrinsic"
...
* commit 'a4af5726c4c8c882ca65a049bfa824922609d464':
Add BiCubic resize instrinsic
2014-04-17 17:07:48 +00:00
Chris Craik
ddd4a9b9c3
Merge "Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG""
2014-04-17 17:06:22 +00:00
Ji-Hwan Lee
e8ee783541
Merge "Minor fix to remove verbose logcat output in SyncStorageEngine"
2014-04-17 17:04:24 +00:00