Jim Miller
a516481fef
am 71fb32e0: am 5305fe3f: am 39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev
...
* commit '71fb32e0801ee9b4d0ed1c9063afbdf17635b30e':
Don't set up external displays from binder thread
2013-11-13 18:48:43 -08:00
Jim Miller
35f5bdd160
am fdf7c36d: am 378c804d: am c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev
...
* commit 'fdf7c36daaeec8c6ad7872f81e1f9c3faf1a0e91':
Report keyguard as initially showing and secure until we know
2013-11-13 18:48:36 -08:00
Craig Mautner
a3da4623b1
am 1fbb5da2: am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into klp-dev
...
* commit '1fbb5da29a4ebef1d758dffad9c2704a5932d223':
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Add null pointer check.
Import translations. DO NOT MERGE
Small DocumentsProvider doc improvements.
Keyguard isn't visible if it hasn't been drawn.
Enable fast camera transition when launched from navbar
Reduce camera launch time by about 250ms.
camera2: Remove prior repeating request when setting.
2013-11-13 18:47:54 -08:00
Svetoslav
1b967a1b23
resolved conflicts for merge of 9358d98d to master
...
Change-Id: I1facdcec6eeaa10805300c9d634957fbb86815d3
2013-11-13 18:43:32 -08:00
Jim Miller
71fb32e080
am 5305fe3f: am 39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev
...
* commit '5305fe3f0971274d90d875cfbeffdb18e3b03f09':
Don't set up external displays from binder thread
2013-11-13 17:54:11 -08:00
Jim Miller
fdf7c36daa
am 378c804d: am c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev
...
* commit '378c804d652f32547d3fe460842e5720b57bd9f1':
Report keyguard as initially showing and secure until we know
2013-11-13 17:54:04 -08:00
Jim Miller
5305fe3f09
am 39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev
...
* commit '39af5a78c073d01539625a9fbbb8511747e2f048':
Don't set up external displays from binder thread
2013-11-13 17:50:26 -08:00
Jim Miller
378c804d65
am c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev
...
* commit 'c8867b2807b6d7ffcd3c2f935d1fe8c857a9ef8d':
Report keyguard as initially showing and secure until we know
2013-11-13 17:50:18 -08:00
Jim Miller
39af5a78c0
Merge "Don't set up external displays from binder thread" into klp-dev
2013-11-14 01:47:32 +00:00
Jim Miller
c8867b2807
Merge "Report keyguard as initially showing and secure until we know" into klp-dev
2013-11-14 01:45:52 +00:00
Jim Miller
80cb9bcfc0
Don't set up external displays from binder thread
...
This fixes a bug where keyguard was attempting to set up
external presentation displays from the binder thread instead
of the UI thread. Bad dog.
Fixes bug 11676486
Change-Id: Iadbe485691acc56a41b23219fe399f7eda40cb7c
2013-11-13 16:47:20 -08:00
Jim Miller
e5f17ab5a6
Report keyguard as initially showing and secure until we know
...
This fixes a bug where an app calls KeyguardManager.isLocked()
before keyguard has had a chance to show. The fix is to assume
keyguard is showing and secure until we know otherwise.
Fixes bug 11670159
Change-Id: Ifbe4cdf40e3b76d2069ecace940f85fa58f31187
2013-11-13 15:40:48 -08:00
Baligh Uddin
ef6a8aeb43
Merge "Import translations. DO NOT MERGE"
2013-11-13 22:39:57 +00:00
Baligh Uddin
dc0acc6f5d
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-11-13 22:39:40 +00:00
Jim Miller
3b44dd88a5
am 291b7f56: am 3714473f: Merge "Enable fast camera transition when launched from navbar" into klp-dev
...
* commit '291b7f56159a942911c5e83c42b89ecd2440708c':
Enable fast camera transition when launched from navbar
2013-11-13 14:32:35 -08:00
Jim Miller
291b7f5615
am 3714473f: Merge "Enable fast camera transition when launched from navbar" into klp-dev
...
* commit '3714473f1a077cae6eca3079da67a7dd09dcff65':
Enable fast camera transition when launched from navbar
2013-11-13 14:28:06 -08:00
Jim Miller
13c7984d2d
am cefe47c0: am 9c8d56a6: Merge "Reduce camera launch time by about 250ms." into klp-dev
...
* commit 'cefe47c0d3471aedd4f7d4d3b5137a2a95161ad4':
Reduce camera launch time by about 250ms.
2013-11-13 14:27:58 -08:00
Svetoslav Ganov
9358d98d83
am 852a8895: am d697ba73: Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev
...
* commit '852a8895e18ad578a4c299d13615a4cbb3ee1211':
Fix NPE at PrintSpooler in Japanese environment.
2013-11-13 14:27:54 -08:00
Jim Miller
cefe47c0d3
am 9c8d56a6: Merge "Reduce camera launch time by about 250ms." into klp-dev
...
* commit '9c8d56a692198a3fc1629a0407ea6027f04e9a91':
Reduce camera launch time by about 250ms.
2013-11-13 14:24:26 -08:00
Svetoslav Ganov
852a8895e1
am d697ba73: Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev
...
* commit 'd697ba73b5a5fc5dc502a117a8f06e8f1a5359b9':
Fix NPE at PrintSpooler in Japanese environment.
2013-11-13 14:24:23 -08:00
Jim Miller
3714473f1a
Merge "Enable fast camera transition when launched from navbar" into klp-dev
2013-11-13 22:23:34 +00:00
Jim Miller
9c8d56a692
Merge "Reduce camera launch time by about 250ms." into klp-dev
2013-11-13 22:22:13 +00:00
Svetoslav Ganov
d697ba73b5
Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev
2013-11-13 22:19:57 +00:00
Baligh Uddin
eae7159444
Import translations. DO NOT MERGE
...
Change-Id: I8788c70c6920a36c5187ad415e5d17d3b7d525ca
Auto-generated-cl: translation import
2013-11-13 13:43:06 -08:00
Baligh Uddin
b4aac8d832
Import translations. DO NOT MERGE
...
Change-Id: I11d764583416d7fb4dfc85ebe81a98b6a1267424
Auto-generated-cl: translation import
2013-11-13 13:39:45 -08:00
Baligh Uddin
5cc3ddf16f
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-11-13 21:04:07 +00:00
Daniel Sandler
bd8492b564
am 08603411: am 2f4fb5ee: am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev
...
* commit '086034117d9214de6339a29b93412276eb00afea':
Bespoke, handcrafted, artisanal assist affordance assets.
2013-11-13 12:20:05 -08:00
Daniel Sandler
8831a7aceb
am 076dcaf1: am 80ffcb19: am 42498417: Merge "DessertCase fixes:" into klp-dev
...
* commit '076dcaf11b4fd3deef52bddfc2b2e7727f6364a1':
DessertCase fixes:
2013-11-13 12:20:01 -08:00
Daniel Sandler
296c206a25
am 94913629: am 6150abd8: am f554042a: Merge "Switch DeadZone to Slog." into klp-dev
...
* commit '94913629bee49a035e33d387e5e303736b82ac51':
Switch DeadZone to Slog.
2013-11-13 12:19:57 -08:00
Daniel Sandler
086034117d
am 2f4fb5ee: am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev
...
* commit '2f4fb5eef5ac5c08f7d30c75b56990ce5a729509':
Bespoke, handcrafted, artisanal assist affordance assets.
2013-11-13 12:14:25 -08:00
Daniel Sandler
076dcaf11b
am 80ffcb19: am 42498417: Merge "DessertCase fixes:" into klp-dev
...
* commit '80ffcb194b31839308bbe57c057611fd41cef5e1':
DessertCase fixes:
2013-11-13 12:14:22 -08:00
Daniel Sandler
94913629be
am 6150abd8: am f554042a: Merge "Switch DeadZone to Slog." into klp-dev
...
* commit '6150abd8f9557a923e1e9753d5c35d241cd79411':
Switch DeadZone to Slog.
2013-11-13 12:14:19 -08:00
Daniel Sandler
2f4fb5eef5
am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev
...
* commit '31f7c912f0b6a2cfa2ea0f0b3a9022e8323f5542':
Bespoke, handcrafted, artisanal assist affordance assets.
2013-11-13 12:07:20 -08:00
Daniel Sandler
80ffcb194b
am 42498417: Merge "DessertCase fixes:" into klp-dev
...
* commit '424984172bb2a89dd06cc49fd5a3665bc7c85e5c':
DessertCase fixes:
2013-11-13 12:07:16 -08:00
Daniel Sandler
6150abd8f9
am f554042a: Merge "Switch DeadZone to Slog." into klp-dev
...
* commit 'f554042a9582c5b4ad1b0d41bc08a0caad470798':
Switch DeadZone to Slog.
2013-11-13 12:07:13 -08:00
Baligh Uddin
9f500fe103
Import translations. DO NOT MERGE
...
Change-Id: Id312643b2e858fa84f81b37975a1757ff1773b87
Auto-generated-cl: translation import
2013-11-13 11:54:28 -08:00
Keiji Ariyama
1a8c7135f0
Fix NPE at PrintSpooler in Japanese environment.
...
MediaSize ID have to be upper cases.
Change-Id: I84af01dbd185df210b5ebb1de282a4091e06df05
Related-issue: https://code.google.com/p/android/issues/detail?id=61984
2013-11-13 11:43:26 -08:00
Daniel Sandler
31f7c912f0
Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev
2013-11-13 19:32:42 +00:00
Daniel Sandler
424984172b
Merge "DessertCase fixes:" into klp-dev
2013-11-13 19:32:27 +00:00
Daniel Sandler
f554042a95
Merge "Switch DeadZone to Slog." into klp-dev
2013-11-13 19:32:24 +00:00
Jeff Brown
7671231d41
am e5ae0bfd: am a20f625c: am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev
...
* commit 'e5ae0bfdf7933d7ea8bec94f0c7e25347c423710':
Finalize assets for screen casting.
2013-11-13 09:02:27 -08:00
Jeff Brown
e5ae0bfdf7
am a20f625c: am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev
...
* commit 'a20f625cc1006b03d4a2be90ba35d1a9783ad363':
Finalize assets for screen casting.
2013-11-13 08:58:53 -08:00
Jeff Brown
a20f625cc1
am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev
...
* commit '41b92b008e03be95db938e0238ccb9373c2aaadc':
Finalize assets for screen casting.
2013-11-13 08:54:27 -08:00
Jeff Brown
e7ae644522
Finalize assets for screen casting.
...
Extend wifi display connection timeout.
Show a notification while connecting to wifi display.
Ensure that remote display providers are really trusted before
connecting to them.
Bug: 11257292
Change-Id: Iad0caaa30d7946df818bc75ade071f2e377f8a53
2013-11-13 02:17:53 -08:00
Jim Miller
c816b8eedb
Enable fast camera transition when launched from navbar
...
This reduces the camera transition timeout to 0 if launched
from the navigation bar. The transition cannot be aborted once
launched.
Change-Id: I7c376fbb90fd51cd301ef49fbd3411370bc2e4b5
2013-11-12 19:52:12 -08:00
Daniel Sandler
5c6a781eaf
DessertCase fixes:
...
- No more crashing on first launch of the easter egg
- Use IMMERSIVE_STICKY to avoid getting stuck with bars
Bug: 11319125
Change-Id: I4522feb36c29be8446715ba67d454a2012d181ca
2013-11-12 22:32:03 -05:00
Jim Miller
aa89847f4e
Reduce camera launch time by about 250ms.
...
This reduces the amount of time available to the user to cancel
launching the camera in order to improve average launch time.
It also increases the threshhold for flings and motions to prevent
unintentional launches which are costly in terms of falsing.
Fixes bug b/11657355
Change-Id: I852abbe3ce8ddddcb65f3a48a2f8111d20126189
2013-11-12 18:14:26 -08:00
Daniel Sandler
b65da9e720
Bespoke, handcrafted, artisanal assist affordance assets.
...
Bug: 11243771
Change-Id: I6eb320ca78ccafc435259d30df95582aa7e3c53c
2013-11-12 20:54:31 -05:00
Daniel Sandler
29787f6ed9
Switch DeadZone to Slog.
...
Should help us identify stray clicks further back in time
thanks to the longer system log buffer.
Bug: 11273982
Change-Id: Ie2bf445622afff3dbc903adad6c0497954fa5fe0
2013-11-12 20:33:34 -05:00
Jeff Sharkey
d5a9fb067c
am 874dfd73: am 34163e82: am 55d12486: Merge "Give storage provider access to secondary devices." into klp-dev
...
* commit '874dfd733a2fd2224f155ee2c4cf5e3065676402':
Give storage provider access to secondary devices.
2013-11-11 20:51:48 -08:00