117696 Commits

Author SHA1 Message Date
Baligh Uddin
f667cc58c2 Import translations. DO NOT MERGE
Change-Id: I67a8fe6771ac5cedcba9f75b76f59a7071389e93
Auto-generated-cl: translation import
2013-10-16 14:37:13 -07:00
Narayan Kamath
98e1797367 Remove captive portal code that has no effect.
Note that this CL does not change any behaviour.

At the center of this change is
CaptivePortalTracker#detectCaptivePortal(), which does nothing
except call back into ConnectivityService. Removing it allows us to
simplify code in ConnectivityService. It also allows us to remove
ConnectivityService#captivePortalCheckComplete which was only ever
called in response to this method.

While this does not change any behaviour, it preserves existing
bad behaviour, i.e, that the CAPTIVE_PORTAL_CHECK NetworkInfo
state does not correspond to actual captive portal detection.
We transition into that state and immediately (and unconditionally)
out of it and into CONNECTED.

Change-Id: Ib3797f956d2db5e3cacaaa53e899d81aa8e958af
2013-10-16 08:10:55 +00:00
Jim Miller
805f7a1d01 am a4738bdb: am 7c95ae91: am 67fc6b0b: Merge "Fix issue where keyguard reports a valid token but doesn\'t draw" into klp-dev
* commit 'a4738bdbd2d310842bc55aecfcd5105ade83e146':
  Fix issue where keyguard reports a valid token but doesn't draw
2013-10-16 00:13:46 -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
Jim Miller
c9cc6907ac am 5e3ab35c: am f3cad918: am db148b65: Merge "Fix memory leak and slowness in keyguard" into klp-dev
* commit '5e3ab35c0aaadcec496d18d1a66e79c35a7f8ffd':
  Fix memory leak and slowness in keyguard
2013-10-15 21:00:33 -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
4a99019d66 am 1af10256: am cb13a546: am 49b6d38f: Merge "Fix dodgy states of keyguard transport controls" into klp-dev
* commit '1af10256cd07c2c096e22038379210866dff82a2':
  Fix dodgy states of keyguard transport controls
2013-10-15 18:48:37 -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
3e41d9bf41 am fc7c4b9d: am 2a48dbce: am 905c50a2: Merge "Improve DocumentsProvider and contract docs." into klp-dev
* commit 'fc7c4b9d7234b645adb31cb819b75ba925adab7a':
  Improve DocumentsProvider and contract docs.
2013-10-15 17:55:45 -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
Baligh Uddin
9ba1527e7d Merge "Import translations. DO NOT MERGE" 2013-10-16 00:44:32 +00:00
Robert Greenwalt
bc32fa0d72 am aa546ae9: am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev
* commit 'aa546ae97723ffd5400279f566f6e9c591a389d8':
  Retry captiveportal check even if only one addr
2013-10-15 17:41:03 -07:00
Craig Mautner
33379fb317 am 67122f46: am 504b6045: am 4270ebc7: Merge "Remove debug logging." into klp-dev
* commit '67122f46be4ab186c1f88780a2043b458797254a':
  Remove debug logging.
2013-10-15 17:37:24 -07:00
Craig Mautner
35cb3efc8a am f7a64d2f: am d68cd8cc: am 41bf03e1: Merge "Restore window manager stack order on user switch." into klp-dev
* commit 'f7a64d2f123897a255adf2e3ea3c60f09b750b2d':
  Restore window manager stack order on user switch.
2013-10-15 17:37:21 -07: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
Igor Murashkin
b1743ab92e am 09de7975: am a451b603: am 577d0dac: Merge changes I536021b9,I6eb541c9,I6ac08eca into klp-dev
* commit '09de7975fead1b47ea78f6f812a2f649e5dfb31d':
  SmartCamera: Fix to build against latest camera2 api
  Camera2Tests: update SmartCamera for async api
  Camera2Tests: Add SmartCamera App
2013-10-15 17:30:27 -07:00
Jeff Sharkey
0e4655800b am f53c1a68: am f82a387c: am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-dev
* commit 'f53c1a6841b4c6a1541e9548f425e54c486031d1':
  Improve OPEN/CREATE_DOC docs.
2013-10-15 17:30:23 -07:00
Jeff Sharkey
98f7422e6a am 9f81a1a4: am 84c8603d: am 3cf56085: Merge "Improve external storage docs on Context." into klp-dev
* commit '9f81a1a49c4ae01fd815a5ee801764b1362b242e':
  Improve external storage docs on Context.
2013-10-15 17:30:19 -07:00
Michael Wright
5d5d4a5840 am ee3674a0: am 19fa2122: am 6bd7603a: Merge "Force the wallpaper to reload when dimensions change" into klp-dev
* commit 'ee3674a01bc827057618d86f2dc921485b9a1393':
  Force the wallpaper to reload when dimensions change
2013-10-15 17:30:16 -07:00
Baligh Uddin
3d057aa034 am 754fee0a: 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 '754fee0a2314392f72fc8fbfda35c721eefb452d':
  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:30:12 -07: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
Baligh Uddin
ae024e75ec am 15bbb7b7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev-plus-aosp
* commit '15bbb7b731bbb185836f5ac47242682ddd95d885':
  Import translations. DO NOT MERGE
2013-10-15 17:29:49 -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
Jim Miller
7041bd2c42 am 35077089: am d5bda747: am 2cc95775: Merge "Fix possible crash in System UI" into klp-dev
* commit '3507708905e2d4aced05ece0d157ee9def40b624':
  Fix possible crash in System UI
2013-10-15 17:29:46 -07:00
Baligh Uddin
1a452a57d4 am ae7bf4d0: (-s ours) am d99b9fd3: (-s ours) am 1fcf34d8: (-s ours) Import translations. DO NOT MERGE
* commit 'ae7bf4d0abe00e8541c5b48725664aba7496ed04':
  Import translations. DO NOT MERGE
2013-10-15 17:29:43 -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