summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make outline and shadow APIs publicChris Craik2014-02-189-32/+131
| | | | Change-Id: If40dc27b2fdc41c3ed355bc9029474b1344c1a03
* Merge "Avoid crash if layer is destroyed after GLRenderer"Chris Craik2014-02-121-1/+3
|\
| * Avoid crash if layer is destroyed after GLRendererChris Craik2014-02-121-1/+3
| | | | | | | | | | bug:12988766 Change-Id: I96961aeef0b1d42ae8c609f1607a100e61a3d593
* | Merge "Always call super.onCreate(). Always."Christopher Tate2014-02-121-2/+4
|\ \
| * | Always call super.onCreate(). Always.Christopher Tate2014-02-121-2/+4
| | | | | | | | | | | | | | | | | | Bug 12991134 Change-Id: Ife16ef93408253e3318a06dc0206ab4b88c7f367
* | | Merge "Add support for assigning keyed View tags via XML"Alan Viverette2014-02-122-2/+39
|\ \ \
| * | | Add support for assigning keyed View tags via XMLAlan Viverette2014-02-112-2/+39
| | | | | | | | | | | | | | | | | | | | BUG: 12768823 Change-Id: Ic55c88894dc153c0af0805e403ad8e40d13abcd2
* | | | Merge "Set properties for pooled CollectionItemInfo, CollectionInfo"Alan Viverette2014-02-121-10/+23
|\ \ \ \
| * | | | Set properties for pooled CollectionItemInfo, CollectionInfoAlan Viverette2014-02-121-10/+23
| |/ / / | | | | | | | | | | | | | | | | BUG: 12978446 Change-Id: I64a366952090ab663ffef43a1d210528805e113c
* | | | Merge "Improve error handling in listener services."John Spurlock2014-02-122-0/+20
|\ \ \ \
| * | | | Improve error handling in listener services.John Spurlock2014-02-122-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check explicitly for null listeners in NMS, throwing IllegalArgumentException (on the small list of exceptions that survive RPC boundaries) with a message. Normally this situation is caused by listeners that attempt to perform NM-related actions before they are bound. Check for this case in the base NLS class and avoid the call to NM if we know it will fail. Although it's tempting to throw an IllegalStateException on the client side, preserve the existing semantics for backwards-compatibility purposes. That is, silently fail (or return null) - and provide a log warning. Bug:12805707 Change-Id: I0d92fd0d460a8592e8a23fd8fd718ae2ba3bd4c7
* | | | | Merge "Revert "Refactor setting an SkPaint onto a hwui Layer.""Derek Sollenberger2014-02-127-17/+25
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Revert "Refactor setting an SkPaint onto a hwui Layer."Derek Sollenberger2014-02-127-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e889298cd6ae1fc0d76bc00d7d12586db03eb261. Change-Id: I4b1d609b2d4280595d40cb10d6c18875c22999f8
* | | | | Merge "Refactor setting an SkPaint onto a hwui Layer."Derek Sollenberger2014-02-127-25/+17
|\ \ \ \ \ | |/ / / /
| * | | | Refactor setting an SkPaint onto a hwui Layer.Derek Sollenberger2014-02-127-25/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL removes the unecessary JNI call to set the colorFilter on a layer. Change-Id: I9e088f888938d4315745aa618334bfdb9e61343a
* | | | | am 7594767e: am aa318b28: am 879592d8: am bc64716c: am a2739fa7: am ↵Scott Main2014-02-127-73/+1107
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 * commit '7594767e55e011101ed9341f01d40730fdbd4cc7': add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
| * \ \ \ \ am aa318b28: am 879592d8: am bc64716c: am a2739fa7: am a4c5bba0: add ↵Scott Main2014-02-127-73/+1107
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 * commit 'aa318b2851042c6f98723446f33469a6545c7294': add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
| | * \ \ \ \ am 879592d8: am bc64716c: am a2739fa7: am a4c5bba0: add document about ↵Scott Main2014-02-127-73/+1107
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 * commit '879592d89a78383a9e3cd29d53357f34337e5f04': add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
| | | * \ \ \ \ am bc64716c: am a2739fa7: am a4c5bba0: add document about GoogleApiClient ↵Scott Main2014-02-127-73/+1107
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 * commit 'bc64716cfb1269d07b64f89c3b46800afa5dc266': add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
| | | | * \ \ \ \ am a2739fa7: am a4c5bba0: add document about GoogleApiClient and one about ↵Scott Main2014-02-127-73/+1107
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818 * commit 'a2739fa795981f597b044e93a5c552051cfe1c00': add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
| | | | | * \ \ \ \ am a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil ↵Scott Main2014-02-127-73/+1107
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also remove the Authorization document from the Google Services section. bug:10679818 * commit 'a4c5bba07e121569ab504b2191ee576f09407f5b': add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:10679818
| | | | | | * | | | | add document about GoogleApiClient and one about GoogleAuthUtilScott Main2014-02-127-73/+1107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also remove the Authorization document from the Google Services section. bug:10679818 Change-Id: Ibfade1eca68d89afe30b79d75ca5e38a2b3a84a8
* | | | | | | | | | | am 57b00e2b: am 17f0d48c: am 8b6597bd: am b6ecc342: am 37ae7032: am ↵Dirk Dougherty2014-02-12398-31181/+137525
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1654264e: Update generated docs for Google Play Services. * commit '57b00e2bdf1d2eb596c6525a6fdaa16563e1f132': Update generated docs for Google Play Services.
| * | | | | | | | | | am 17f0d48c: am 8b6597bd: am b6ecc342: am 37ae7032: am 1654264e: Update ↵Dirk Dougherty2014-02-12398-31181/+137525
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generated docs for Google Play Services. * commit '17f0d48ccf4ea817308e8cc3958d249bf77c2a2f': Update generated docs for Google Play Services.
| | * | | | | | | | | am 8b6597bd: am b6ecc342: am 37ae7032: am 1654264e: Update generated docs ↵Dirk Dougherty2014-02-12398-31181/+137525
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for Google Play Services. * commit '8b6597bd07411ff3037d068dd0ef55d70ff18f18': Update generated docs for Google Play Services.
| | | * | | | | | | | am b6ecc342: am 37ae7032: am 1654264e: Update generated docs for Google Play ↵Dirk Dougherty2014-02-12398-31181/+137525
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Services. * commit 'b6ecc342d3e9f355a78a0a10e613bbda31286f3a': Update generated docs for Google Play Services.
| | | | * | | | | | | am 37ae7032: am 1654264e: Update generated docs for Google Play Services.Dirk Dougherty2014-02-12398-31181/+137525
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '37ae70326feebd23cf2b9c5254f1250d5bf3a029': Update generated docs for Google Play Services.
| | | | | * | | | | | am 1654264e: Update generated docs for Google Play Services.Dirk Dougherty2014-02-12398-31181/+137525
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1654264edd68adfd4347d12112aa3124f1d0acb9': Update generated docs for Google Play Services.
| | | | | | * | | | | Update generated docs for Google Play Services.Dirk Dougherty2014-02-11398-31181/+137525
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6dab64736cd07b1ffb398d9baab21250552c5e17
* | | | | | | | | | | Merge "Simplify immersive mode confirmation cling logic."John Spurlock2014-02-122-62/+81
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Simplify immersive mode confirmation cling logic.John Spurlock2014-02-122-62/+81
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of keeping track of confirmations per-package, track a global confirmation per-user. If the panic signal is received, reshow the cling at most once per-user per-reboot. Ensure the nav bar becomes visible after the panic signal. Usually this happens as a side effect of showing the keyguard. However, in the case where there is no keyguard (Security = None) show the transient nav bar temporarily as a hint. Also listen to the correct observer uri to pick up confirmation setting changes. Bug:12242125 Change-Id: Ic95e2a8630ec3802b8ef462fcaa92366b9343a3f
* | | | | | | | | | | Merge topic 'hun'Chris Wren2014-02-123-8/+37
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: use private notification for the heads up explicitly handle clicks on the heads up notification
| * | | | | | | | | | | use private notification for the heads upChris Wren2014-02-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HUN only shows if the device is on and unlocked Change-Id: Ib3f11bb9267b95c88ddb8bef0b321db79d68841b
| * | | | | | | | | | | explicitly handle clicks on the heads up notificationChris Wren2014-02-112-8/+36
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11900055 Change-Id: I45c955f7ac91dc9f59528e382e9df490f0f96be5
* | | | | | | | | | | Fix typo in comments for supportsSwitchingToNextInputMethodKen Wakasa2014-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I387acd8ce3125c0d35e43757de7166a284da630b
* | | | | | | | | | | am 7ef544f0: am dac4429f: am 08d28f59: am 6d1d2134: am 11bb34da: am ↵Scott Main2014-02-127-16/+107
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs * commit '7ef544f07f3bb78d3a49c5cd60ad667964cedd57': add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
| * | | | | | | | | am dac4429f: am 08d28f59: am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add ↵Scott Main2014-02-127-16/+107
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs * commit 'dac4429f21caffea61b626797afd142db5025e42': add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
| | * | | | | | | | am 08d28f59: am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add google cast ↵Scott Main2014-02-127-16/+107
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs * commit '08d28f59bd74ab4109cf5343ef056a8d4b796ef6': add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
| | | * | | | | | | am 6d1d2134: am 11bb34da: am 9854f69f: Merge "add google cast feature page ↵Scott Main2014-02-127-16/+107
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs * commit '6d1d21340fe6ca84fdef76dd6f9ba7c315b7a73e': add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
| | | | * | | | | | am 11bb34da: am 9854f69f: Merge "add google cast feature page edit other ↵Scott Main2014-02-127-16/+107
| | | | |\ \ \ \ \ \ | | | | | | |_|/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs * commit '11bb34da5f68f70f3350199e3578445d9a1eaae3': add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
| | | | | * | | | | am 9854f69f: Merge "add google cast feature page edit other feature pages ↵Scott Main2014-02-127-16/+107
| | | | | |\ \ \ \ \ | | | | | | | |_|/ / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs * commit '9854f69f75352e473e34410b0b298b7c7f04434a': add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
| | | | | | * | | | Merge "add google cast feature page edit other feature pages for consistent ↵Scott Main2014-02-127-16/+107
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | call to action paragraph and remove 'preview' notice from Drive page" into klp-docs
| | | | | | | * | | | add google cast feature pageScott Main2014-02-047-16/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page Change-Id: I75f1f24fbae51852246ae0624b355aa23b14e60a
* | | | | | | | | | | am a872c22a: (-s ours) am be83e4a0: am 38f96e50: Add support for injecting ↵Jeff Brown2014-02-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | events into ActivityContainers. (DO NOT MERGE) * commit 'a872c22aa4b252c55a4fccfb0f2ec501278179ad': Add support for injecting events into ActivityContainers. (DO NOT MERGE)
| * | | | | | | | | | am be83e4a0: am 38f96e50: Add support for injecting events into ↵Jeff Brown2014-02-129-101/+221
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActivityContainers. (DO NOT MERGE) * commit 'be83e4a08e909b773ffc06a6e59446deadb8af8b': Add support for injecting events into ActivityContainers. (DO NOT MERGE)
| | * | | | | | | | | am 38f96e50: Add support for injecting events into ActivityContainers. (DO ↵Jeff Brown2014-02-129-101/+221
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE) * commit '38f96e5020b3e82b98fe97b0be363a5ad185860f': Add support for injecting events into ActivityContainers. (DO NOT MERGE)
| | | * | | | | | | | Add support for injecting events into ActivityContainers. (DO NOT MERGE)Jeff Brown2014-02-119-101/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified ActivityView to inject touch events it receives back into its activity container. The container then injects the event into the input system along with the display id of the underlying virtual display. Enhanced the input system to support concurrent dispatch of touch events on multiple displays which is required for this to work. Change-Id: I9cf1870db3be6f99a52ed9a1e3ceafe42c940093
* | | | | | | | | | | Merge "Add support for injecting events into ActivityContainers."Jeff Brown2014-02-126-10/+74
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add support for injecting events into ActivityContainers.Jeff Brown2014-02-116-10/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified ActivityView to inject touch events it receives back into its activity container. The container then injects the event into the input system along with the display id of the underlying virtual display. Change-Id: I23d018a2f7dd30f1f833f522eb7f143b43d8e637
* | | | | | | | | | | | am d9e385b1: Fix build.Dianne Hackborn2014-02-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / / | | | | | | | | | | | * commit 'd9e385b111ebf811beb0f29178a2fbd4d667509f': Fix build.