Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,479 Commits 3 Branches 0 Tags
0fdb05a770ce3ea0bd7f6ee9bae2283a38284607
Commit Graph

31893 Commits

Author SHA1 Message Date
Matthew Xie
0fdb05a770 am b190890a: Merge "Update javadoc to give app write better guidence" into jb-mr2-dev 
* commit 'b190890a94dc2f0bd11da09f59550f86197f010a':
  Update javadoc to give app write better guidence
 2013-05-30 11:50:02 -07:00
Matthew Xie
b190890a94 Merge "Update javadoc to give app write better guidence" into jb-mr2-dev 2013-05-30 18:45:42 +00:00
Matthew Xie
b30f91e38c Update javadoc to give app write better guidence 
Update javadoc of close methods of GATT cliet and server
Update javadoc of BluetoothAdapter
bug 8963528

Change-Id: I45ec618fd495225ed11a6171f33bfdc218397d4c
 2013-05-30 11:42:26 -07:00
John Spurlock
c00930f4fe am 50ef7ab7: Docfix: remove confusing "disabled" link label. 
* commit '50ef7ab70ad02deb9ad3694fb894741d6007564a':
  Docfix: remove confusing "disabled" link label.
 2013-05-29 15:18:51 -07:00
Dirk Dougherty
2bf15756cc am 91ea7882: am f64588a2: am de8ac602: am 963e3ec5: am 71d1af4a: am a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '91ea7882cdba6bef7918fcd4ff645a9693fdc861':
  Doc change: adjust description of NEW_OUTGOING_CALL.
 2013-05-29 15:18:45 -07:00
John Spurlock
50ef7ab70a Docfix: remove confusing "disabled" link label. 
Change-Id: I1acb9c8c20b6cda0e6cfb2fc1e450f37e7cd4eeb
 2013-05-29 17:43:16 -04:00
Dirk Dougherty
91ea7882cd am f64588a2: am de8ac602: am 963e3ec5: am 71d1af4a: am a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'f64588a2ce6a0e4e76d7d48c47f82785553b13f3':
  Doc change: adjust description of NEW_OUTGOING_CALL.
 2013-05-29 11:42:03 -07:00
Matthew Xie
897d98a753 am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev 
* commit '6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354':
  Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
 2013-05-28 22:27:44 -07:00
Matthew Xie
6ea0636a9c Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev 2013-05-29 05:25:47 +00:00
Dirk Dougherty
f64588a2ce am de8ac602: am 963e3ec5: am 71d1af4a: am a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'de8ac602e3d74dbcb87dfc4c1cc54fb0553e5f17':
  Doc change: adjust description of NEW_OUTGOING_CALL.
 2013-05-28 22:23:11 -07:00
Dirk Dougherty
de8ac602e3 am 963e3ec5: am 71d1af4a: am a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '963e3ec55f2ecbb132a627c8d0f6c19d83bc60b8':
  Doc change: adjust description of NEW_OUTGOING_CALL.
 2013-05-28 22:21:09 -07:00
Santos Cordon
57f0de1291 am d8754689: am c72949c6: am 7999c228: am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit 'd8754689595ab4b5e4e43a89178080d344374869':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-28 22:18:48 -07:00
Santos Cordon
d875468959 am c72949c6: am 7999c228: am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit 'c72949c6bc6f5654f09482309d9d3ac03aadd67d':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-28 22:16:51 -07:00
Dirk Dougherty
a284e2013a Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs 2013-05-29 05:16:01 +00:00
Dirk Dougherty
367ce906c8 Doc change: adjust description of NEW_OUTGOING_CALL. 
Change-Id: If2bcfa7410759e08958029578a9b3d0a60a1de4e
 2013-05-28 17:59:38 -07:00
Santos Cordon
7fb15ce74b Update documentation of NEW_OUTGOING_CALL 
Adds call-handling as a use case for NEW_OUTGOING_CALL

Change-Id: Ie511438bd8d9aa245881f050d32221c81e898745
 2013-05-28 16:00:11 -07:00
Jeff Brown
c8a7773562 am dea6e86d: am 3422ceb6: Merge "Bug fix for building the hover target list" 
* commit 'dea6e86dce716b67fe92c9b281fe9e79256f3b78':
  Bug fix for building the hover target list
 2013-05-28 15:49:13 -07:00
Jeff Brown
dea6e86dce am 3422ceb6: Merge "Bug fix for building the hover target list" 
* commit '3422ceb6ba453c28ac39dfce34534e0346394a3a':
  Bug fix for building the hover target list
 2013-05-28 15:46:00 -07:00
Matthew Xie
90ca807f7b Revert "Revert "Change GATT_FAILURE from 0 to 0x101"" 
This reverts commit d21f674c15
bug 9109238
Change-Id: Ie1fc3d7420e6c401d3db29499d8846e6b70a61bb
 2013-05-28 15:28:24 -07:00
Jeff Brown
3422ceb6ba Merge "Bug fix for building the hover target list" 2013-05-28 20:04:23 +00:00
Jeff Brown
dcb8d87658 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
 2013-05-28 13:00:28 -07:00
Jeff Brown
79df1e6545 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
 2013-05-28 12:57:59 -07:00
Jeff Brown
e2a281ca85 Merge "Add additional Method that check whether a table is empty or not" 2013-05-28 19:55:26 +00:00
John Spurlock
be7a7e546f am ee352cca: Merge "Fix typo in View.java javadocs" into jb-mr2-dev 
* commit 'ee352cca1f3beb577dfdf1c18a08242e4f94d01b':
  Fix typo in View.java javadocs
 2013-05-28 09:36:19 -07:00
John Spurlock
44b1edd948 Fix typo in View.java javadocs 
Change-Id: I85b9b2bd30d1f9d38954c31f24a352930a230ced
 2013-05-28 11:40:58 -04:00
Matthew Xie
e7e6bf9f02 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"
 2013-05-26 14:40:14 -07:00
Matthew Xie
27e453617a Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev 2013-05-26 21:38:01 +00:00
Matthew Xie
d21f674c15 Revert "Change GATT_FAILURE from 0 to 0x101" 
This reverts commit 8310e6196f

Change-Id: I467f7cfc8626b0fc54509a89158cd2d84a0c10b8
 2013-05-26 21:03:16 +00:00
Matthew Xie
84e1afcccc am 413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev 
* commit '413f62930003d4ff20e29fd3bbfaf2d163a08ac1':
  Change GATT_FAILURE from 0 to 0x101
 2013-05-26 13:21:44 -07:00
Matthew Xie
413f629300 Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev 2013-05-26 20:19:06 +00:00
Dianne Hackborn
43861f9de9 am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()" 
* commit 'f46449abedcba2167fffa8ba8dc2f6d7a6d410b9':
  Avoid IllegalArgumentException in Preference.java compareTo()
 2013-05-26 00:02:46 -07:00
Dianne Hackborn
95b7996693 am 0a40bef9: Merge "Fix CalendarView to show the month title properly." 
* commit '0a40bef955c937189841b6f1695e8001311758fa':
  Fix CalendarView to show the month title properly.
 2013-05-26 00:02:41 -07:00
Dianne Hackborn
c73220050e 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.
 2013-05-26 00:02:37 -07:00
Dianne Hackborn
fc09b326da am fee6d0cb: Merge "Fix documentation of requestCode parameter." 
* commit 'fee6d0cb1e27b13f6ed91c1cdcb9d524bb967ea2':
  Fix documentation of requestCode parameter.
 2013-05-26 00:02:31 -07:00
Dianne Hackborn
f46449abed Merge "Avoid IllegalArgumentException in Preference.java compareTo()" 2013-05-26 06:59:30 +00:00
Dianne Hackborn
0a40bef955 Merge "Fix CalendarView to show the month title properly." 2013-05-26 06:58:14 +00:00
Dianne Hackborn
f9b41efe17 Merge "Don't include flags in configuration change if their value hasn't changed." 2013-05-26 06:57:05 +00:00
Dianne Hackborn
fee6d0cb1e Merge "Fix documentation of requestCode parameter." 2013-05-26 06:56:03 +00:00
Scott Main
c851638092 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()
 2013-05-24 14:42:58 -07:00
Scott Main
eebec7b1fe 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 2013-05-24 21:40:45 +00:00
Alan Viverette
4026a797bc 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.
 2013-05-24 14:21:55 -07:00
Alan Viverette
14ccf554d0 Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-dev 2013-05-24 21:19:55 +00:00
Michael Wright
4759c35e42 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)
 2013-05-24 13:53:47 -07:00
Alan Viverette
dbed27e5e4 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
 2013-05-24 10:03:24 -07:00
Matthew Xie
8310e6196f 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
 2013-05-23 17:39:35 -07:00
Michael Wright
5e025eb1dc Pipe through bounding box information (DO NOT MERGE) 
Bug: 9110236
Change-Id: I7aefe6589fbaf92e5c71a0ba5425623578bafe95
 2013-05-23 15:06:47 -07:00
Scott Main
2651032064 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
 2013-05-22 19:00:09 -07:00
Adam Koch
289b14f56c am d51fc576: 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 'd51fc5763d3ce7895e168ace65da4c253b16d57e':
  Doc change: fix minor typo in ContactsContract.RawContacts.
 2013-05-22 06:53:34 -07:00
Adam Koch
d51fc5763d 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.
 2013-05-22 06:52:00 -07:00
Adam Koch
3e4ea33f08 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.
 2013-05-22 06:49:43 -07:00