summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Utilize new Android LED constantsMichael Wright2013-10-184-10/+56
| | | | | | Also, have EventHub manage game controllers' player LEDs Change-Id: Ic0a1515979d72a30d182d51d89ca6753c5bd7bf8
* Disable unused parameter warning for libinputMichael Wright2013-10-162-2/+4
| | | | | | Also, avoid comparing values of mixed signedness. Change-Id: I9804f69c29fcb1d0a9fe4b833ef1a569738c99fd
* am a4738bdb: am 7c95ae91: am 67fc6b0b: Merge "Fix issue where keyguard ↵Jim Miller2013-10-161-9/+5
|\ | | | | | | | | | | | | 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
| * am 7c95ae91: am 67fc6b0b: Merge "Fix issue where keyguard reports a valid ↵Jim Miller2013-10-161-9/+5
| |\ | | | | | | | | | | | | | | | | | | token but doesn\'t draw" into klp-dev * commit '7c95ae91b69a1aaae8e0ec41d0e76c66ee52f31a': Fix issue where keyguard reports a valid token but doesn't draw
| | * am 67fc6b0b: Merge "Fix issue where keyguard reports a valid token but ↵Jim Miller2013-10-161-9/+5
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | doesn\'t draw" into klp-dev * commit '67fc6b0b4708161bc8e716f7effc47e7c15d1ca6': Fix issue where keyguard reports a valid token but doesn't draw
| | | * Merge "Fix issue where keyguard reports a valid token but doesn't draw" into ↵Jim Miller2013-10-161-9/+5
| | | |\ | | | | | | | | | | | | | | | klp-dev
| | | | * Fix issue where keyguard reports a valid token but doesn't drawJim Miller2013-10-151-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 5e3ab35c: am f3cad918: am db148b65: Merge "Fix memory leak and slowness ↵Jim Miller2013-10-151-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | in keyguard" into klp-dev * commit '5e3ab35c0aaadcec496d18d1a66e79c35a7f8ffd': Fix memory leak and slowness in keyguard
| * | | | am f3cad918: am db148b65: Merge "Fix memory leak and slowness in keyguard" ↵Jim Miller2013-10-151-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'f3cad9184f6ef56be403369d87fd0fa1cbd9de86': Fix memory leak and slowness in keyguard
| | * | | am db148b65: Merge "Fix memory leak and slowness in keyguard" into klp-devJim Miller2013-10-151-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'db148b655633ed554fed70347fb227bf2f23f7de': Fix memory leak and slowness in keyguard
| | | * | Merge "Fix memory leak and slowness in keyguard" into klp-devJim Miller2013-10-161-0/+1
| | | |\ \
| | | | * | Fix memory leak and slowness in keyguardJim Miller2013-10-151-0/+1
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 1af10256: am cb13a546: am 49b6d38f: Merge "Fix dodgy states of keyguard ↵Adam Powell2013-10-152-9/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | transport controls" into klp-dev * commit '1af10256cd07c2c096e22038379210866dff82a2': Fix dodgy states of keyguard transport controls
| * | | | am cb13a546: am 49b6d38f: Merge "Fix dodgy states of keyguard transport ↵Adam Powell2013-10-152-9/+17
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | controls" into klp-dev * commit 'cb13a5460495d7b05e1667397166330bb3ac412a': Fix dodgy states of keyguard transport controls
| | * | | am 49b6d38f: Merge "Fix dodgy states of keyguard transport controls" into ↵Adam Powell2013-10-152-9/+17
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '49b6d38fe7308d4641046af4a2d062cdc6033c30': Fix dodgy states of keyguard transport controls
| | | * | Merge "Fix dodgy states of keyguard transport controls" into klp-devAdam Powell2013-10-162-9/+17
| | | |\ \
| | | | * | Fix dodgy states of keyguard transport controlsAdam Powell2013-10-152-9/+17
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am fc7c4b9d: am 2a48dbce: am 905c50a2: Merge "Improve DocumentsProvider and ↵Jeff Sharkey2013-10-154-80/+225
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | contract docs." into klp-dev * commit 'fc7c4b9d7234b645adb31cb819b75ba925adab7a': Improve DocumentsProvider and contract docs.
| * | | | am 2a48dbce: am 905c50a2: Merge "Improve DocumentsProvider and contract ↵Jeff Sharkey2013-10-154-80/+225
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | docs." into klp-dev * commit '2a48dbcee91a3a37dacaa96763c92f116d916a15': Improve DocumentsProvider and contract docs.
| | * | | am 905c50a2: Merge "Improve DocumentsProvider and contract docs." into klp-devJeff Sharkey2013-10-154-80/+225
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '905c50a21238aa1de38989f1f9169cf40ebe02d5': Improve DocumentsProvider and contract docs.
| | | * | Merge "Improve DocumentsProvider and contract docs." into klp-devJeff Sharkey2013-10-164-80/+225
| | | |\ \
| | | | * | Improve DocumentsProvider and contract docs.Jeff Sharkey2013-10-154-80/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10567557 Change-Id: I71e7f7ad172e9986e58b9c9533b1c948c5530397
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-10-1657-62/+64
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-1557-62/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0429bb8cc4a13f9bb427384e9e261212d6840421 Auto-generated-cl: translation import
* | | | | | | am aa546ae9: am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even ↵Robert Greenwalt2013-10-151-21/+34
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if only one addr" into klp-dev * commit 'aa546ae97723ffd5400279f566f6e9c591a389d8': Retry captiveportal check even if only one addr
| * | | | | | am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one ↵Robert Greenwalt2013-10-151-21/+34
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addr" into klp-dev * commit 'ec4d5da6f99b70768ace085782cf5b24f8697025': Retry captiveportal check even if only one addr
| | * | | | | am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into ↵Robert Greenwalt2013-10-151-21/+34
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '1b7f99b90ad5c4c20ee1bfbe3c7eb6bfb96a267e': Retry captiveportal check even if only one addr
| | | * | | | Merge "Retry captiveportal check even if only one addr" into klp-devRobert Greenwalt2013-10-161-21/+34
| | | |\ \ \ \
| | | | * | | | Retry captiveportal check even if only one addrRobert Greenwalt2013-10-151-21/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're getting some false positive results on this check and while it was coded to try 3 times given sufficient independent addrs the default url resolves to a single address so we'd just try once. Rework to try again even with fewer urls to try to reduce the false positives. Also adds a random query param to fool proxies into not caching. bug:9972012 Change-Id: Ib719f40ec612065ca6bcd919549fc1164506d35a
* | | | | | | | am 67122f46: am 504b6045: am 4270ebc7: Merge "Remove debug logging." into ↵Craig Mautner2013-10-154-10/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '67122f46be4ab186c1f88780a2043b458797254a': Remove debug logging.
| * | | | | | | am 504b6045: am 4270ebc7: Merge "Remove debug logging." into klp-devCraig Mautner2013-10-154-10/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '504b60453f30b78da3a13e022a1d8a7badf26ae1': Remove debug logging.
| | * | | | | | am 4270ebc7: Merge "Remove debug logging." into klp-devCraig Mautner2013-10-154-10/+10
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '4270ebc7db8fcc42b64286c38ad84189e6a5b9e4': Remove debug logging.
| | | * | | | | Merge "Remove debug logging." into klp-devCraig Mautner2013-10-164-10/+10
| | | |\ \ \ \ \
| | | | * | | | | Remove debug logging.Craig Mautner2013-10-154-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d7c11e8b8525bfc8eb87bb0fff4f71337b4a39d
* | | | | | | | | am f7a64d2f: am d68cd8cc: am 41bf03e1: Merge "Restore window manager stack ↵Craig Mautner2013-10-152-11/+19
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | order on user switch." into klp-dev * commit 'f7a64d2f123897a255adf2e3ea3c60f09b750b2d': Restore window manager stack order on user switch.
| * | | | | | | | am d68cd8cc: am 41bf03e1: Merge "Restore window manager stack order on user ↵Craig Mautner2013-10-152-11/+19
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switch." into klp-dev * commit 'd68cd8cc40226dfd0b63227b6c186de4a4fd9ba0': Restore window manager stack order on user switch.
| | * | | | | | | am 41bf03e1: Merge "Restore window manager stack order on user switch." into ↵Craig Mautner2013-10-152-11/+19
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '41bf03e133dfd0b9a4c492bd9fa4242c6f9cec3a': Restore window manager stack order on user switch.
| | | * | | | | | Merge "Restore window manager stack order on user switch." into klp-devCraig Mautner2013-10-162-11/+19
| | | |\ \ \ \ \ \
| | | | * | | | | | Restore window manager stack order on user switch.Craig Mautner2013-10-152-11/+19
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the activity stacks were being restored. Also add needed debug logs. Fixes bug 11223831. Change-Id: Ief42688721c49e8cea14277619c797bf7c25b859
* | | | | | | | | am 09de7975: am a451b603: am 577d0dac: Merge changes ↵Igor Murashkin2013-10-15148-0/+20302
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | am a451b603: am 577d0dac: Merge changes I536021b9,I6eb541c9,I6ac08eca into ↵Igor Murashkin2013-10-15148-0/+20302
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit 'a451b6038585a71c5c8c84b019fdf3aa3d58d8f6': SmartCamera: Fix to build against latest camera2 api Camera2Tests: update SmartCamera for async api Camera2Tests: Add SmartCamera App
| | * | | | | | | am 577d0dac: Merge changes I536021b9,I6eb541c9,I6ac08eca into klp-devIgor Murashkin2013-10-15148-0/+20302
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '577d0dac1d263c6f403f15c587aaf11983e10e44': SmartCamera: Fix to build against latest camera2 api Camera2Tests: update SmartCamera for async api Camera2Tests: Add SmartCamera App
| | | * | | | | | Merge changes I536021b9,I6eb541c9,I6ac08eca into klp-devIgor Murashkin2013-10-16148-0/+20302
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: SmartCamera: Fix to build against latest camera2 api Camera2Tests: update SmartCamera for async api Camera2Tests: Add SmartCamera App
| | | | * | | | | | SmartCamera: Fix to build against latest camera2 apiIgor Murashkin2013-10-153-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10818732 Change-Id: I536021b9663331532e2f4c21a4fc0f3de5da9aa9
| | | | * | | | | | Camera2Tests: update SmartCamera for async apiIgor Murashkin2013-10-152-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6eb541c96ee50756c35e7785fdae63e8e45e2726
| | | | * | | | | | Camera2Tests: Add SmartCamera AppBenjamin Hendricks2013-10-15148-0/+20290
| | | | | |_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10818732 Change-Id: I6ac08ecab3a1e04116be2f7764d0d5d4f29c5cd9
* | | | | | | | | am f53c1a68: am f82a387c: am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." ↵Jeff Sharkey2013-10-152-51/+94
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'f53c1a6841b4c6a1541e9548f425e54c486031d1': Improve OPEN/CREATE_DOC docs.
| * | | | | | | | am f82a387c: am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-devJeff Sharkey2013-10-152-51/+94
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f82a387cc7e82a18622465e62370e2c4203839f1': Improve OPEN/CREATE_DOC docs.
| | * | | | | | | am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-devJeff Sharkey2013-10-152-51/+94
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e3924ca486fcb95bb8eb06992d841decc1b6065a': Improve OPEN/CREATE_DOC docs.
| | | * | | | | | Merge "Improve OPEN/CREATE_DOC docs." into klp-devJeff Sharkey2013-10-152-51/+94
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |