115840 Commits

Author SHA1 Message Date
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
Jim Miller
ed80f3f01e Fix issue where keyguard reports a valid token but doesn't draw
This fixes an issue where keyguard isn't showing but tells
PhoneWindowManager to wait anyway.  The fix is to send a null token
when keyguard isn't showing.

Fixes bug 11216030

Change-Id: I4985fe50c63819415d9d5a1de0b741c8aa6391d8
2013-10-15 17:50:17 -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