OSDN Git Service

android-x86/frameworks-base.git
11 years agoam dea6e86d: am 3422ceb6: Merge "Bug fix for building the hover target list"
Jeff Brown [Tue, 28 May 2013 22:49:13 +0000 (15:49 -0700)]
am dea6e86d: am 3422ceb6: Merge "Bug fix for building the hover target list"

* commit 'dea6e86dce716b67fe92c9b281fe9e79256f3b78':
  Bug fix for building the hover target list

11 years agoam 3422ceb6: Merge "Bug fix for building the hover target list"
Jeff Brown [Tue, 28 May 2013 22:46:00 +0000 (15:46 -0700)]
am 3422ceb6: Merge "Bug fix for building the hover target list"

* commit '3422ceb6ba453c28ac39dfce34534e0346394a3a':
  Bug fix for building the hover target list

11 years agoam c8c82009: resolved conflicts for merge of 7573e594 to stage-aosp-master
Jeff Brown [Tue, 28 May 2013 22:45:43 +0000 (15:45 -0700)]
am c8c82009: resolved conflicts for merge of 7573e594 to stage-aosp-master

* commit 'c8c82009dc8c146efadac6b51702922148f6003f':
  Properly rotate full [-pi, +pi] orientation range if available

11 years agoresolved conflicts for merge of 7573e594 to stage-aosp-master
Jeff Brown [Tue, 28 May 2013 22:43:16 +0000 (15:43 -0700)]
resolved conflicts for merge of 7573e594 to stage-aosp-master

Change-Id: Ic19294c82ec023707e23b5848901426433b22e9f

11 years agoMerge "Bug fix for building the hover target list"
Jeff Brown [Tue, 28 May 2013 20:04:23 +0000 (20:04 +0000)]
Merge "Bug fix for building the hover target list"

11 years agoam 79df1e65: am e2a281ca: Merge "Add additional Method that check whether a table...
Jeff Brown [Tue, 28 May 2013 20:00:28 +0000 (13:00 -0700)]
am 79df1e65: am e2a281ca: Merge "Add additional Method that check whether a table is empty or not"

* commit '79df1e65455fdb69f07675cffae99dea06a5afb2':
  Add additional Method that check whether a table is empty or not

11 years agoam e2a281ca: Merge "Add additional Method that check whether a table is empty or...
Jeff Brown [Tue, 28 May 2013 19:57:59 +0000 (12:57 -0700)]
am e2a281ca: Merge "Add additional Method that check whether a table is empty or not"

* commit 'e2a281ca85f17eaf6d47978c76d2cafb0fa81782':
  Add additional Method that check whether a table is empty or not

11 years agoMerge "Properly rotate full [-pi, +pi] orientation range if available"
Jeff Brown [Tue, 28 May 2013 19:56:19 +0000 (19:56 +0000)]
Merge "Properly rotate full [-pi, +pi] orientation range if available"

11 years agoMerge "Add additional Method that check whether a table is empty or not"
Jeff Brown [Tue, 28 May 2013 19:55:25 +0000 (19:55 +0000)]
Merge "Add additional Method that check whether a table is empty or not"

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

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

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 agoam ee352cca: Merge "Fix typo in View.java javadocs" into jb-mr2-dev
John Spurlock [Tue, 28 May 2013 16:36:19 +0000 (09:36 -0700)]
am ee352cca: Merge "Fix typo in View.java javadocs" into jb-mr2-dev

* commit 'ee352cca1f3beb577dfdf1c18a08242e4f94d01b':
  Fix typo in View.java javadocs

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 0e11e8ef: am 6e5ee7dd: am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22...
Scott Main [Tue, 28 May 2013 16:08:02 +0000 (09:08 -0700)]
am 0e11e8ef: am 6e5ee7dd: am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev

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

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 597a8374: am afaff6e2: am fb22f9cb: am 5d64a193: Merge "update GPS setup page...
Scott Main [Tue, 28 May 2013 16:01:10 +0000 (09:01 -0700)]
am 597a8374: 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 '597a8374491ffb9dc5c07fadfccd9c1b1b336046':
  update GPS setup page to include emulator support. revise the doc layout with headings

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 0b92682d: am 43fa2b88: am 718011ac: am d4b710c6: new android studio download v0.1.1
Scott Main [Tue, 28 May 2013 15:44:23 +0000 (08:44 -0700)]
am 0b92682d: am 43fa2b88: am 718011ac: am d4b710c6: new android studio download v0.1.1

* commit '0b92682d292acd830ac84467178ff417cbb3e699':
  new android studio download v0.1.1

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 agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Tue, 28 May 2013 14:37:29 +0000 (07:37 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: I6e813db1760b5f2889fac72f042d82743179cc66

11 years agoam 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
Matthew Xie [Sun, 26 May 2013 21:40:14 +0000 (14:40 -0700)]
am 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev

* commit '27e453617a2c179580a55d6cbe0619fa95adf693':
  Revert "Change GATT_FAILURE from 0 to 0x101"

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 agoam 413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
Matthew Xie [Sun, 26 May 2013 20:21:44 +0000 (13:21 -0700)]
am 413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev

* commit '413f62930003d4ff20e29fd3bbfaf2d163a08ac1':
  Change GATT_FAILURE from 0 to 0x101

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 in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 26 May 2013 12:55:27 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam 840f1143: am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"
Dianne Hackborn [Sun, 26 May 2013 07:25:11 +0000 (00:25 -0700)]
am 840f1143: am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"

* commit '840f114395652b3d31815ae23302218305b8b780':
  Fix wrong log information in DevicePolicyManagerService

11 years agoam 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"
Dianne Hackborn [Sun, 26 May 2013 07:23:28 +0000 (00:23 -0700)]
am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"

* commit '7f3ff133c19ed50dd245e025a44e1de7bcc3d38a':
  Fix wrong log information in DevicePolicyManagerService

11 years agoMerge "Fix wrong log information in DevicePolicyManagerService"
Dianne Hackborn [Sun, 26 May 2013 07:22:21 +0000 (07:22 +0000)]
Merge "Fix wrong log information in DevicePolicyManagerService"

11 years agoam 43861f9d: am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java...
Dianne Hackborn [Sun, 26 May 2013 07:05:08 +0000 (00:05 -0700)]
am 43861f9d: am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"

* commit '43861f9de965593340f6a63c270120a7f1a8701c':
  Avoid IllegalArgumentException in Preference.java compareTo()

11 years agoam 95b79966: am 0a40bef9: Merge "Fix CalendarView to show the month title properly."
Dianne Hackborn [Sun, 26 May 2013 07:05:05 +0000 (00:05 -0700)]
am 95b79966: am 0a40bef9: Merge "Fix CalendarView to show the month title properly."

* commit '95b79966934864f1e81329de92562ee387ff5700':
  Fix CalendarView to show the month title properly.

11 years agoam c7322005: am f9b41efe: Merge "Don\'t include flags in configuration change if...
Dianne Hackborn [Sun, 26 May 2013 07:05:02 +0000 (00:05 -0700)]
am c7322005: am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed."

* commit 'c73220050efa7420974850ee9a80a965d807c7ce':
  Don't include flags in configuration change if their value hasn't changed.

11 years agoam fc09b326: am fee6d0cb: Merge "Fix documentation of requestCode parameter."
Dianne Hackborn [Sun, 26 May 2013 07:04:59 +0000 (00:04 -0700)]
am fc09b326: am fee6d0cb: Merge "Fix documentation of requestCode parameter."

* commit 'fc09b326da5e35786530777f01cd132d7686a788':
  Fix documentation of requestCode parameter.

11 years agoam 087384b0: am f3251033: Merge "Framework/base: Added synchronization block to avoid...
Dianne Hackborn [Sun, 26 May 2013 07:04:57 +0000 (00:04 -0700)]
am 087384b0: am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"

* commit '087384b0af6fd3912a3d3e32b9ade7e4604e6537':
  Framework/base: Added synchronization block to avoid race condition

11 years agoam f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
Dianne Hackborn [Sun, 26 May 2013 07:02:46 +0000 (00:02 -0700)]
am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"

* commit 'f46449abedcba2167fffa8ba8dc2f6d7a6d410b9':
  Avoid IllegalArgumentException in Preference.java compareTo()

11 years agoam 0a40bef9: Merge "Fix CalendarView to show the month title properly."
Dianne Hackborn [Sun, 26 May 2013 07:02:41 +0000 (00:02 -0700)]
am 0a40bef9: Merge "Fix CalendarView to show the month title properly."

* commit '0a40bef955c937189841b6f1695e8001311758fa':
  Fix CalendarView to show the month title properly.

11 years agoam f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn...
Dianne Hackborn [Sun, 26 May 2013 07:02:37 +0000 (00:02 -0700)]
am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed."

* commit 'f9b41efe17718a21df115d95c47a94d97a767076':
  Don't include flags in configuration change if their value hasn't changed.

11 years agoam fee6d0cb: Merge "Fix documentation of requestCode parameter."
Dianne Hackborn [Sun, 26 May 2013 07:02:31 +0000 (00:02 -0700)]
am fee6d0cb: Merge "Fix documentation of requestCode parameter."

* commit 'fee6d0cb1e27b13f6ed91c1cdcb9d524bb967ea2':
  Fix documentation of requestCode parameter.

11 years agoam f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"
Dianne Hackborn [Sun, 26 May 2013 07:02:24 +0000 (00:02 -0700)]
am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"

* commit 'f325103356c559d6378da7fb7db3b2a49aba5d13':
  Framework/base: Added synchronization block to avoid race condition

11 years agoMerge "Avoid IllegalArgumentException in Preference.java compareTo()"
Dianne Hackborn [Sun, 26 May 2013 06:59:29 +0000 (06:59 +0000)]
Merge "Avoid IllegalArgumentException in Preference.java compareTo()"

11 years agoMerge "Fix CalendarView to show the month title properly."
Dianne Hackborn [Sun, 26 May 2013 06:58:14 +0000 (06:58 +0000)]
Merge "Fix CalendarView to show the month title properly."

11 years agoMerge "Don't include flags in configuration change if their value hasn't changed."
Dianne Hackborn [Sun, 26 May 2013 06:57:04 +0000 (06:57 +0000)]
Merge "Don't include flags in configuration change if their value hasn't changed."

11 years agoMerge "Fix documentation of requestCode parameter."
Dianne Hackborn [Sun, 26 May 2013 06:56:03 +0000 (06:56 +0000)]
Merge "Fix documentation of requestCode parameter."

11 years agoMerge "Framework/base: Added synchronization block to avoid race condition"
Dianne Hackborn [Sun, 26 May 2013 06:30:26 +0000 (06:30 +0000)]
Merge "Framework/base: Added synchronization block to avoid race condition"

11 years agoam b830d527: Merge "Update test with CamercorderProfile video size." into jb-mr2-dev
Yu Shan Emily Lau [Sat, 25 May 2013 01:53:47 +0000 (18:53 -0700)]
am b830d527: Merge "Update test with CamercorderProfile video size." into jb-mr2-dev

* commit 'b830d527deb75a36aa78367026d6631a9b4e1126':
  Update test with CamercorderProfile video size.

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 agoam 4a47f17a: Merge "add links to orientation flags in attribute docs to help determin...
Scott Main [Sat, 25 May 2013 01:18:33 +0000 (18:18 -0700)]
am 4a47f17a: 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

* commit '4a47f17a9db8fd2b8b17ad10a629216cc3c6333c':
  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

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 agoam 529a9e39: Merge "TransitionDrawable should not become a LayerDrawable Bug #9057757...
Romain Guy [Sat, 25 May 2013 00:40:40 +0000 (17:40 -0700)]
am 529a9e39: Merge "TransitionDrawable should not become a LayerDrawable Bug #9057757" into jb-mr2-dev

* commit '529a9e391e386aac37ea722d2517d376968b3d31':
  TransitionDrawable should not become a LayerDrawable Bug #9057757

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 agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Fri, 24 May 2013 22:28:19 +0000 (15:28 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: I0f933138aaf9f70694ef9a326c3db63770a93917

11 years agoam eebec7b1: Merge "fix javadoc links. turns out, without parameters, javadoc will...
Scott Main [Fri, 24 May 2013 21:42:58 +0000 (14:42 -0700)]
am eebec7b1: 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

* commit 'eebec7b1fe68cef9c4feed1f56af2592b402a629':
  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()

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 agoam 14ccf554: Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb...
Alan Viverette [Fri, 24 May 2013 21:21:55 +0000 (14:21 -0700)]
am 14ccf554: Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-dev

* commit '14ccf554d0168d94c35c058b057d7d1aca228c6e':
  DO NOT MERGE. Fix number picker accessibility focus.

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 agoam bf0d561c: Merge "Pipe through bounding box information (DO NOT MERGE)" into jb...
Michael Wright [Fri, 24 May 2013 20:53:47 +0000 (13:53 -0700)]
am bf0d561c: Merge "Pipe through bounding box information (DO NOT MERGE)" into jb-mr2-dev

* commit 'bf0d561c73abd97a1a3794e9aa62b21911279a12':
  Pipe through bounding box information (DO NOT MERGE)

11 years agoam 417e512b: Merge "Add missing native methods." into jb-mr2-dev
Deepanshu Gupta [Fri, 24 May 2013 20:53:44 +0000 (13:53 -0700)]
am 417e512b: Merge "Add missing native methods." into jb-mr2-dev

* commit '417e512ba1d099583c41bd7595f2124ca77c2aee':
  Add missing native methods.

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 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 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 agoam 46fa10b1: am 1d8c5b5b: Merge "Update tethering profile for specific operators"
Robert Greenwalt [Fri, 24 May 2013 18:03:45 +0000 (11:03 -0700)]
am 46fa10b1: am 1d8c5b5b: Merge "Update tethering profile for specific operators"

* commit '46fa10b1a0a67e1937c9e696d1fd786162dcfb8e':
  Update tethering profile for specific operators

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 agoam 1d8c5b5b: Merge "Update tethering profile for specific operators"
Robert Greenwalt [Fri, 24 May 2013 18:01:28 +0000 (11:01 -0700)]
am 1d8c5b5b: Merge "Update tethering profile for specific operators"

* commit '1d8c5b5b1df96004d6c6e0d056f0c3707461a01a':
  Update tethering profile for specific operators

11 years agoMerge "Update tethering profile for specific operators"
Robert Greenwalt [Fri, 24 May 2013 17:59:02 +0000 (17:59 +0000)]
Merge "Update tethering profile for specific operators"

11 years agoUpdate tethering profile for specific operators
seonju.oh [Fri, 24 May 2013 06:46:34 +0000 (15:46 +0900)]
Update tethering profile for specific operators

Update or add tethering profiles in config.xml.
And also add MOBILE_DUN to config_tether_upstream_types

FR-ORG,SFR
ES-VDF,ORG,Movistar
IT-VDF,TIM
GR-VDF
US-TMO
CA-Rogers,Fido
Isreal-ORG,PC HOT Mobile
HK-CSL,Hutchison
AU-Telstra

Change-Id: Ic3501263679785362bc50a5a4ea3751e7f0c7b21
Signed-off-by: Seonju Oh <seonju.oh@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
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 agoam 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev
Robert Greenwalt [Fri, 24 May 2013 16:24:32 +0000 (09:24 -0700)]
am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev

* commit '36a151abcd794524358a74599a1f4ab130ca7b55':
  Use the old interface when resetting connections

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 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 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 62f47bc2: am 22689bc5: am a8b2186b: am a502c59e: docs: Add FileProvider to Support...
Joe Fernandez [Thu, 23 May 2013 21:08:51 +0000 (14:08 -0700)]
am 62f47bc2: am 22689bc5: am a8b2186b: am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes

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

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 2f48c4a7: Merge "Check for invalid pointer index in PagedView" into jb-mr2-dev
Jim Miller [Thu, 23 May 2013 21:05:21 +0000 (14:05 -0700)]
am 2f48c4a7: Merge "Check for invalid pointer index in PagedView" into jb-mr2-dev

* commit '2f48c4a754ce40a0854791c1f4ddf61458fffafc':
  Check for invalid pointer index in PagedView

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 agoam 55bf965e: Merge "Compare binder instances when checking if listeners match." into...
Andrew Wilson [Thu, 23 May 2013 20:08:04 +0000 (13:08 -0700)]
am 55bf965e: Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev

* commit '55bf965e89df5986a7a988c2b1ec2cd9f01edb56':
  Compare binder instances when checking if listeners match.

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 agoam cfbbc864: Merge "Restore previous alpha value on noop\'d DisplayList operations...
Chet Haase [Thu, 23 May 2013 18:25:34 +0000 (11:25 -0700)]
am cfbbc864: Merge "Restore previous alpha value on noop\'d DisplayList operations" into jb-mr2-dev

* commit 'cfbbc864da1b7a9ed64807f9072c5730c421b4ef':
  Restore previous alpha value on noop'd DisplayList operations