OSDN Git Service

android-x86/frameworks-base.git
11 years agoMerge "Fix up device sounds." into jb-mr2-dev
Dave Burke [Wed, 29 May 2013 05:56:04 +0000 (05:56 +0000)]
Merge "Fix up device sounds." into jb-mr2-dev

11 years agoMerge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
Matthew Xie [Wed, 29 May 2013 05:25:47 +0000 (05:25 +0000)]
Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev

11 years agoFix up device sounds.
Dave Burke [Wed, 29 May 2013 04:44:29 +0000 (21:44 -0700)]
Fix up device sounds.

Bug: 9179812
Change-Id: Ie86287487830c06f38bcc5c0e8bab3da225d6bbf

11 years agoMerge "Don't show emergency calls label unless it's a phone." into jb-mr2-dev
Daniel Sandler [Wed, 29 May 2013 04:36:23 +0000 (04:36 +0000)]
Merge "Don't show emergency calls label unless it's a phone." into jb-mr2-dev

11 years agoMerge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev
Robert Greenwalt [Wed, 29 May 2013 04:21:24 +0000 (04:21 +0000)]
Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 29 May 2013 03:42:23 +0000 (03:42 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoIgnore outstanding delayed shutdown on restart
Robert Greenwalt [Wed, 29 May 2013 02:33:48 +0000 (19:33 -0700)]
Ignore outstanding delayed shutdown on restart

This was causing us to go disabled when we shouldn't
so the API being tested in the CTS would fail.  Bug
is timing dependent and hard to repro.

bug:9067887
Change-Id: I70b813bf826988d859cc29201242238f18dcf2e6

11 years agoRevert "Revert "Change GATT_FAILURE from 0 to 0x101""
Matthew Xie [Tue, 28 May 2013 21:06:50 +0000 (21:06 +0000)]
Revert "Revert "Change GATT_FAILURE from 0 to 0x101""

This reverts commit d21f674c150aa26c8094d1418108649f53f810e6
bug 9109238
Change-Id: Ie1fc3d7420e6c401d3db29499d8846e6b70a61bb

11 years agoDon't show emergency calls label unless it's a phone.
Daniel Sandler [Tue, 28 May 2013 20:17:13 +0000 (16:17 -0400)]
Don't show emergency calls label unless it's a phone.

Bug: 9042105
Change-Id: I8ffb6a66851878cdf22be9a20dbf57f5b6b48002

11 years agoam 5bd67944: am 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile...
Scott Main [Tue, 28 May 2013 18:49:25 +0000 (11:49 -0700)]
am 5bd67944: am 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev

* commit '5bd6794468df7f7900f1e0a37c24653dd524a5c8':
  update eclipse download URL; /mobile URL will be deprecated

11 years agoam 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile URL will be...
Scott Main [Tue, 28 May 2013 18:45:25 +0000 (11:45 -0700)]
am 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev

* commit '5fbe17fe2a5804a613c3e9d72d555a0aae8ba618':
  update eclipse download URL; /mobile URL will be deprecated

11 years agoam 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated"...
Scott Main [Tue, 28 May 2013 18:43:50 +0000 (11:43 -0700)]
am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev

* commit '27ab718e7ca00092acab7f55fed1a5dea9a7a77b':
  update eclipse download URL; /mobile URL will be deprecated

11 years agoMerge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1...
Scott Main [Tue, 28 May 2013 18:41:37 +0000 (18:41 +0000)]
Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev

11 years agoMerge "Fix typo in View.java javadocs" into jb-mr2-dev
John Spurlock [Tue, 28 May 2013 16:33:49 +0000 (16:33 +0000)]
Merge "Fix typo in View.java javadocs" into jb-mr2-dev

11 years agoam 6e5ee7dd: am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes...
Scott Main [Tue, 28 May 2013 16:03:37 +0000 (09:03 -0700)]
am 6e5ee7dd: am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev

* commit '6e5ee7ddf2cc948ef3b69a73f25ce81f7edd76e9':
  docs: SDK and ADT r22.0.1 Release Notes

11 years agoam ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb...
Scott Main [Tue, 28 May 2013 16:00:51 +0000 (09:00 -0700)]
am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev

* commit 'ea32597832aada5f811c9ca1c1baf008d62ab64a':
  docs: SDK and ADT r22.0.1 Release Notes

11 years agoam afaff6e2: am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulat...
Scott Main [Tue, 28 May 2013 15:59:09 +0000 (08:59 -0700)]
am afaff6e2: am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev

* commit 'afaff6e2e90e61df52737fec9e059b05cfa71e48':
  update GPS setup page to include emulator support. revise the doc layout with headings

11 years agoam 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
Scott Main [Tue, 28 May 2013 15:58:18 +0000 (08:58 -0700)]
am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev

* commit '005d2afb308f474352ec4b504cf661851e4c2e59':
  docs: SDK and ADT r22.0.1 Release Notes

11 years agoam fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support...
Scott Main [Tue, 28 May 2013 15:57:27 +0000 (08:57 -0700)]
am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev

* commit 'fb22f9cb04d13fb85f1b3fd0e979742b5ab6568d':
  update GPS setup page to include emulator support. revise the doc layout with headings

11 years agoMerge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
Scott Main [Tue, 28 May 2013 15:56:23 +0000 (15:56 +0000)]
Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev

11 years agoam 5d64a193: Merge "update GPS setup page to include emulator support. revise the...
Scott Main [Tue, 28 May 2013 15:54:59 +0000 (08:54 -0700)]
am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev

* commit '5d64a1932d6c94628442b811c4be7bc41f0f1a8f':
  update GPS setup page to include emulator support. revise the doc layout with headings

11 years agoMerge "update GPS setup page to include emulator support. revise the doc layout with...
Scott Main [Tue, 28 May 2013 15:53:04 +0000 (15:53 +0000)]
Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev

11 years agoam 43fa2b88: am 718011ac: am d4b710c6: new android studio download v0.1.1
Scott Main [Tue, 28 May 2013 15:42:24 +0000 (08:42 -0700)]
am 43fa2b88: am 718011ac: am d4b710c6: new android studio download v0.1.1

* commit '43fa2b8853ea61a2bbb1a34cf98c558c4ca830da':
  new android studio download v0.1.1

11 years agoFix typo in View.java javadocs
John Spurlock [Tue, 28 May 2013 15:40:58 +0000 (11:40 -0400)]
Fix typo in View.java javadocs

Change-Id: I85b9b2bd30d1f9d38954c31f24a352930a230ced

11 years agoam 718011ac: am d4b710c6: new android studio download v0.1.1
Scott Main [Tue, 28 May 2013 15:39:42 +0000 (08:39 -0700)]
am 718011ac: am d4b710c6: new android studio download v0.1.1

* commit '718011ac851dcd8925ebeaf4f5516b7b1b62a647':
  new android studio download v0.1.1

11 years agoam d4b710c6: new android studio download v0.1.1
Scott Main [Tue, 28 May 2013 15:37:35 +0000 (08:37 -0700)]
am d4b710c6: new android studio download v0.1.1

* commit 'd4b710c69800acd0a9237a64e73d62ac9ba3a517':
  new android studio download v0.1.1

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 27 May 2013 16:55:15 +0000 (09:55 -0700)]
Import translations. DO NOT MERGE

Change-Id: I99c1563b2e8d99075b09492c163c4a28e229734d
Auto-generated-cl: translation import

11 years agoMerge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
Matthew Xie [Sun, 26 May 2013 21:38:01 +0000 (21:38 +0000)]
Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev

11 years agoRevert "Change GATT_FAILURE from 0 to 0x101"
Matthew Xie [Sun, 26 May 2013 21:03:16 +0000 (21:03 +0000)]
Revert "Change GATT_FAILURE from 0 to 0x101"

This reverts commit 8310e6196ffeb6d0dce33fc1a528113b04f304d6

Change-Id: I467f7cfc8626b0fc54509a89158cd2d84a0c10b8

11 years agoMerge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
Matthew Xie [Sun, 26 May 2013 20:19:05 +0000 (20:19 +0000)]
Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev

11 years agoMerge "Update test with CamercorderProfile video size." into jb-mr2-dev
Yu Shan Emily Lau [Sat, 25 May 2013 01:51:40 +0000 (01:51 +0000)]
Merge "Update test with CamercorderProfile video size." into jb-mr2-dev

11 years agoMerge "add links to orientation flags in attribute docs to help determine the support...
Scott Main [Sat, 25 May 2013 01:17:06 +0000 (01:17 +0000)]
Merge "add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes" into jb-mr2-dev

11 years agoMerge "TransitionDrawable should not become a LayerDrawable Bug #9057757" into jb...
Romain Guy [Sat, 25 May 2013 00:38:26 +0000 (00:38 +0000)]
Merge "TransitionDrawable should not become a LayerDrawable Bug #9057757" into jb-mr2-dev

11 years agoTransitionDrawable should not become a LayerDrawable
Romain Guy [Sat, 25 May 2013 00:31:17 +0000 (17:31 -0700)]
TransitionDrawable should not become a LayerDrawable
Bug #9057757

Calling TransitionDrawable.mutate() would turn it into a LayerDrawable,
causing it to draw all its children on screen at the same time.

Change-Id: I5efa87c43114a9c817719f08890ce41965f3220a

11 years agoMerge "fix javadoc links. turns out, without parameters, javadoc will link to the...
Scott Main [Fri, 24 May 2013 21:40:45 +0000 (21:40 +0000)]
Merge "fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it's from the superclass. So these were pointing to Object.nofify()" into jb-mr2-dev

11 years agoadd links to orientation flags in attribute docs
Scott Main [Fri, 24 May 2013 20:36:24 +0000 (13:36 -0700)]
add links to orientation flags in attribute docs
to help determine the supported API level for each value
and update the manifest reference page with new attributes

Change-Id: I583a9b3f3be759be71044533055dec26e3616b72

11 years agoMerge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-dev
Alan Viverette [Fri, 24 May 2013 21:19:55 +0000 (21:19 +0000)]
Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-dev

11 years agoMerge "Pipe through bounding box information (DO NOT MERGE)" into jb-mr2-dev
Michael Wright [Fri, 24 May 2013 20:52:40 +0000 (20:52 +0000)]
Merge "Pipe through bounding box information (DO NOT MERGE)" into jb-mr2-dev

11 years agoMerge "Add missing native methods." into jb-mr2-dev
Deepanshu Gupta [Fri, 24 May 2013 20:52:07 +0000 (20:52 +0000)]
Merge "Add missing native methods." into jb-mr2-dev

11 years agonew android studio download v0.1.1
Scott Main [Thu, 23 May 2013 22:33:05 +0000 (15:33 -0700)]
new android studio download v0.1.1

Change-Id: I3a504365942fcf74b20ce06ae5356e4c05e53a95

11 years agoupdate GPS setup page to include emulator support.
Scott Main [Fri, 24 May 2013 17:54:24 +0000 (10:54 -0700)]
update GPS setup page to include emulator support.
revise the doc layout with headings

Change-Id: If063782474e4187779dbc1fd23743fa87a69d316

11 years agoDO NOT MERGE. Fix number picker accessibility focus.
Alan Viverette [Fri, 24 May 2013 17:03:24 +0000 (10:03 -0700)]
DO NOT MERGE. Fix number picker accessibility focus.

The node bounds populated by the child TextView were not consistent
with the bounds manually populated for its parent NumberPicker.

Bug: 9072003
Change-Id: Icbfa64f52cf11fd39c7243936227b8ba36280c3c

11 years agoupdate eclipse download URL; /mobile URL will be deprecated
Scott Main [Fri, 24 May 2013 16:38:57 +0000 (09:38 -0700)]
update eclipse download URL; /mobile URL will be deprecated

Change-Id: I18117d83e01c7f2a3a9c325b4cb84ec4fa6911f4

11 years agoMerge "Use the old interface when resetting connections" into jb-mr2-dev
Robert Greenwalt [Fri, 24 May 2013 16:21:34 +0000 (16:21 +0000)]
Merge "Use the old interface when resetting connections" into jb-mr2-dev

11 years agoUpdate test with CamercorderProfile video size.
Yu Shan Emily Lau [Fri, 24 May 2013 04:45:04 +0000 (21:45 -0700)]
Update test with CamercorderProfile video size.

Bug:9114681
Change-Id: Id8ac6e98849715d21cd4a983fc13935debea5e5f

11 years agoUse the old interface when resetting connections
Robert Greenwalt [Fri, 24 May 2013 01:33:06 +0000 (18:33 -0700)]
Use the old interface when resetting connections

The new one is often null when disconnected, so using the new fails.
In other situations, it's the connections on the old network we want
to reset anyway, so the old code when it would work would also do
the wrong thing (unless new iface == old iface).

bug:9112928
Change-Id: I1fcae89cc3aa9d712e516e7c97cece0b89869bd9

11 years agoChange GATT_FAILURE from 0 to 0x101
Matthew Xie [Fri, 24 May 2013 00:39:35 +0000 (17:39 -0700)]
Change GATT_FAILURE from 0 to 0x101

GATT_FAILURE 0 clashes with GATT_SUCCESS. For now, they represent different
kind of faiure. One for Gatt operation, one for Gatt registration. But we
should separate them as good practice.
bug 9109238

Change-Id: I686bb6004bc8831aa3e3bbffe2f7c8e24412e3c3

11 years agoAdd missing native methods.
Deepanshu Gupta [Thu, 23 May 2013 22:20:04 +0000 (15:20 -0700)]
Add missing native methods.

Change-Id: I7b34e2ec0164520efc658053a80f307791a992b1

11 years agoPipe through bounding box information (DO NOT MERGE)
Michael Wright [Thu, 16 May 2013 06:16:54 +0000 (23:16 -0700)]
Pipe through bounding box information (DO NOT MERGE)

Bug: 9110236
Change-Id: I7aefe6589fbaf92e5c71a0ba5425623578bafe95

11 years agodocs: SDK and ADT r22.0.1 Release Notes
Joe Fernandez [Thu, 23 May 2013 05:19:29 +0000 (22:19 -0700)]
docs: SDK and ADT r22.0.1 Release Notes

Change-Id: I64fca371d2456f88c17309aaf5cef693792fcd58

11 years agoam 22689bc5: am a8b2186b: am a502c59e: docs: Add FileProvider to Support Library...
Joe Fernandez [Thu, 23 May 2013 21:06:41 +0000 (14:06 -0700)]
am 22689bc5: am a8b2186b: am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes

* commit '22689bc5e52a1c2f2d748440c0eeeebec17637c2':
  docs: Add FileProvider to Support Library r13 Release Notes

11 years agoam a8b2186b: am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes
Joe Fernandez [Thu, 23 May 2013 21:04:41 +0000 (14:04 -0700)]
am a8b2186b: am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes

* commit 'a8b2186b09a0f79b746d0fbab3611d95877af5fe':
  docs: Add FileProvider to Support Library r13 Release Notes

11 years agoMerge "Check for invalid pointer index in PagedView" into jb-mr2-dev
Jim Miller [Thu, 23 May 2013 20:38:02 +0000 (20:38 +0000)]
Merge "Check for invalid pointer index in PagedView" into jb-mr2-dev

11 years agoam a502c59e: docs: Add FileProvider to Support Library r13 Release Notes
Joe Fernandez [Thu, 23 May 2013 21:01:23 +0000 (14:01 -0700)]
am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes

* commit 'a502c59e679c1b355d6ad3387449d82c590d84cf':
  docs: Add FileProvider to Support Library r13 Release Notes

11 years agoMerge "Compare binder instances when checking if listeners match." into jb-mr2-dev
Andrew Wilson [Thu, 23 May 2013 18:47:48 +0000 (18:47 +0000)]
Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev

11 years agoMerge "Restore previous alpha value on noop'd DisplayList operations" into jb-mr2-dev
Chet Haase [Thu, 23 May 2013 18:23:34 +0000 (18:23 +0000)]
Merge "Restore previous alpha value on noop'd DisplayList operations" into jb-mr2-dev

11 years agodocs: Add FileProvider to Support Library r13 Release Notes
Joe Fernandez [Thu, 23 May 2013 18:16:09 +0000 (11:16 -0700)]
docs: Add FileProvider to Support Library r13 Release Notes

Change-Id: I9a87312f1bb5d4a18c720a9c3d3a558240450f6d

11 years agoam 88f24e6f: am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update...
kmccormick [Thu, 23 May 2013 17:56:56 +0000 (10:56 -0700)]
am 88f24e6f: am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs

* commit '88f24e6fe8b854f43bebc77c891228a28a503cd9':
  Doc update: fix GCM TOC

11 years agoam 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC...
kmccormick [Thu, 23 May 2013 17:54:10 +0000 (10:54 -0700)]
am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs

* commit '84fb096ee7a4f6d2af7dab6e18063ed029e0ff94':
  Doc update: fix GCM TOC

11 years agoam e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1...
kmccormick [Thu, 23 May 2013 17:51:49 +0000 (10:51 -0700)]
am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs

* commit 'e56e2483c57f9d6a12421ca7e124e7ec0e61f0ab':
  Doc update: fix GCM TOC

11 years agoam 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
kmccormick [Thu, 23 May 2013 17:49:58 +0000 (10:49 -0700)]
am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs

* commit '7b1adeb80ae87e9eff90aa01bae35053fc74c66f':
  Doc update: fix GCM TOC

11 years agoam c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
kmccormick [Thu, 23 May 2013 17:47:13 +0000 (10:47 -0700)]
am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs

* commit 'c6c149aa14610925158ef1ba6320c9356e45e631':
  Doc update: fix GCM TOC

11 years agoMerge "Doc update: fix GCM TOC" into jb-mr1.1-docs
kmccormick [Thu, 23 May 2013 17:45:26 +0000 (17:45 +0000)]
Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 23 May 2013 16:14:16 +0000 (16:14 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoRestore previous alpha value on noop'd DisplayList operations
Chet Haase [Thu, 23 May 2013 14:57:17 +0000 (07:57 -0700)]
Restore previous alpha value on noop'd DisplayList operations

Previously, when a DisplayList operation was rejected because it was not
in the clip bounds, the code would not properly restore the previous
state, leading to errors in alpha values of the noop'd op being applied
to unrelated operations later in the DisplayList.

Issue #9051935 Flash of grey background when transitioning to conversation view

Change-Id: I56645cc9ebf2e07be0228ca5e249213dbeb10d7d

11 years agoMerge "Fix account filtering for specific package name" into jb-mr2-dev
Amith Yamasani [Thu, 23 May 2013 14:39:07 +0000 (14:39 +0000)]
Merge "Fix account filtering for specific package name" into jb-mr2-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 23 May 2013 05:14:01 +0000 (22:14 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8af9de6adcf346f5d2b9241eceefdc42a4c42026
Auto-generated-cl: translation import

11 years agoFix account filtering for specific package name
Amith Yamasani [Thu, 23 May 2013 02:41:45 +0000 (19:41 -0700)]
Fix account filtering for specific package name

Hacks to enable gms to see accounts were interfering with checking for
explicit package name.

Bug: 9095427
Change-Id: Iae65ea2a678d7403d023fa1a61c01347b77c3b5a

11 years agofix javadoc links.
Scott Main [Thu, 23 May 2013 02:00:09 +0000 (19:00 -0700)]
fix javadoc links.
turns out, without parameters, javadoc will link to the best matching
method signature, even if it's from the superclass. So these were pointing
to Object.nofify()

Change-Id: I13688f2b65e898d1f000a34c88d0aaed928884b5

11 years agoDoc update: fix GCM TOC
kmccormick [Thu, 23 May 2013 01:25:21 +0000 (18:25 -0700)]
Doc update: fix GCM TOC

Change-Id: I38753475fdf6c33d80e0e099cb6c5dcf2f05de0b

11 years agoMerge "Move offline-pdk to where the source is." into jb-mr2-dev
Ying Wang [Thu, 23 May 2013 00:56:20 +0000 (00:56 +0000)]
Merge "Move offline-pdk to where the source is." into jb-mr2-dev

11 years agoam cfc593d5: am 38b9aaa0: am 2cc84c63: add VID for Haier to docs
Scott Main [Thu, 23 May 2013 00:10:28 +0000 (17:10 -0700)]
am cfc593d5: am 38b9aaa0: am 2cc84c63: add VID for Haier to docs

* commit 'cfc593d5736b627e0fffe92e511ee326b9f6d326':
  add VID for Haier to docs

11 years agoam 38b9aaa0: am 2cc84c63: add VID for Haier to docs
Scott Main [Thu, 23 May 2013 00:08:20 +0000 (17:08 -0700)]
am 38b9aaa0: am 2cc84c63: add VID for Haier to docs

* commit '38b9aaa0fc1b49fa4e734bb0eba28711b6b0d165':
  add VID for Haier to docs

11 years agoam 2cc84c63: add VID for Haier to docs
Scott Main [Thu, 23 May 2013 00:06:45 +0000 (17:06 -0700)]
am 2cc84c63: add VID for Haier to docs

* commit '2cc84c638a3a1048d9704a8c987d1436dd27fcd6':
  add VID for Haier to docs

11 years agoCheck for invalid pointer index in PagedView
Jim Miller [Wed, 22 May 2013 22:53:24 +0000 (15:53 -0700)]
Check for invalid pointer index in PagedView

Fixes bug 9088039

Change-Id: I54897df39adbf224ef3dd3de4ce7254fb70b587c

11 years agoMerge "Add a queue of pending finished input events." into jb-mr2-dev
Jeff Brown [Wed, 22 May 2013 22:44:17 +0000 (22:44 +0000)]
Merge "Add a queue of pending finished input events." into jb-mr2-dev

11 years agoMerge "Improve exception error messages to help diagnose app errors" into jb-mr2-dev
Jeff Tinker [Wed, 22 May 2013 19:12:38 +0000 (19:12 +0000)]
Merge "Improve exception error messages to help diagnose app errors" into jb-mr2-dev

11 years agoMerge "Fix invalid keyType translation in MediaDrm.getKeyRequest" into jb-mr2-dev
Jeff Tinker [Wed, 22 May 2013 19:12:00 +0000 (19:12 +0000)]
Merge "Fix invalid keyType translation in MediaDrm.getKeyRequest" into jb-mr2-dev

11 years agoAdd a queue of pending finished input events.
Jeff Brown [Wed, 22 May 2013 03:37:51 +0000 (20:37 -0700)]
Add a queue of pending finished input events.

Although in practice an application or IME is unlikely to fill up
the input channel with finish events, it can happen when events are
being delivered very rapidly.  Handle this situation by queuing
up the pending finish events until the socket becomes writable again.

Bug: 9034301
Change-Id: I938a62a75d12106a19cff2d016ba7af0db877ecf

11 years agoCompare binder instances when checking if listeners match.
Andrew Wilson [Wed, 22 May 2013 16:35:35 +0000 (09:35 -0700)]
Compare binder instances when checking if listeners match.

Bug: 9069919
Change-Id: I06130105cb703de35de76ab2fceba3855fa5407a

11 years agoadd VID for Haier to docs
Scott Main [Wed, 22 May 2013 15:34:49 +0000 (08:34 -0700)]
add VID for Haier to docs

Change-Id: I3999d2b9d712ac3f5d2ce6325a30d07a743dbc15

11 years agoam 3e4ea33f: am 4f6d0cbd: am 7258e6bc: am 1fc7e59b: am 14233ee5: Merge "Doc change...
Adam Koch [Wed, 22 May 2013 13:52:00 +0000 (06:52 -0700)]
am 3e4ea33f: am 4f6d0cbd: am 7258e6bc: am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs

* commit '3e4ea33f087926d9039f7b4428dc967a8e760209':
  Doc change: fix minor typo in ContactsContract.RawContacts.

11 years agoam 4f6d0cbd: am 7258e6bc: am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor...
Adam Koch [Wed, 22 May 2013 13:49:43 +0000 (06:49 -0700)]
am 4f6d0cbd: am 7258e6bc: am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs

* commit '4f6d0cbdd9372754b1b5b112e2b724b3852ac12b':
  Doc change: fix minor typo in ContactsContract.RawContacts.

11 years agoam 7258e6bc: am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsC...
Adam Koch [Wed, 22 May 2013 13:45:33 +0000 (06:45 -0700)]
am 7258e6bc: am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs

* commit '7258e6bc57fb3cb023a4ca219f1355cf55ea93bf':
  Doc change: fix minor typo in ContactsContract.RawContacts.

11 years agoam 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawCo...
Adam Koch [Wed, 22 May 2013 13:43:16 +0000 (06:43 -0700)]
am 1fc7e59b: am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs

* commit '1fc7e59b3301bb74223393354571ad4e6b7ecfce':
  Doc change: fix minor typo in ContactsContract.RawContacts.

11 years agoam 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts."...
Adam Koch [Wed, 22 May 2013 13:41:26 +0000 (06:41 -0700)]
am 14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs

* commit '14233ee5d06c468f953dff2d900a9cf32f9737c0':
  Doc change: fix minor typo in ContactsContract.RawContacts.

11 years agoMerge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1...
Adam Koch [Wed, 22 May 2013 13:36:57 +0000 (13:36 +0000)]
Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs

11 years agoMerge "Avoid extraneous EGL surface allocations Bug #8667873" into jb-mr2-dev
Romain Guy [Wed, 22 May 2013 02:08:24 +0000 (02:08 +0000)]
Merge "Avoid extraneous EGL surface allocations Bug #8667873" into jb-mr2-dev

11 years agoMove offline-pdk to where the source is.
Ying Wang [Wed, 22 May 2013 01:03:29 +0000 (18:03 -0700)]
Move offline-pdk to where the source is.

Change-Id: I10b05c28954a27f11482751e14287ec21422dce2

11 years agoFix invalid keyType translation in MediaDrm.getKeyRequest
Jeff Tinker [Tue, 21 May 2013 19:35:06 +0000 (12:35 -0700)]
Fix invalid keyType translation in MediaDrm.getKeyRequest

bug: 9070897
Change-Id: Ib9b4174e08b1c828d0204e0ab65bc3d7c2efcedf

11 years agoImprove exception error messages to help diagnose app errors
Jeff Tinker [Tue, 21 May 2013 19:48:14 +0000 (12:48 -0700)]
Improve exception error messages to help diagnose app errors

bug: 9072051

Change-Id: I45057951d1a62b1b4a996e85f01601239e1b7161

11 years agoMerge "Don't put up wifi-available note when disabled" into jb-mr2-dev
Robert Greenwalt [Tue, 21 May 2013 19:54:39 +0000 (19:54 +0000)]
Merge "Don't put up wifi-available note when disabled" into jb-mr2-dev

11 years agoAvoid extraneous EGL surface allocations
Romain Guy [Tue, 21 May 2013 19:15:07 +0000 (12:15 -0700)]
Avoid extraneous EGL surface allocations
Bug #8667873

windowShouldResize means we need to layout the window, it doesn't mean
the dimensions of the surface have changed. We should only check the
width and the height. With this fix we can avoid a surface allocation
every time the window shade is opened or closed.

Change-Id: I8afe97b820a865723f2aab7a5aa4ddc8eaaec6e1

11 years agoMerge "Update media route picker button assets." into jb-mr2-dev
Jeff Brown [Tue, 21 May 2013 18:37:06 +0000 (18:37 +0000)]
Merge "Update media route picker button assets." into jb-mr2-dev

11 years agoDon't put up wifi-available note when disabled
Robert Greenwalt [Tue, 21 May 2013 18:17:11 +0000 (11:17 -0700)]
Don't put up wifi-available note when disabled

With the new scan-always mode we will get scan results when disabled.
Don't tell the user about open AP when they've turned off wifi.

bug:9067982
Change-Id: I7a303c2a6f87a331443eeb54fa8ff5b467c0a1ff

11 years agoMerge "Update CALL_PRIVILEGED docs" into jb-mr2-dev
Jay Shrauner [Tue, 21 May 2013 17:59:25 +0000 (17:59 +0000)]
Merge "Update CALL_PRIVILEGED docs" into jb-mr2-dev

11 years agoMerge "Archive a copy of each dismissed notification." into jb-mr2-dev
Daniel Sandler [Tue, 21 May 2013 17:35:17 +0000 (17:35 +0000)]
Merge "Archive a copy of each dismissed notification." into jb-mr2-dev

11 years agoam 2d31a8e8: am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change...
Dirk Dougherty [Tue, 21 May 2013 17:21:34 +0000 (10:21 -0700)]
am 2d31a8e8: am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs

* commit '2d31a8e85ca9e10c1dca720e89f2caa15dfd6e45':
  Doc change: fix doc title.

11 years agoam a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title...
Dirk Dougherty [Tue, 21 May 2013 17:19:39 +0000 (10:19 -0700)]
am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs

* commit 'a3d5a7a90fc9029e82e9e5cb64e789854ef99506':
  Doc change: fix doc title.

11 years agoam c7785844: am e6fbd9ed: am 86c25dec: add search tag for swipe view lesson
Scott Main [Tue, 21 May 2013 17:15:36 +0000 (10:15 -0700)]
am c7785844: am e6fbd9ed: am 86c25dec: add search tag for swipe view lesson

* commit 'c778584443cfb3af5a4f449959e16997edede266':
  add search tag for swipe view lesson