Baligh Uddin
b75fb22306
am 29745b3e: (-s ours) am b65ab00e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '29745b3eb3120e9a22ba6c23bdb9c67a8f8da7ce':
Import translations. DO NOT MERGE
2013-10-16 16:36:14 -07:00
Baligh Uddin
2d4cbc7a00
am 29c4161d: (-s ours) am fde69a53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '29c4161d55e7a69b3addcfeabeee8f0911a3f464':
Import translations. DO NOT MERGE
2013-10-16 16:36:11 -07:00
Dirk Dougherty
c724c28f3c
am 2c837ca3: am afb3a418: Merge "Doc change: add i/o 2013 design video embeds to videos page." into klp-dev
...
* commit '2c837ca3b5a99e9d89b0ab6d2155f10b048ed255':
Doc change: add i/o 2013 design video embeds to videos page.
2013-10-16 16:36:08 -07:00
Scott Main
3d66877b93
am 0763e156: am 89ec7c78: Merge "some javadoc improvements for virtual display and new meta tag name" into klp-dev
...
* commit '0763e1565b8e82a1754b21e7c9096b525402f724':
some javadoc improvements for virtual display and new meta tag name
2013-10-16 16:36:03 -07:00
Svetoslav
265a099c10
Merge "Add APIs for an advanced print options activity." into klp-dev
2013-10-16 23:35:35 +00:00
Joe Fernandez
6188486766
am 2d96a0d3: FileProvider training fix: add note about Support Lib to setup lesson
...
* commit '2d96a0d3424314b53b46b0fd6fd5b0dad71e7790':
FileProvider training fix: add note about Support Lib to setup lesson
2013-10-16 16:34:06 -07:00
Baligh Uddin
7ca960b7c7
am a41d7d9c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'a41d7d9c6d075255960643b75feea2953533e1d6':
Import translations. DO NOT MERGE
2013-10-16 16:30:34 -07:00
Baligh Uddin
90472ebd0d
am 477af29d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '477af29d35508411efa11463c1d8c53c7bf05cb9':
Import translations. DO NOT MERGE
2013-10-16 16:30:31 -07:00
Baligh Uddin
29745b3eb3
am b65ab00e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'b65ab00e109a1bc6fdfd3fe9bac8293f408c8063':
Import translations. DO NOT MERGE
2013-10-16 16:30:28 -07:00
Baligh Uddin
29c4161d55
am fde69a53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'fde69a537099a5cf935b141615fed5ba05ba8043':
Import translations. DO NOT MERGE
2013-10-16 16:30:26 -07:00
Dirk Dougherty
2c837ca3b5
am afb3a418: Merge "Doc change: add i/o 2013 design video embeds to videos page." into klp-dev
...
* commit 'afb3a418c36de5b37d41b8167241c682b9be23dc':
Doc change: add i/o 2013 design video embeds to videos page.
2013-10-16 16:30:23 -07:00
Scott Main
0763e1565b
am 89ec7c78: Merge "some javadoc improvements for virtual display and new meta tag name" into klp-dev
...
* commit '89ec7c781e64574f649492c14c7db33eb8e6702c':
some javadoc improvements for virtual display and new meta tag name
2013-10-16 16:30:20 -07:00
Baligh Uddin
a41d7d9c6d
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-16 23:21:04 +00:00
Baligh Uddin
477af29d35
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-16 23:20:39 +00:00
Baligh Uddin
b65ab00e10
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-16 23:20:10 +00:00
Baligh Uddin
fde69a5370
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-16 23:19:58 +00:00
Zhijun He
844b3520cc
Camera2: filter bad faces
...
Filter bad face score and ids.
Bug: 11257538
Change-Id: I9beb042e8c0d2f08a3efcd2877deee036b80482f
2013-10-16 16:13:50 -07:00
Dirk Dougherty
afb3a418c3
Merge "Doc change: add i/o 2013 design video embeds to videos page." into klp-dev
2013-10-16 23:10:12 +00:00
Scott Main
89ec7c781e
Merge "some javadoc improvements for virtual display and new meta tag name" into klp-dev
2013-10-16 23:01:02 +00:00
Svetoslav
1c43fceaaa
Add APIs for an advanced print options activity.
...
This is the API part needed to implement support for custom print
options by a print service. Some printers have quite fancy options
and we want users to benefit using them.
bug:11241800
Change-Id: I3a9df771c0ded559b61c597c686795840d702b27
2013-10-16 15:47:44 -07:00
Baligh Uddin
58c564fce9
Import translations. DO NOT MERGE
...
Change-Id: I35eeda6573625b99277852996769544b8d2f0d37
Auto-generated-cl: translation import
2013-10-16 15:18:56 -07:00
Joe Fernandez
2d96a0d342
FileProvider training fix: add note about Support Lib to setup lesson
...
Change-Id: I7c513705a22bdac390ac260a3d70bdd771c998e7
2013-10-16 15:05:48 -07:00
Baligh Uddin
d232a6f988
Import translations. DO NOT MERGE
...
Change-Id: I45af8da3d23c08e5f32133336e1805149dbdba64
Auto-generated-cl: translation import
2013-10-16 14:40:31 -07:00
Baligh Uddin
f6cfa3de15
Import translations. DO NOT MERGE
...
Change-Id: I0d8bd44f316030e84c59cfcc88559adfd1215825
Auto-generated-cl: translation import
2013-10-16 14:38:03 -07:00
Baligh Uddin
5c9c04b0a2
Import translations. DO NOT MERGE
...
Change-Id: I8d3db29afb854493c03f60946e41720a0eea53e0
Auto-generated-cl: translation import
2013-10-16 14:36:28 -07:00
Scott Main
cc2195bb56
some javadoc improvements for virtual display and
...
new meta tag name
Change-Id: If9caba425f825652468a0f3e868f71ed1a778fb1
2013-10-16 14:08:07 -07:00
Dianne Hackborn
25e7240e99
am 519d8895: am 9c446d82: Merge "Fix issue #11217255 : Setup Wizard ANR when adding new user profile from settings." into klp-dev
...
* commit '519d8895a29dd78f5250ee2ececac4e03a6f5b70':
Fix issue #11217255 : Setup Wizard ANR when adding new user profile from settings.
2013-10-16 14:05:52 -07:00
Dianne Hackborn
519d8895a2
am 9c446d82: Merge "Fix issue #11217255 : Setup Wizard ANR when adding new user profile from settings." into klp-dev
...
* commit '9c446d82736dde10a9cf13de9165334f4e699afe':
Fix issue #11217255 : Setup Wizard ANR when adding new user profile from settings.
2013-10-16 14:02:40 -07:00
Dianne Hackborn
9c446d8273
Merge "Fix issue #11217255 : Setup Wizard ANR when adding new user profile from settings." into klp-dev
2013-10-16 21:00:29 +00:00
Dianne Hackborn
2a272d42a3
Fix issue #11217255 : Setup Wizard ANR when adding new user profile from settings.
...
Two problems addressed here:
- If a call to startActivity() comes in on an activity that is finishing, we can
end up putting the new activity in a stack that isn't actually in use any more
(if the finishing activity is the last one on that stack). This is a bad case,
anyway, so if this happen the treat it as not being called on an existing
activity and switch to NEW_TASK to find a task for it.
- There was a bug in handling PACKAGE_CHANGE broadcasts that would result in the
app's processes being killed, even though the cleanup through the activities
was done. This could leave the activity stack in a bad state. Fix this to
correctly provide an app id for the changing package so that its processes are
killed.
Change-Id: Iece04e0cf95025c3d30353d68bf3d14fd39d44c3
2013-10-16 13:34:33 -07:00
Scott Main
e2ac9a975c
am 315bd412: am 1bab3f53: am a4825fbe: am 655d8c40: am 4aa6b10c: add some search suggestions
...
* commit '315bd412a7bd7c74fb32c2a6f963320526b3cbb8':
add some search suggestions
2013-10-16 11:39:51 -07:00
Scott Main
315bd412a7
am 1bab3f53: am a4825fbe: am 655d8c40: am 4aa6b10c: add some search suggestions
...
* commit '1bab3f5306f0682eafd74d17517a90c0f4ac4d5c':
add some search suggestions
2013-10-16 11:35:02 -07:00
Scott Main
1bab3f5306
am a4825fbe: am 655d8c40: am 4aa6b10c: add some search suggestions
...
* commit 'a4825fbe24871c57cc855c7d8640a92d114c0514':
add some search suggestions
2013-10-16 11:29:58 -07:00
Scott Main
a4825fbe24
am 655d8c40: am 4aa6b10c: add some search suggestions
...
* commit '655d8c40092730c8029299eb28961263eaad086c':
add some search suggestions
2013-10-16 11:27:46 -07:00
Scott Main
655d8c4009
am 4aa6b10c: add some search suggestions
...
* commit '4aa6b10c7f79090ddf72d64dcc3954fbf135e192':
add some search suggestions
2013-10-16 11:21:41 -07:00
Scott Main
4aa6b10c7f
add some search suggestions
...
Change-Id: I6b3026bff30dc27119995d93529874fdfa000d5f
2013-10-16 11:18:04 -07:00
The Android Automerger
f7ff458902
merge in klp-release history after reset to klp-dev
2013-10-16 01:31:51 -07:00
Jim Miller
a4738bdbd2
am 7c95ae91: am 67fc6b0b: Merge "Fix issue where keyguard reports a valid token but doesn\'t draw" into klp-dev
...
* commit '7c95ae91b69a1aaae8e0ec41d0e76c66ee52f31a':
Fix issue where keyguard reports a valid token but doesn't draw
2013-10-16 00:10:31 -07:00
Jim Miller
7c95ae91b6
am 67fc6b0b: Merge "Fix issue where keyguard reports a valid token but doesn\'t draw" into klp-dev
...
* commit '67fc6b0b4708161bc8e716f7effc47e7c15d1ca6':
Fix issue where keyguard reports a valid token but doesn't draw
2013-10-16 00:08:06 -07:00
Jim Miller
67fc6b0b47
Merge "Fix issue where keyguard reports a valid token but doesn't draw" into klp-dev
2013-10-16 07:05:22 +00:00
The Android Automerger
ca40d51907
merge in klp-release history after reset to klp-dev
2013-10-15 21:14:08 -07:00
Jim Miller
5e3ab35c0a
am f3cad918: am db148b65: Merge "Fix memory leak and slowness in keyguard" into klp-dev
...
* commit 'f3cad9184f6ef56be403369d87fd0fa1cbd9de86':
Fix memory leak and slowness in keyguard
2013-10-15 20:58:27 -07:00
Jim Miller
f3cad9184f
am db148b65: Merge "Fix memory leak and slowness in keyguard" into klp-dev
...
* commit 'db148b655633ed554fed70347fb227bf2f23f7de':
Fix memory leak and slowness in keyguard
2013-10-15 20:55:47 -07:00
Jim Miller
db148b6556
Merge "Fix memory leak and slowness in keyguard" into klp-dev
2013-10-16 03:52:10 +00:00
Jim Miller
b2c64690a3
Fix memory leak and slowness in keyguard
...
This fixes an issue where the mUpdateSeekBars runnable was being
repeatedly posted to the handler while keeping a reference to
the transport control (and hence keyguard). Even after the view
was detached from keyguard it would continue to post events that
would ultimately keep the instance of keyguard from being GC'd and
cause keyguard to slow down.
Fixes 11169793
Change-Id: If2bb238adf6d78101589926b60a61d9f187c6d1c
2013-10-15 20:11:50 -07:00
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