Adam Powell
1af10256cd
am cb13a546: am 49b6d38f: Merge "Fix dodgy states of keyguard transport controls" into klp-dev
...
* commit 'cb13a5460495d7b05e1667397166330bb3ac412a':
Fix dodgy states of keyguard transport controls
2013-10-15 18:44:47 -07:00
Adam Powell
cb13a54604
am 49b6d38f: Merge "Fix dodgy states of keyguard transport controls" into klp-dev
...
* commit '49b6d38fe7308d4641046af4a2d062cdc6033c30':
Fix dodgy states of keyguard transport controls
2013-10-15 18:43:03 -07:00
Adam Powell
49b6d38fe7
Merge "Fix dodgy states of keyguard transport controls" into klp-dev
2013-10-16 01:41:22 +00:00
Adam Powell
bdb5ac7ddb
Fix dodgy states of keyguard transport controls
...
If a layout has already been requested when we want to show the
correct widget pane, post the event for later and immediately return.
This works because PagedView has some interesting ideas about
maintaining a consistent state. It will attempt to recalculate the
current page position during measurement, but thanks to a reliance on
this measurement to establish scrolling boundaries that scrollTo uses
for clamping plus other code that depends on the idea that it can add
a new widget pane view and immediately scroll to it, this attempt to
scroll fails if the target page was added and measurement is not yet
complete. This patch ensures we don't hit these edge cases in a few
known ways.
While this ends things in the correct state, it predictably has a few
visual artifacts. Situations where things would completely fail
before, positioning pages incorrectly or fading out wrong pages now
will briefly flash and fade the widget frames or in some cases will
visibly animate from the starting page to the correct one. We should
address these issues in a future release.
Bug 11217368
Bug 9760604
Change-Id: I989d03b5bfdd5b6403a6b67a8aae7585ca0c8ae0
2013-10-15 18:10:41 -07:00
Jeff Sharkey
fc7c4b9d72
am 2a48dbce: am 905c50a2: Merge "Improve DocumentsProvider and contract docs." into klp-dev
...
* commit '2a48dbcee91a3a37dacaa96763c92f116d916a15':
Improve DocumentsProvider and contract docs.
2013-10-15 17:52:29 -07:00
Jeff Sharkey
2a48dbcee9
am 905c50a2: Merge "Improve DocumentsProvider and contract docs." into klp-dev
...
* commit '905c50a21238aa1de38989f1f9169cf40ebe02d5':
Improve DocumentsProvider and contract docs.
2013-10-15 17:49:40 -07:00
Jeff Sharkey
905c50a212
Merge "Improve DocumentsProvider and contract docs." into klp-dev
2013-10-16 00:47:36 +00:00
Robert Greenwalt
aa546ae977
am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev
...
* commit 'ec4d5da6f99b70768ace085782cf5b24f8697025':
Retry captiveportal check even if only one addr
2013-10-15 17:37:05 -07:00
Robert Greenwalt
ec4d5da6f9
am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev
...
* commit '1b7f99b90ad5c4c20ee1bfbe3c7eb6bfb96a267e':
Retry captiveportal check even if only one addr
2013-10-15 17:33:28 -07:00
Craig Mautner
67122f46be
am 504b6045: am 4270ebc7: Merge "Remove debug logging." into klp-dev
...
* commit '504b60453f30b78da3a13e022a1d8a7badf26ae1':
Remove debug logging.
2013-10-15 17:33:26 -07:00
Craig Mautner
f7a64d2f12
am d68cd8cc: am 41bf03e1: Merge "Restore window manager stack order on user switch." into klp-dev
...
* commit 'd68cd8cc40226dfd0b63227b6c186de4a4fd9ba0':
Restore window manager stack order on user switch.
2013-10-15 17:33:23 -07:00
Robert Greenwalt
1b7f99b90a
Merge "Retry captiveportal check even if only one addr" into klp-dev
2013-10-16 00:31:04 +00:00
Craig Mautner
504b60453f
am 4270ebc7: Merge "Remove debug logging." into klp-dev
...
* commit '4270ebc7db8fcc42b64286c38ad84189e6a5b9e4':
Remove debug logging.
2013-10-15 17:29:51 -07:00
Craig Mautner
d68cd8cc40
am 41bf03e1: Merge "Restore window manager stack order on user switch." into klp-dev
...
* commit '41bf03e133dfd0b9a4c492bd9fa4242c6f9cec3a':
Restore window manager stack order on user switch.
2013-10-15 17:29:48 -07:00
Craig Mautner
4270ebc7db
Merge "Remove debug logging." into klp-dev
2013-10-16 00:27:50 +00:00
Craig Mautner
41bf03e133
Merge "Restore window manager stack order on user switch." into klp-dev
2013-10-16 00:27:32 +00:00
Igor Murashkin
09de7975fe
am a451b603: am 577d0dac: Merge changes I536021b9,I6eb541c9,I6ac08eca into klp-dev
...
* commit 'a451b6038585a71c5c8c84b019fdf3aa3d58d8f6':
SmartCamera: Fix to build against latest camera2 api
Camera2Tests: update SmartCamera for async api
Camera2Tests: Add SmartCamera App
2013-10-15 17:15:56 -07:00
Jeff Sharkey
f53c1a6841
am f82a387c: am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-dev
...
* commit 'f82a387cc7e82a18622465e62370e2c4203839f1':
Improve OPEN/CREATE_DOC docs.
2013-10-15 17:15:44 -07:00
Jeff Sharkey
9f81a1a49c
am 84c8603d: am 3cf56085: Merge "Improve external storage docs on Context." into klp-dev
...
* commit '84c8603da051638b41baabef54bcc0f4cbef9735':
Improve external storage docs on Context.
2013-10-15 17:15:40 -07:00
Michael Wright
ee3674a01b
am 19fa2122: am 6bd7603a: Merge "Force the wallpaper to reload when dimensions change" into klp-dev
...
* commit '19fa212251542ac8f24ec0b24316bb08417cb44e':
Force the wallpaper to reload when dimensions change
2013-10-15 17:15:35 -07:00
Baligh Uddin
754fee0a23
am ffe8b79f: (-s ours) am e1b6b6c5: Bring deleted files from the dead. These files were dropped by the translation pipelines because they do not contain any translated elements, but in reality they are needed.
...
* commit 'ffe8b79f36d7ae997bb75751f2d8b1920eb2cd97':
Bring deleted files from the dead. These files were dropped by the translation pipelines because they do not contain any translated elements, but in reality they are needed.
2013-10-15 17:15:34 -07:00
Igor Murashkin
a451b60385
am 577d0dac: Merge changes I536021b9,I6eb541c9,I6ac08eca into klp-dev
...
* commit '577d0dac1d263c6f403f15c587aaf11983e10e44':
SmartCamera: Fix to build against latest camera2 api
Camera2Tests: update SmartCamera for async api
Camera2Tests: Add SmartCamera App
2013-10-15 17:06:46 -07:00
Igor Murashkin
577d0dac1d
Merge changes I536021b9,I6eb541c9,I6ac08eca into klp-dev
...
* changes:
SmartCamera: Fix to build against latest camera2 api
Camera2Tests: update SmartCamera for async api
Camera2Tests: Add SmartCamera App
2013-10-16 00:01:07 +00:00
Jeff Sharkey
f82a387cc7
am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-dev
...
* commit 'e3924ca486fcb95bb8eb06992d841decc1b6065a':
Improve OPEN/CREATE_DOC docs.
2013-10-15 16:48:54 -07:00
Jeff Sharkey
84c8603da0
am 3cf56085: Merge "Improve external storage docs on Context." into klp-dev
...
* commit '3cf56085f1a70c200ffd3389dd91fd284a76b91a':
Improve external storage docs on Context.
2013-10-15 16:48:51 -07:00
Michael Wright
19fa212251
am 6bd7603a: Merge "Force the wallpaper to reload when dimensions change" into klp-dev
...
* commit '6bd7603a56cd671c4523d66c1e7378c27a6ac33c':
Force the wallpaper to reload when dimensions change
2013-10-15 16:45:10 -07:00
Jeff Sharkey
e3924ca486
Merge "Improve OPEN/CREATE_DOC docs." into klp-dev
2013-10-15 23:45:10 +00:00
Jeff Sharkey
3cf56085f1
Merge "Improve external storage docs on Context." into klp-dev
2013-10-15 23:44:54 +00:00
Jeff Sharkey
e8c00d8ed4
Improve DocumentsProvider and contract docs.
...
Bug: 10567557
Change-Id: I71e7f7ad172e9986e58b9c9533b1c948c5530397
2013-10-15 16:44:22 -07:00
Michael Wright
6bd7603a56
Merge "Force the wallpaper to reload when dimensions change" into klp-dev
2013-10-15 23:40:14 +00:00
Baligh Uddin
15bbb7b731
Merge "Import translations. DO NOT MERGE" into klp-dev-plus-aosp
2013-10-15 23:25:12 +00:00
Jim Miller
3507708905
am d5bda747: am 2cc95775: Merge "Fix possible crash in System UI" into klp-dev
...
* commit 'd5bda747971db5fc2dde78dcc5bb42e62659667d':
Fix possible crash in System UI
2013-10-15 16:17:06 -07:00
Baligh Uddin
ae7bf4d0ab
am d99b9fd3: (-s ours) am 1fcf34d8: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd99b9fd3213fecbf987ab285228f985676ae86e5':
Import translations. DO NOT MERGE
2013-10-15 16:17:03 -07:00
Craig Mautner
a7f2bd4da7
Remove debug logging.
...
Change-Id: I5d7c11e8b8525bfc8eb87bb0fff4f71337b4a39d
2013-10-15 16:13:50 -07:00
Baligh Uddin
ffe8b79f36
am e1b6b6c5: Bring deleted files from the dead. These files were dropped by the translation pipelines because they do not contain any translated elements, but in reality they are needed.
...
* commit 'e1b6b6c5816b321864b6a5d72a46860fda8fa7cd':
Bring deleted files from the dead. These files were dropped by the translation pipelines because they do not contain any translated elements, but in reality they are needed.
2013-10-15 16:00:13 -07:00
John Spurlock
c5b6267dac
resolved conflicts for merge of e8962d4b to klp-dev-plus-aosp
...
Change-Id: I3b223b9a532f8a154d21d79828b2a95098ab2bd1
2013-10-15 18:59:45 -04:00
Baligh Uddin
e1b6b6c581
Bring deleted files from the dead.
...
These files were dropped by the translation
pipelines because they do not contain any
translated elements, but in reality they
are needed.
Bug: 11226380
2013-10-15 22:47:02 +00:00
Craig Mautner
4f1df4faed
Restore window manager stack order on user switch.
...
Only the activity stacks were being restored. Also add needed debug
logs.
Fixes bug 11223831.
Change-Id: Ief42688721c49e8cea14277619c797bf7c25b859
2013-10-15 15:44:14 -07:00
Igor Murashkin
69b94f7c55
SmartCamera: Fix to build against latest camera2 api
...
Bug: 10818732
Change-Id: I536021b9663331532e2f4c21a4fc0f3de5da9aa9
2013-10-15 15:23:07 -07:00
Igor Murashkin
bd7f343c75
Camera2Tests: update SmartCamera for async api
...
Change-Id: I6eb541c96ee50756c35e7785fdae63e8e45e2726
2013-10-15 15:11:41 -07:00
Benjamin Hendricks
227b47625d
Camera2Tests: Add SmartCamera App
...
Bug: 10818732
Change-Id: I6ac08ecab3a1e04116be2f7764d0d5d4f29c5cd9
2013-10-15 15:11:34 -07:00
Jim Miller
d5bda74797
am 2cc95775: Merge "Fix possible crash in System UI" into klp-dev
...
* commit '2cc95775750ccd46f3192c05804c38dc04c5d2d6':
Fix possible crash in System UI
2013-10-15 14:47:49 -07:00
Jim Miller
2cc9577575
Merge "Fix possible crash in System UI" into klp-dev
2013-10-15 21:44:48 +00:00
Baligh Uddin
e608f6d26e
Import translations. DO NOT MERGE
...
Change-Id: Idf3c804dad4f6a6acbfbf176b06ffacfe30345cf
Auto-generated-cl: translation import
Conflicts:
core/res/res/values-af/strings.xml
core/res/res/values-am/strings.xml
core/res/res/values-ar/strings.xml
core/res/res/values-be/strings.xml
core/res/res/values-bg/strings.xml
core/res/res/values-ca/strings.xml
core/res/res/values-cs/strings.xml
core/res/res/values-da/strings.xml
core/res/res/values-de/strings.xml
core/res/res/values-el/strings.xml
core/res/res/values-en-rGB/strings.xml
core/res/res/values-en-rIN/strings.xml
core/res/res/values-es-rUS/strings.xml
core/res/res/values-es/strings.xml
core/res/res/values-et-rEE/strings.xml
core/res/res/values-fa/strings.xml
core/res/res/values-fi/strings.xml
core/res/res/values-fr-rCA/strings.xml
core/res/res/values-fr/strings.xml
core/res/res/values-hi/strings.xml
core/res/res/values-hr/strings.xml
core/res/res/values-hu/strings.xml
core/res/res/values-hy-rAM/strings.xml
core/res/res/values-in/strings.xml
core/res/res/values-it/strings.xml
core/res/res/values-iw/strings.xml
core/res/res/values-ja/strings.xml
core/res/res/values-ka-rGE/strings.xml
core/res/res/values-km-rKH/strings.xml
core/res/res/values-ko/strings.xml
core/res/res/values-lo-rLA/strings.xml
core/res/res/values-lt/strings.xml
core/res/res/values-lv/strings.xml
core/res/res/values-mn-rMN/strings.xml
core/res/res/values-ms-rMY/strings.xml
core/res/res/values-nb/strings.xml
core/res/res/values-nl/strings.xml
core/res/res/values-pl/strings.xml
core/res/res/values-pt-rPT/strings.xml
core/res/res/values-pt/strings.xml
core/res/res/values-rm/strings.xml
core/res/res/values-ro/strings.xml
core/res/res/values-ru/strings.xml
core/res/res/values-sk/strings.xml
core/res/res/values-sl/strings.xml
core/res/res/values-sr/strings.xml
core/res/res/values-sv/strings.xml
core/res/res/values-sw/strings.xml
core/res/res/values-th/strings.xml
core/res/res/values-tl/strings.xml
core/res/res/values-tr/strings.xml
core/res/res/values-uk/strings.xml
core/res/res/values-vi/strings.xml
core/res/res/values-zh-rCN/strings.xml
core/res/res/values-zh-rHK/strings.xml
core/res/res/values-zh-rTW/strings.xml
core/res/res/values-zu/strings.xml
2013-10-15 14:44:35 -07:00
Baligh Uddin
d99b9fd321
am 1fcf34d8: (-s ours) Import translations. DO NOT MERGE
...
* commit '1fcf34d8208e4d56a288335a008e069ad895d4b3':
Import translations. DO NOT MERGE
2013-10-15 14:37:49 -07:00
Baligh Uddin
1fcf34d820
Import translations. DO NOT MERGE
...
Change-Id: Idf3c804dad4f6a6acbfbf176b06ffacfe30345cf
Auto-generated-cl: translation import
2013-10-15 14:27:27 -07:00
Jeff Sharkey
adef88a0a9
Improve OPEN/CREATE_DOC docs.
...
Bug: 10936473
Change-Id: I4378aaaf927f114982191efd4f9887dad075390d
2013-10-15 13:54:47 -07:00
Jim Miller
faaa3654d1
Fix possible crash in System UI
...
Fixes bug 11215581
Change-Id: Ic76ad783729316539e8e57feb098d6e823b4ecdf
2013-10-15 13:46:51 -07:00
Michael Wright
b9fca99971
Force the wallpaper to reload when dimensions change
...
Currently it's possible for the home application to suggest new
wallpaper dimensions and the WallpaperService to request the bitmap
between when the new dimensions have been propagated and the old
bitmap has been forgotten. This leads to the WallpaperService
drawing a Bitmap with the old dimensions into a Surface with the new
dimensions.
By forcing the WallpaperManager to forget the old Bitmap immediately
before we reload it, we can ensure that we always have a Bitmap of
the correct size.
Bug: 10853302
Change-Id: I298ac5f3f8bcde54eeb1e45d21bf2ba3cbb618c9
2013-10-15 13:03:44 -07:00
Jeff Sharkey
6feb50b826
Improve external storage docs on Context.
...
Bug: 10461652
Change-Id: I42a3d887418e126f9dc2a9be8060a8eedd425f8e
2013-10-15 13:01:33 -07:00
