Joe Fernandez
21be773432
am 33164786: am 5b93d259: Merge "docs: code fixes for OpenGL ES training" into klp-docs
...
* commit '331647865554b5fe49d936452fed4dc1d86d7313':
docs: code fixes for OpenGL ES training
2013-11-15 13:26:22 -08:00
Joe Fernandez
3316478655
am 5b93d259: Merge "docs: code fixes for OpenGL ES training" into klp-docs
...
* commit '5b93d259b8df98b011ac7f915b2c6602bc63f9fe':
docs: code fixes for OpenGL ES training
2013-11-15 21:22:17 +00:00
Joe Fernandez
5b93d259b8
Merge "docs: code fixes for OpenGL ES training" into klp-docs
2013-11-15 21:19:51 +00:00
Joe Fernandez
feaaea5b41
docs: code fixes for OpenGL ES training
...
code sample fixes reviewed separately,
see Change-Id: I1d760b75d1f2bfe1ec90c71471867577bd146241
fixing bugs:
b/10798358
b/10796990
b/10603728
b/7962328
Change-Id: I1e0f6668ec8d2b103b88c385f1f067d30ecc7178
2013-11-15 11:55:33 -08:00
Wink Saville
044bc25fb5
am 67979256: am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev
...
* commit '67979256865f63330a1352e450e26baf24e914ec':
Add config_restartRadioAfterProvisioning
2013-11-15 11:42:55 -08:00
Wink Saville
6797925686
am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev
...
* commit '31cab2f803951edb13ea07e7e34916189fec5167':
Add config_restartRadioAfterProvisioning
2013-11-15 11:39:16 -08:00
Wink Saville
31cab2f803
Merge "Add config_restartRadioAfterProvisioning" into klp-dev
2013-11-15 19:35:05 +00:00
Wink Saville
9124d56acc
Add config_restartRadioAfterProvisioning
...
Bug: 11673637
Change-Id: Ie758a303fd751d204fd6baa60217e88df6376aae
2013-11-15 08:27:53 -08:00
Jeff Brown
2ea480cac8
am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev
...
* commit '5d0b18cddfcb933d7960c5a6a820045d77a0285c':
Disallow applications from initiating cast screen.
2013-11-15 00:39:57 -08:00
Jeff Brown
5d0b18cddf
am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev
...
* commit '3de885bef2f0f85ea76fd96c8f18cdd743ce66a4':
Disallow applications from initiating cast screen.
2013-11-15 00:38:09 -08:00
Jeff Brown
3de885bef2
Merge "Disallow applications from initiating cast screen." into klp-dev
2013-11-15 08:35:50 +00:00
Jeff Brown
af574183c2
Disallow applications from initiating cast screen.
...
Only allow the system ui and settings to connect to a remote display.
To do this, we essentially hide the remote displays from applications
by using the ROUTE_TYPE_REMOTE_DISPLAY then add permission checks
around the operations that connect to them.
As a bonus, this may actually save power on devices since applications
that use MediaRouter will not longer be performing discover on
remote display routes at all.
Bug: 11257292
Change-Id: I9ea8c568df4df5a0f0cf3d0f11b39c87e2110795
2013-11-15 00:29:43 -08:00
Baligh Uddin
2b9f9186fa
am 634fbcf8: (-s ours) am 2785892d: (-s ours) Import translations. DO NOT MERGE
...
* commit '634fbcf8a3a367ef0abbc7a905411c7918281394':
Import translations. DO NOT MERGE
2013-11-14 22:43:42 -08:00
Baligh Uddin
634fbcf8a3
am 2785892d: (-s ours) Import translations. DO NOT MERGE
...
* commit '2785892dbf6c53b7e1a08596969bfcdf0148c8e9':
Import translations. DO NOT MERGE
2013-11-14 22:39:20 -08:00
Baligh Uddin
2785892dbf
Import translations. DO NOT MERGE
...
Change-Id: I6d1283da139ad2ef60213d83d7ac00939a4bfc04
Auto-generated-cl: translation import
2013-11-14 22:32:08 -08:00
Svetoslav
172c5a2473
am d2b27cbd: am 6874bfe1: Merge "Created print jobs should not be persisted until they are queued." into klp-dev
...
* commit 'd2b27cbde92dc57b5b6fe9b7434a5189a73dd2b2':
Created print jobs should not be persisted until they are queued.
2013-11-14 22:30:52 -08:00
Svetoslav
d2b27cbde9
am 6874bfe1: Merge "Created print jobs should not be persisted until they are queued." into klp-dev
...
* commit '6874bfe19b6bc1522e07e53eb96a07e21d148b41':
Created print jobs should not be persisted until they are queued.
2013-11-14 22:27:35 -08:00
Svetoslav
6874bfe19b
Merge "Created print jobs should not be persisted until they are queued." into klp-dev
2013-11-15 06:23:32 +00:00
Mindy Pereira
bb8e75e6c4
am cce2e194: am 5823352c: Cancel double tap mode on action_up
...
* commit 'cce2e1944c4ac9411fa25534eb9b51d6f044dfb4':
Cancel double tap mode on action_up
2013-11-14 19:48:42 -08:00
Mindy Pereira
cce2e1944c
am 5823352c: Cancel double tap mode on action_up
...
* commit '5823352c6c5bfa3824afacd023b01af537b5dfa0':
Cancel double tap mode on action_up
2013-11-14 19:44:52 -08:00
Mindy Pereira
5823352c6c
Cancel double tap mode on action_up
...
fixes b/11592408 Dragging immediately after double touch turns gesture into double touch drag
Change-Id: I3e7926a4f6f9ab4951f380bd004499c78b3bda69
2013-11-15 02:48:06 +00:00
Christopher Tate
461febadc4
am 64397749: am 22010817: Merge "Handle backup transport registration dynamically" into klp-dev
...
* commit '64397749effa088dcea3799fc8440845c5a1c193':
Handle backup transport registration dynamically
2013-11-14 18:41:02 -08:00
Christopher Tate
64397749ef
am 22010817: Merge "Handle backup transport registration dynamically" into klp-dev
...
* commit '22010817b90f97756a76777fcd1dbe7e3b63e808':
Handle backup transport registration dynamically
2013-11-14 18:37:54 -08:00
Christopher Tate
22010817b9
Merge "Handle backup transport registration dynamically" into klp-dev
2013-11-15 02:34:38 +00:00
Jim Miller
fa0211adc3
am 8d1e86d0: am 1907c0d2: Merge "Don\'t show external presentation until keyguard actually shows" into klp-dev
...
* commit '8d1e86d054c9d2a9bdec2a0c9d454ddf21768031':
Don't show external presentation until keyguard actually shows
2013-11-14 18:24:35 -08:00
Jim Miller
8d1e86d054
am 1907c0d2: Merge "Don\'t show external presentation until keyguard actually shows" into klp-dev
...
* commit '1907c0d280d97776708810c9d24931aa6f818790':
Don't show external presentation until keyguard actually shows
2013-11-14 18:20:53 -08:00
Jim Miller
1907c0d280
Merge "Don't show external presentation until keyguard actually shows" into klp-dev
2013-11-15 02:18:08 +00:00
Christopher Tate
cefba58d14
Handle backup transport registration dynamically
...
Bug 11369873
Change-Id: I9bbdcc21ce25159c6645690123b5d03c553b0ddc
2013-11-14 18:13:25 -08:00
Svetoslav
885810de69
Created print jobs should not be persisted until they are queued.
...
Print jobs in a created state should not be persisted. However,
if a print service sets the tag to a print job that is queued,
we were persisting even print jobs in a created state. This
change adds a simple check while persisting to avoid storing
created print jobs.
bug:11696785
Change-Id: Idf28f3634b91fd5bf345f376114af4ed478ed3c6
2013-11-14 18:02:31 -08:00
Jeff Brown
d216944765
am 2bced6dc: am a7a46a66: Merge "Update cast screen strings." into klp-dev
...
* commit '2bced6dcb53c1743d6d11ffcb213206a07a63737':
Update cast screen strings.
2013-11-14 17:35:00 -08:00
Jeff Brown
2bced6dcb5
am a7a46a66: Merge "Update cast screen strings." into klp-dev
...
* commit 'a7a46a66fa9f9ce547bac6c2e800a0ae287d9e5c':
Update cast screen strings.
2013-11-14 17:31:32 -08:00
Jeff Brown
a7a46a66fa
Merge "Update cast screen strings." into klp-dev
2013-11-15 01:28:59 +00:00
John Spurlock
ab53cbea9e
am caf21486: am 68837c4e: Merge "Avoid skipping animated status bar icon frames." into klp-dev
...
* commit 'caf21486dfbc4ca67254652f16448493c5f4e06c':
Avoid skipping animated status bar icon frames.
2013-11-14 17:20:03 -08:00
John Spurlock
caf21486df
am 68837c4e: Merge "Avoid skipping animated status bar icon frames." into klp-dev
...
* commit '68837c4eca7705cd32e3de2e7cdcd24c72ecaea7':
Avoid skipping animated status bar icon frames.
2013-11-14 17:16:38 -08:00
John Spurlock
68837c4eca
Merge "Avoid skipping animated status bar icon frames." into klp-dev
2013-11-15 01:11:52 +00:00
Jim Miller
d31fd404e3
Don't show external presentation until keyguard actually shows
...
The previous code was looking for just the display to turn off.
It should wait until keyguard is actually shown before enabling
the external presentations.
Fix for bug 11694904
Change-Id: Iebf3aa04fc094cd4e5c8f56bc771aca1e5921d04
2013-11-14 16:47:26 -08:00
Dianne Hackborn
6f5d85377b
am 47b260d0: am 572b759a: Merge "Use index in SparseArray access properly"
...
* commit '47b260d071859a8c20bb0af2bcc095e253f7046c':
Use index in SparseArray access properly
2013-11-14 16:37:55 -08:00
Dianne Hackborn
47b260d071
am 572b759a: Merge "Use index in SparseArray access properly"
...
* commit '572b759a41fd490fd21b5831dd8b8434b7fd5df8':
Use index in SparseArray access properly
2013-11-14 16:35:42 -08:00
Dianne Hackborn
572b759a41
Merge "Use index in SparseArray access properly"
2013-11-15 00:33:20 +00:00
Jeff Brown
cef34fce3c
Update cast screen strings.
...
Bug: 11257292
Change-Id: Ia66152985bafcdd8ec88a3145623536a2b439b78
2013-11-14 16:03:36 -08:00
John Spurlock
327276440f
Avoid skipping animated status bar icon frames.
...
By avoiding a known issue in AnimationDrawable.
Bug:11694594
Change-Id: I87540728118833f29fc7b64a5c853bc26fd19d73
2013-11-14 19:01:20 -05:00
Jim Miller
dab5ba58fe
am 434b4acb: am 90fa5331: Merge "Don\'t show keyguard until the device has been provisioned." into klp-dev
...
* commit '434b4acb997484e7a540bf44bebd6b17c63fe270':
Don't show keyguard until the device has been provisioned.
2013-11-14 15:44:51 -08:00
Christopher Tate
a5acd62bde
am 6e5cf573: am 99437f25: Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev
...
* commit '6e5cf573f2f2e17825af2973daeba893c6aa5855':
Ensure recipient can be launched before attempting broadcast delivery
2013-11-14 15:44:40 -08:00
Dianne Hackborn
8e9b5fc932
am 59bf3be7: am 2e3ede74: Merge "Maybe fix issue #11634365 : Leaking restarting services" into klp-dev
...
* commit '59bf3be7d1cd7311cf60ead6872f33433a097bd1':
Maybe fix issue #11634365 : Leaking restarting services
2013-11-14 15:44:36 -08:00
Katie McCormick
0dcddb447c
am 9db6e7c6: am fb828c8c: Merge "Doc Update: add immersive mode to sysui class." into klp-docs
...
* commit '9db6e7c6d0e451ec1799d9ed81f911c5f77977e2':
Doc Update: add immersive mode to sysui class.
2013-11-14 15:44:32 -08:00
Jean-Michel Trivi
7c9adaf6b9
am dc6da58a: am 2a96fc1f: Merge "Fix RemoteController update in RemoteControlClient registration" into klp-dev
...
* commit 'dc6da58aa79f97d6bbd0fa8fd4e694f1e76973f0':
Fix RemoteController update in RemoteControlClient registration
2013-11-14 15:44:16 -08:00
Scott Main
587693f31e
am 92caa0c7: am c5cdd541: remove device list for nexus devices, clarify its needed for adb
...
* commit '92caa0c7aa801634c9b47297818938c7aed82a38':
remove device list for nexus devices, clarify its needed for adb
2013-11-14 15:44:00 -08:00
Jim Miller
434b4acb99
am 90fa5331: Merge "Don\'t show keyguard until the device has been provisioned." into klp-dev
...
* commit '90fa53318d4984dbebfa7964ae1f79f51a130932':
Don't show keyguard until the device has been provisioned.
2013-11-14 15:38:32 -08:00
Jim Miller
90fa53318d
Merge "Don't show keyguard until the device has been provisioned." into klp-dev
2013-11-14 23:34:32 +00:00
Christopher Tate
6e5cf573f2
am 99437f25: Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev
...
* commit '99437f252b728f4946940f232c4b73b9dda76cfb':
Ensure recipient can be launched before attempting broadcast delivery
2013-11-14 15:04:31 -08:00