OSDN Git Service
Vinit Deshapnde [Thu, 17 Apr 2014 23:34:38 +0000 (23:34 +0000)]
am
0d870c11: am
734ccfbc: (-s ours) am
2585e15e: am
72358802: am
45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
* commit '
0d870c11e55dd52b6fc5e2071af5b32877ecbd2b':
Don't reset country code once it is persisted
Vinit Deshapnde [Thu, 17 Apr 2014 23:21:25 +0000 (23:21 +0000)]
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
Jeff Brown [Thu, 17 Apr 2014 23:06:00 +0000 (23:06 +0000)]
am
aaea4d3a: am
18a69b93: am
8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
* commit '
aaea4d3a4822a380831084a779f52a8e767ce402':
Add support for dynamically setting the virtual display surface.
Simon Wilson [Thu, 17 Apr 2014 23:05:56 +0000 (23:05 +0000)]
am
3e2cb07d: am
ef059b03: am
3c8bbe24: Check that mRemotePlayer is not null before use
* commit '
3e2cb07d5258ca82cf4bd0b2e1380b36f56100d8':
Check that mRemotePlayer is not null before use
Jeff Brown [Thu, 17 Apr 2014 22:59:59 +0000 (22:59 +0000)]
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.
Simon Wilson [Thu, 17 Apr 2014 22:59:55 +0000 (22:59 +0000)]
am
ef059b03: am
3c8bbe24: Check that mRemotePlayer is not null before use
* commit '
ef059b039407610fa00e6463b8354cbcc21b6ee9':
Check that mRemotePlayer is not null before use
Jason Sams [Thu, 17 Apr 2014 22:46:58 +0000 (22:46 +0000)]
am
53ad3980: Merge "Unhide RenderScript resize intrinsic"
* commit '
53ad398074bd9a0c54baab3d66d5842edb0733f8':
Unhide RenderScript resize intrinsic
RoboErik [Thu, 17 Apr 2014 22:43:15 +0000 (15:43 -0700)]
resolved conflicts for merge of
0a57a111 to master-nova
Change-Id: Id9fad51341239051203a219d58213b9438effc50
Jason Sams [Thu, 17 Apr 2014 22:34:22 +0000 (22:34 +0000)]
Merge "Unhide RenderScript resize intrinsic"
RoboErik [Thu, 17 Apr 2014 22:13:29 +0000 (22:13 +0000)]
Merge "Add RouteProviders to the new Media APIs"
Vinit Deshapnde [Thu, 17 Apr 2014 22:03:16 +0000 (22:03 +0000)]
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
RoboErik [Thu, 20 Mar 2014 20:33:52 +0000 (13:33 -0700)]
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
Vinit Deshapnde [Thu, 17 Apr 2014 21:57:12 +0000 (21:57 +0000)]
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
Jeff Brown [Thu, 17 Apr 2014 21:53:34 +0000 (21:53 +0000)]
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.
Jeff Brown [Thu, 17 Apr 2014 21:49:49 +0000 (21:49 +0000)]
Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
Simon Wilson [Thu, 17 Apr 2014 21:33:44 +0000 (21:33 +0000)]
am
3c8bbe24: Check that mRemotePlayer is not null before use
* commit '
3c8bbe245e7b0f937c36620c1427726fe9de50a6':
Check that mRemotePlayer is not null before use
Simon Wilson [Thu, 17 Apr 2014 21:16:48 +0000 (14:16 -0700)]
Check that mRemotePlayer is not null before use
Bug:
14138829
Change-Id: Ie7ddb54ef3b82b9566ac41d4f0ff335976d3c907
Jason Sams [Thu, 17 Apr 2014 20:52:26 +0000 (13:52 -0700)]
Unhide RenderScript resize intrinsic
Change-Id: I450c83ad00bcb7d999aaf7d4bd7ea88d63ab8fea
Zhijun He [Thu, 17 Apr 2014 20:44:21 +0000 (20:44 +0000)]
am
f60194b1: Merge "Camera2: Update sync.frameNumber tag"
* commit '
f60194b115edb4797464dd3714ed9d03f3ff21ff':
Camera2: Update sync.frameNumber tag
Zhijun He [Thu, 17 Apr 2014 20:40:18 +0000 (20:40 +0000)]
Merge "Camera2: Update sync.frameNumber tag"
Zhijun He [Thu, 17 Apr 2014 20:20:21 +0000 (13:20 -0700)]
Camera2: Update sync.frameNumber tag
This is from the type mismapping bug fix in metadata generation.
Change-Id: Icaa9916e00e76b30cdc5688c3d3b7e9cadf84794
Jorim Jaggi [Thu, 17 Apr 2014 20:03:24 +0000 (20:03 +0000)]
am
bf19fa4f: Merge "Move bouncer to the bottom, but only on phones."
* commit '
bf19fa4fe653fbba9bed5d3a13f52e043ac44dab':
Move bouncer to the bottom, but only on phones.
Jorim Jaggi [Thu, 17 Apr 2014 19:57:25 +0000 (19:57 +0000)]
Merge "Move bouncer to the bottom, but only on phones."
Jorim Jaggi [Thu, 17 Apr 2014 19:44:53 +0000 (21:44 +0200)]
Move bouncer to the bottom, but only on phones.
Change-Id: Ibe03964a10a8cab9e179ff0618a6ed312c8b1b4a
Jason Sams [Thu, 17 Apr 2014 19:43:36 +0000 (19:43 +0000)]
am
c99a9b28: am
5170476c: am
a4af5726: am
112d1b94: Merge "Add BiCubic resize instrinsic"
* commit '
c99a9b28ef9d480fcbffb070db79eb76a9aae30b':
Add BiCubic resize instrinsic
Baligh Uddin [Thu, 17 Apr 2014 19:43:31 +0000 (19:43 +0000)]
am
61e3991b: (-s ours) am
177d9b9a: (-s ours) am
b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
61e3991bf64b86de32ad24ffcf1753f0f8a80166':
Import translations. DO NOT MERGE
Griff Hazen [Thu, 17 Apr 2014 19:43:27 +0000 (19:43 +0000)]
am
d36e8df7: am
84f4adc9: Merge commit \'
59dfbb91\' into klp-modular-dev-plus-aosp
* commit '
d36e8df7241f2433233377bbc803468c91ae8ad9':
Fix build [DO NOT MERGE]
Scott Main [Thu, 17 Apr 2014 19:43:21 +0000 (19:43 +0000)]
am
1b866eeb: am
2b7345e4: am
b04f3f74: am
cb38ee51: am
a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs
* commit '
1b866eeb58867fd9bb2496dacdd3283c18893792':
add image itemprop to specify image for search result snippet
Ricardo Cervera [Thu, 17 Apr 2014 19:43:13 +0000 (19:43 +0000)]
am
004263ed: am
f162266c: am
f64feec2: am
4aa68e97: am
dc9ca02c: docs: Watermark images with easter eggs
* commit '
004263eda24b672dc4fb42fe2cc931652e4e12ad':
docs: Watermark images with easter eggs
Jason Sams [Thu, 17 Apr 2014 19:36:40 +0000 (19:36 +0000)]
am
5170476c: am
a4af5726: am
112d1b94: Merge "Add BiCubic resize instrinsic"
* commit '
5170476c5bf470b57616380aa7b15b44e5a24bea':
Add BiCubic resize instrinsic
Baligh Uddin [Thu, 17 Apr 2014 19:36:15 +0000 (19:36 +0000)]
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
Griff Hazen [Thu, 17 Apr 2014 19:36:04 +0000 (19:36 +0000)]
am
84f4adc9: Merge commit \'
59dfbb91\' into klp-modular-dev-plus-aosp
* commit '
84f4adc9a5e3cc818ed972dc7fecbafb131a779a':
Fix build [DO NOT MERGE]
Scott Main [Thu, 17 Apr 2014 19:35:31 +0000 (19:35 +0000)]
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
Ricardo Cervera [Thu, 17 Apr 2014 19:35:20 +0000 (19:35 +0000)]
am
f162266c: am
f64feec2: am
4aa68e97: am
dc9ca02c: docs: Watermark images with easter eggs
* commit '
f162266cc44aa83e6a5b95fc4f629c80cf603416':
docs: Watermark images with easter eggs
Raph Levien [Thu, 17 Apr 2014 19:24:38 +0000 (19:24 +0000)]
am
06136574: Merge changes Ia693f512,If3b7d41f
* commit '
0613657426aecb7ed6141c133f100baf24166ae0':
Enable elegant text metrics in Quantum theme
Add elegantTextHeight text appearance attribute
Raph Levien [Thu, 17 Apr 2014 19:21:14 +0000 (19:21 +0000)]
Merge changes Ia693f512,If3b7d41f
* changes:
Enable elegant text metrics in Quantum theme
Add elegantTextHeight text appearance attribute
Jorim Jaggi [Thu, 17 Apr 2014 19:14:58 +0000 (19:14 +0000)]
am
56d46cc9: Merge "Fix global screen rotation issue."
* commit '
56d46cc95f761eabc6455f3e391835936b7d05e8':
Fix global screen rotation issue.
Jorim Jaggi [Thu, 17 Apr 2014 19:08:37 +0000 (19:08 +0000)]
Merge "Fix global screen rotation issue."
Vinit Deshapnde [Thu, 17 Apr 2014 18:59:54 +0000 (18:59 +0000)]
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
Vinit Deshapnde [Thu, 17 Apr 2014 18:54:58 +0000 (18:54 +0000)]
Merge "Don't reset country code once it is persisted" into klp-dev
Jorim Jaggi [Thu, 17 Apr 2014 18:36:15 +0000 (20:36 +0200)]
Fix global screen rotation issue.
Bug:
14080683
Change-Id: I0144faafa0e01c14c8c8e6a6c9fc81a10d25f47d
Jorim Jaggi [Thu, 17 Apr 2014 18:29:48 +0000 (18:29 +0000)]
am
b91dfd95: Merge "Fix not being able to unlock SIM PIN."
* commit '
b91dfd95b19f13be5497ea521ed14df8471b0e2e':
Fix not being able to unlock SIM PIN.
Jorim Jaggi [Thu, 17 Apr 2014 18:23:05 +0000 (18:23 +0000)]
Merge "Fix not being able to unlock SIM PIN."
Alan Viverette [Thu, 17 Apr 2014 18:19:51 +0000 (18:19 +0000)]
am
f805b40c: Merge changes Ia2bf4d17,I8242523d
* commit '
f805b40c44769a751d10d404e8ea778a23d5a51a':
Fix alert dialog alignment and touch feedback masking
Fix VectorDrawable states
Jorim Jaggi [Thu, 17 Apr 2014 18:17:30 +0000 (20:17 +0200)]
Fix not being able to unlock SIM PIN.
Bug:
14120902
Change-Id: I812d9679000242eabea617ea75cf8355d16926b2
Raph Levien [Mon, 14 Apr 2014 21:38:51 +0000 (14:38 -0700)]
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
Raph Levien [Mon, 14 Apr 2014 21:11:02 +0000 (14:11 -0700)]
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
Leon Scroggins [Thu, 17 Apr 2014 18:13:44 +0000 (18:13 +0000)]
am
7085d138: Merge "Call SkShader::isOpaque() to determine opaqueness."
* commit '
7085d138b21bbce7c9c989c719b35769267b422e':
Call SkShader::isOpaque() to determine opaqueness.
Chris Craik [Thu, 17 Apr 2014 18:13:40 +0000 (18:13 +0000)]
am
ddd4a9b9: Merge "Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG""
* commit '
ddd4a9b9c329274d56a72d84f11dc0148215c406':
Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"
Ji-Hwan Lee [Thu, 17 Apr 2014 18:13:36 +0000 (18:13 +0000)]
am
e8ee7835: Merge "Minor fix to remove verbose logcat output in SyncStorageEngine"
* commit '
e8ee7835410f531808d5e60eeacf922ae41aa0d9':
Minor fix to remove verbose logcat output in SyncStorageEngine
George Mount [Thu, 17 Apr 2014 18:13:30 +0000 (18:13 +0000)]
am
99d2ffa1: Merge "Split Activity Transitions out of PhoneWindow."
* commit '
99d2ffa1268da1258390fa6f272bf41687084d7b':
Split Activity Transitions out of PhoneWindow.
Chris Craik [Thu, 17 Apr 2014 18:13:20 +0000 (18:13 +0000)]
am
0932cf87: Merge "Deprecate color array drawBitmap methods"
* commit '
0932cf87c131f9238538fd7137b282adbe71dc37':
Deprecate color array drawBitmap methods
Chris Craik [Thu, 17 Apr 2014 18:13:15 +0000 (18:13 +0000)]
am
2632f197: Merge "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"
* commit '
2632f19728e388b85ecb77095bbb4b0aa18b75e2':
Add convenience methods, to encourage usage of ALL_SAVE_FLAG
Robin Lee [Thu, 17 Apr 2014 18:12:57 +0000 (18:12 +0000)]
am
56a0a269: Merge "Allow ProfileOwner apps to manage app restrictions"
* commit '
56a0a269cd7309476c5f49a21563249e97f70a9e':
Allow ProfileOwner apps to manage app restrictions
Baligh Uddin [Thu, 17 Apr 2014 18:12:54 +0000 (18:12 +0000)]
am
5f0f5487: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
5f0f54871fc6014af06d6c265b8ae42e7da0b9d5':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 18:12:50 +0000 (18:12 +0000)]
am
cdb6bb59: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
cdb6bb59c7790e3c811171b4a9a646cb704e301e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 18:12:45 +0000 (18:12 +0000)]
am
0c4d25f7: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
0c4d25f79987577d4b5a4c63d4ee25773c0fb472':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 18:12:41 +0000 (18:12 +0000)]
am
16b5480b: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
16b5480bd0a0e9e6830e3bcf36c923a5e872aff2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 18:12:37 +0000 (18:12 +0000)]
am
715ec84d: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
715ec84d4cd67dcb8227228b41a9d0bc5b95c953':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 18:12:33 +0000 (18:12 +0000)]
am
b1a19c51: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
b1a19c513419f951a4cd12a69773b0ae56f4386e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 18:12:28 +0000 (18:12 +0000)]
am
48bd1b19: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
48bd1b195f0137f17cde28e3667f2973244a01e2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 18:12:24 +0000 (18:12 +0000)]
am
72f8056d: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
72f8056db184e48bc4bd4ebb4511d1b4de8fda14':
Import translations. DO NOT MERGE
John Spurlock [Thu, 17 Apr 2014 18:12:09 +0000 (18:12 +0000)]
am
9b5d028c: Merge "Interim quick settings update."
* commit '
9b5d028c695d2d6f1612648b2ac27a7b7577c436':
Interim quick settings update.
Adrian Roos [Thu, 17 Apr 2014 18:12:03 +0000 (18:12 +0000)]
am
379ac2d8: Merge "Fix broken status bar when activity is showing above keyguard"
* commit '
379ac2d8b69065eb22ee24d9f3e4d90ec62bc413':
Fix broken status bar when activity is showing above keyguard
Adrian Roos [Thu, 17 Apr 2014 18:11:57 +0000 (18:11 +0000)]
am
c8ba7d3f: Make camera affordance fly away
* commit '
c8ba7d3f871bb7f4487ea54430f22b7a479b52b0':
Make camera affordance fly away
Alan Viverette [Thu, 17 Apr 2014 18:06:57 +0000 (18:06 +0000)]
Merge changes Ia2bf4d17,I8242523d
* changes:
Fix alert dialog alignment and touch feedback masking
Fix VectorDrawable states
Vinit Deshapnde [Thu, 17 Apr 2014 18:05:21 +0000 (11:05 -0700)]
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
Leon Scroggins [Thu, 17 Apr 2014 17:25:22 +0000 (17:25 +0000)]
Merge "Call SkShader::isOpaque() to determine opaqueness."
Jason Sams [Thu, 17 Apr 2014 17:07:48 +0000 (17:07 +0000)]
am
a4af5726: am
112d1b94: Merge "Add BiCubic resize instrinsic"
* commit '
a4af5726c4c8c882ca65a049bfa824922609d464':
Add BiCubic resize instrinsic
Chris Craik [Thu, 17 Apr 2014 17:06:22 +0000 (17:06 +0000)]
Merge "Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG""
Ji-Hwan Lee [Thu, 17 Apr 2014 17:04:24 +0000 (17:04 +0000)]
Merge "Minor fix to remove verbose logcat output in SyncStorageEngine"
Jason Sams [Thu, 17 Apr 2014 17:02:10 +0000 (17:02 +0000)]
am
112d1b94: Merge "Add BiCubic resize instrinsic"
* commit '
112d1b94ee8456dba16842e6b964eb35aef95818':
Add BiCubic resize instrinsic
George Mount [Thu, 17 Apr 2014 16:51:59 +0000 (16:51 +0000)]
Merge "Split Activity Transitions out of PhoneWindow."
George Mount [Tue, 25 Mar 2014 00:44:36 +0000 (17:44 -0700)]
Split Activity Transitions out of PhoneWindow.
Bug
13622834
Made it possible to use shared elements without making
Views invisible.
Change-Id: I1e85c6bc19e634a9af225ad7f0309b4f003ea462
Chris Craik [Thu, 17 Apr 2014 16:37:23 +0000 (16:37 +0000)]
Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"
This reverts commit
39b7353acacf08a3c0204a9ec122fff420e53310.
Change-Id: I732eab8a2843dd23c86bd1526ec95db5352d39a0
Chris Craik [Thu, 17 Apr 2014 16:31:16 +0000 (16:31 +0000)]
Merge "Deprecate color array drawBitmap methods"
Chris Craik [Thu, 17 Apr 2014 16:30:26 +0000 (16:30 +0000)]
Merge "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"
Robin Lee [Thu, 17 Apr 2014 15:54:53 +0000 (15:54 +0000)]
Merge "Allow ProfileOwner apps to manage app restrictions"
Baligh Uddin [Thu, 17 Apr 2014 15:53:11 +0000 (15:53 +0000)]
am
b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
b279f5272e2c7554aeab930ba0aabab12efff9e2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 15:48:52 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:50 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:48 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:45 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:38 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 17 Apr 2014 15:48:36 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:31 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:29 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:22 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Robin Lee [Wed, 9 Apr 2014 15:44:21 +0000 (16:44 +0100)]
Allow ProfileOwner apps to manage app restrictions
Simple wrapper around the UserManager.{get|set}ApplicationRestrictions
APIs. Also added a new Intent to signal to running apps that the set
of restrictions has changed since startup.
Change-Id: Ifd108108a73f87325b499d9de2e1b2aacc59b264
John Spurlock [Thu, 17 Apr 2014 14:38:05 +0000 (14:38 +0000)]
Merge "Interim quick settings update."
John Spurlock [Tue, 15 Apr 2014 20:14:46 +0000 (16:14 -0400)]
Interim quick settings update.
Make existing QS panel available via pulldown from header
(or keyguard status view on keyguard), update the affordances
as a hint.
Don't allow QS to scroll, cap to max rows.
Add scrim over panel to indicate that this is purely temporary.
Bug:
14081801
Bug:
14059974
Change-Id: I166033975cbc44b91f45ee70ea5c7540390670dd
Skia_Android Canary Bot [Wed, 16 Apr 2014 23:06:52 +0000 (19:06 -0400)]
Call SkShader::isOpaque() to determine opaqueness.
It is invalid to call SkShader::getFlags() before calling
SkShader::setContext() - it will always return 0. Instead, call
SkShader::isOpaque().
Change-Id: If35108dc7f0eca55d2ec8466b8a50fd54dfb13a2
Adrian Roos [Thu, 17 Apr 2014 13:54:57 +0000 (13:54 +0000)]
Merge "Fix broken status bar when activity is showing above keyguard"
Adrian Roos [Thu, 17 Apr 2014 13:46:41 +0000 (15:46 +0200)]
Fix broken status bar when activity is showing above keyguard
Bug:
14077213
Change-Id: I5d45fd1780498983995a469d0799e024ca25f3c7
Adrian Roos [Thu, 17 Apr 2014 13:09:41 +0000 (15:09 +0200)]
Make camera affordance fly away
Stop gap measure to differenciate the accepted vs rejected
response of the camera affordance on the lockscreen.
Bug:
14081010
Change-Id: I04d170aa3f07ce5f440fb1d27f7c62ef2a903a03
Griff Hazen [Thu, 17 Apr 2014 09:53:18 +0000 (02:53 -0700)]
Merge commit '
59dfbb91' into klp-modular-dev-plus-aosp
Remove all changes from the merge to stop propagation.
Conflicts:
tools/layoutlib/bridge/src/android/content/res/AssetManager_Delegate.java
Deepanshu Gupta [Thu, 17 Apr 2014 07:14:28 +0000 (00:14 -0700)]
Fix build [DO NOT MERGE]
The branch is missing some CLs for 64-bit support. So, until they are
added, this change will fix the build.
Change-Id: Ia838caf60ca49b406101a3fb48a96afdcfb30c66
Sungsoo Lim [Thu, 17 Apr 2014 06:53:20 +0000 (06:53 +0000)]
am
33ac0dfc: Merge "Replace sessionStateMap with sessionTokens."
* commit '
33ac0dfc9f9480b71aa45436807682219e3e160b':
Replace sessionStateMap with sessionTokens.
John Reck [Thu, 17 Apr 2014 06:53:16 +0000 (06:53 +0000)]
am
c7314356: Merge "Add missing resume() call"
* commit '
c731435649ef42a454a7e2e22fa2e303a242f8f9':
Add missing resume() call
John Reck [Thu, 17 Apr 2014 06:53:12 +0000 (06:53 +0000)]
am
3b3d66ef: Merge "Clear mIgnoreDirtyState after draw"
* commit '
3b3d66ef68628adb34c7c315fa5cefbce92c4bf1':
Clear mIgnoreDirtyState after draw