Jeff Sharkey
ad9739cdbe
am 5f7f97e0: am 2dbe1627: am 12ad9ce2: Merge "Fix spelling." into klp-dev
...
* commit '5f7f97e01507c6d5860388dfea860e05c2a3616e':
Fix spelling.
2013-10-14 10:48:23 -07:00
Svetoslav
0983f49eff
am 00040103: am 8e80d1f9: am 33021d95: Merge "Adding timeout if the current printer or its capabilities disappear." into klp-dev
...
* commit '0004010369ef713ae9bdbdeb8e16bfbdcd835811':
Adding timeout if the current printer or its capabilities disappear.
2013-10-14 10:48:19 -07:00
Matthew Williams
d08d6686c5
resolved conflicts for merge of 94b51810 to master
...
Change-Id: Ida818f066b66c356a84c80e5eab0a4e2cf4ebd49
2013-10-14 10:39:41 -07:00
Jeff Sharkey
7a531be13b
am 94758633: am b5da7b23: Merge "Throw when taking non-existant Uri permission." into klp-dev
...
* commit '94758633943e77c820fd77f96329848cc7f31230':
Throw when taking non-existant Uri permission.
2013-10-14 10:29:15 -07:00
John Spurlock
f1dd32c84f
am fc2ecd5e: am 774e8ad8: Merge "Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY." into klp-dev
...
* commit 'fc2ecd5e3f5b336f7955f4c02521ba6faad1e93c':
Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY.
2013-10-14 10:29:12 -07:00
Jeff Sharkey
9475863394
am b5da7b23: Merge "Throw when taking non-existant Uri permission." into klp-dev
...
* commit 'b5da7b23df5278a5e722b601eb8ef7e98537a51e':
Throw when taking non-existant Uri permission.
2013-10-14 10:26:13 -07:00
John Spurlock
fc2ecd5e3f
am 774e8ad8: Merge "Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY." into klp-dev
...
* commit '774e8ad88331f82994e38d721418da556ce9edea':
Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY.
2013-10-14 10:26:08 -07:00
Jeff Sharkey
b5da7b23df
Merge "Throw when taking non-existant Uri permission." into klp-dev
2013-10-14 17:24:14 +00:00
John Spurlock
774e8ad883
Merge "Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY." into klp-dev
2013-10-14 17:21:33 +00:00
Victoria Lease
4c4a469cbf
am 677687c2: am edbab7b5: Merge "no layout = no visibility" into klp-dev
...
* commit '677687c20864d4af9c24614f22aae035c0c07ce6':
no layout = no visibility
2013-10-14 10:12:01 -07:00
John Spurlock
f1a36648ca
Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY.
...
Migrate transient bar mode to IMMERSIVE_STICKY, and
introduce new behavior for IMMERSIVE: namely the
opaque bars are revealed by clearing the flags on swipe.
Remove low-profile optimization that confuses api demos
and other apps using low-profile as a signal.
TransientNavigationConfirmation renamed to
ImmersiveModeConfirmation, and its associated resources,
since the confirmation is now shown when the nav bar is
shown in either of the two immersive modes.
Remove unused Toast.makeBar and associated hidden framework
bits now that the confirmation uses a cling instead.
Bug:11062108
Change-Id: Iae49d31973940b9bee9f5b1827756db5eaa76aa3
2013-10-14 13:11:21 -04:00
Victoria Lease
677687c208
am edbab7b5: Merge "no layout = no visibility" into klp-dev
...
* commit 'edbab7b58227e66c2cc4e868bba314020ef52080':
no layout = no visibility
2013-10-14 10:10:08 -07:00
Victoria Lease
edbab7b582
Merge "no layout = no visibility" into klp-dev
2013-10-14 17:08:10 +00:00
Scott Main
4c33396508
am a8891de3: am 9ecc2904: am da5d7027: am 5a99a702: am 4dfe8944: Merge "add docs about managing app memory" into jb-mr2-docs
...
* commit 'a8891de3776aa38d13f3e6119233ba1345dff1ef':
add docs about managing app memory
2013-10-14 10:07:21 -07:00
Scott Main
a8891de377
am 9ecc2904: am da5d7027: am 5a99a702: am 4dfe8944: Merge "add docs about managing app memory" into jb-mr2-docs
...
* commit '9ecc29043ff1ee1da5dd7b9bdad687a492cbd861':
add docs about managing app memory
2013-10-14 10:03:30 -07:00
Jeff Sharkey
582f712406
Throw when taking non-existant Uri permission.
...
Bug: 11080911
Change-Id: Ib73a20f497b447aebe69c88266369605e69a7812
2013-10-14 10:01:33 -07:00
Scott Main
9ecc29043f
am da5d7027: am 5a99a702: am 4dfe8944: Merge "add docs about managing app memory" into jb-mr2-docs
...
* commit 'da5d7027a8905dd17f1cb8dd249d0d9320a97fec':
add docs about managing app memory
2013-10-14 09:59:52 -07:00
Scott Main
da5d7027a8
am 5a99a702: am 4dfe8944: Merge "add docs about managing app memory" into jb-mr2-docs
...
* commit '5a99a7023ee5f8f054a9e8d10ed78e6c3f30a839':
add docs about managing app memory
2013-10-14 09:57:11 -07:00
Scott Main
5a99a7023e
am 4dfe8944: Merge "add docs about managing app memory" into jb-mr2-docs
...
* commit '4dfe894440f3b1af62df8e6cb74503c86519c74d':
add docs about managing app memory
2013-10-14 09:52:07 -07:00
Scott Main
4dfe894440
Merge "add docs about managing app memory" into jb-mr2-docs
2013-10-14 16:49:11 +00:00
Craig Mautner
aaae59c39c
am 23d4edde: am ea7c1e24: Merge "Add null check when determining mOnTopOfHome" into klp-dev
...
* commit '23d4edde94b508c03280fd701b797f3a84db23fc':
Add null check when determining mOnTopOfHome
2013-10-14 09:43:09 -07:00
Craig Mautner
23d4edde94
am ea7c1e24: Merge "Add null check when determining mOnTopOfHome" into klp-dev
...
* commit 'ea7c1e24a213863cd204f4ff097bf622144e417c':
Add null check when determining mOnTopOfHome
2013-10-14 09:40:23 -07:00
Craig Mautner
ea7c1e24a2
Merge "Add null check when determining mOnTopOfHome" into klp-dev
2013-10-14 16:38:48 +00:00
Baligh Uddin
f7425929e8
am c61b90f0: (-s ours) am 2261bef3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'c61b90f005b7a29cb718471ef225b811e4e5a93d':
Import translations. DO NOT MERGE
2013-10-14 09:30:07 -07:00
Victoria Lease
60a641d2e4
remove U+261d from MTLmr3m.ttf
...
This codepoint is covered by NotoColorEmoji.ttf, and MTLmr3m is
shadowing it.
Bug: 11177194
Change-Id: I827f58bcae4c9b4849034fa85608087b1e786f25
2013-10-14 09:29:11 -07:00
Baligh Uddin
c61b90f005
am 2261bef3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '2261bef330729dda2b2976e23b15d9cb1897b5e6':
Import translations. DO NOT MERGE
2013-10-14 09:26:01 -07:00
Baligh Uddin
ede9fb7a27
am 8ed80a44: (-s ours) am 5c364f3c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '8ed80a44ba554b7d6ed50de8bfc30ceffe8c0690':
Import translations. DO NOT MERGE
2013-10-14 09:23:00 -07:00
Baligh Uddin
33dd283532
am f0264ab8: (-s ours) am a0aa64ac: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'f0264ab8bcc540986d9019e246f3466082badd4c':
Import translations. DO NOT MERGE
2013-10-14 09:22:57 -07:00
Baligh Uddin
8f7b859a7d
Merge "Import translations. DO NOT MERGE"
2013-10-14 16:22:55 +00:00
Baligh Uddin
2261bef330
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-14 16:22:50 +00:00
Dirk Dougherty
50260360f4
am 86858479: am 00c5db05: Merge "Doc change: fix link to widgets design doc." into klp-dev
...
* commit '86858479e53dc39bafce3be418b39e009df44783':
Doc change: fix link to widgets design doc.
2013-10-14 09:19:24 -07:00
Baligh Uddin
8ed80a44ba
am 5c364f3c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '5c364f3c1eba4f0c816cd88942ab5336aed1195d':
Import translations. DO NOT MERGE
2013-10-14 09:18:56 -07:00
Baligh Uddin
f0264ab8bc
am a0aa64ac: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'a0aa64ac1b5652c3763c6cd58fa6d948dabc8f29':
Import translations. DO NOT MERGE
2013-10-14 09:18:52 -07:00
Baligh Uddin
7d8b77f036
Import translations. DO NOT MERGE
...
Change-Id: Ib9ba58f8e1486581d71443234db99a12f925cf0a
Auto-generated-cl: translation import
2013-10-14 09:17:56 -07:00
Baligh Uddin
d898bb0003
Import translations. DO NOT MERGE
...
Change-Id: Ic05225f9a7ed59b8534c5637187ced07b660252a
Auto-generated-cl: translation import
2013-10-14 09:16:10 -07:00
Dirk Dougherty
86858479e5
am 00c5db05: Merge "Doc change: fix link to widgets design doc." into klp-dev
...
* commit '00c5db059645a8b9a0440097b53944b653d95373':
Doc change: fix link to widgets design doc.
2013-10-14 09:15:18 -07:00
Baligh Uddin
7967b0c141
Merge "Import translations. DO NOT MERGE"
2013-10-14 16:15:14 +00:00
Baligh Uddin
5c364f3c1e
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-14 16:14:24 +00:00
Baligh Uddin
a0aa64ac1b
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-14 16:14:14 +00:00
Baligh Uddin
11bb67d6c2
Import translations. DO NOT MERGE
...
Change-Id: Ib34e81399bfc7c5867fcc060af7d5487485a2855
Auto-generated-cl: translation import
2013-10-14 09:13:55 -07:00
Baligh Uddin
831fa04f5a
Import translations. DO NOT MERGE
...
Change-Id: I7650da18d849d7ffbab92487bb2f79f32230b7c3
Auto-generated-cl: translation import
2013-10-14 09:13:14 -07:00
Dirk Dougherty
00c5db0596
Merge "Doc change: fix link to widgets design doc." into klp-dev
2013-10-14 16:12:29 +00:00
Baligh Uddin
0da3dea90c
Import translations. DO NOT MERGE
...
Change-Id: I734c073236b4d50576d962b23f4b50abfccec16e
Auto-generated-cl: translation import
2013-10-14 09:12:27 -07:00
Baligh Uddin
1a6f41c1bf
Import translations. DO NOT MERGE
...
Change-Id: I9a11931ae13cdda6647b145d2ceac071e5f05a54
Auto-generated-cl: translation import
2013-10-14 09:11:11 -07:00
Daniel Sandler
3393e58d03
am 54d83daa: am 19e8273b: Merge "Don\'t show [!] battery at boot." into klp-dev
...
* commit '54d83daa4fcd4794049f6ac5d8f5d27c3958dc6e':
Don't show [!] battery at boot.
2013-10-14 07:48:29 -07:00
Daniel Sandler
54d83daa4f
am 19e8273b: Merge "Don\'t show [!] battery at boot." into klp-dev
...
* commit '19e8273b1a58801778f07e4199d7accb0e5f0198':
Don't show [!] battery at boot.
2013-10-14 07:46:19 -07:00
Daniel Sandler
19e8273b1a
Merge "Don't show [!] battery at boot." into klp-dev
2013-10-14 14:44:22 +00:00
Daniel Sandler
05021e5e47
Don't show [!] battery at boot.
...
Defense in depth:
1. If there's a sticky battery broadcast waiting around for
us, apply its information immediately.
2. If for some reason there is no battery information,
just don't draw anything.
Bug: 11208146
Change-Id: I43e4b55a90a4ca619816ad0315e329f88b529581
2013-10-14 10:27:45 -04:00
Craig Mautner
d99384d067
Add null check when determining mOnTopOfHome
...
Fixes bug 11198896.
Change-Id: I7b35c8a7156f03f8dab0598b55ef327e593f6427
2013-10-14 07:09:18 -07:00
Daniel Sandler
5fa473cd47
am 782dbb85: am 69f49434: Merge "Limit transient nav cling to 380dp on large/land devices." into klp-dev
...
* commit '782dbb8580ba70c4d6d40b31e2a65665ebec9fee':
Limit transient nav cling to 380dp on large/land devices.
2013-10-14 06:56:34 -07:00