drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,397 Commits 1 Branch 0 Tags
Commit Graph

41672 Commits

Author SHA1 Message Date
Matthew Xie
703ea1862e am 0fdb05a7: am b190890a: Merge "Update javadoc to give app write better guidence" into jb-mr2-dev 
* commit '0fdb05a770ce3ea0bd7f6ee9bae2283a38284607':
  Update javadoc to give app write better guidence
 2013-05-30 15:16:00 -07:00
Dmitry Shmidt
e659f12f0f Merge "wifi: Match function prototype from libhardware_legacy" 2013-05-30 20:00:51 +00:00
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
Amith Yamasani
306fd7fa9e Merge "UX compliance for error messages" 2013-05-30 18:19:04 +00:00
Amith Yamasani
5a3915b06b UX compliance for error messages 
Bug: 9122154
Change-Id: I4a64750f11845a230321450bc6a2955cb73e3b6d
 2013-05-30 10:37:38 -07:00
Derek Sollenberger
c648ed7303 Merge "Modifications needed for updating Skia to r9286." 2013-05-30 12:06:47 +00:00
Adam Powell
087d2b2df7 Merge "Optimizations for ResolverActivity" 2013-05-30 01:43:32 +00:00
Adam Powell
0256c6f8d3 Optimizations for ResolverActivity 
Load app icons using AsyncTask instead of during list item binding.

Make sorting resolved components by display name case insensitive.

Change-Id: I8e69781ed021035b9f0dac349791b3d8a674cf60
 2013-05-29 18:14:08 -07:00
Dmitry Shmidt
ffa0242dd4 wifi: Match function prototype from libhardware_legacy 
Change-Id: Ibfffd347e22f71753b085d16f185407308b9be36
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-05-29 18:10:06 -07:00
Romain Guy
c4ea109ba2 Merge "Disable the AssetAtlas when running under valgrind Bug #9191438" 2013-05-29 23:02:19 +00:00
Romain Guy
80b12fcaae Disable the AssetAtlas when running under valgrind 
Bug #9191438

When running under valgrind, the ppid will be different from the ppid
of the system server (which always gets forked from zygote.)

Change-Id: I42cbf99fd0084aeab76c30de9beb7c49ed1fc7d8
 2013-05-29 16:01:36 -07:00
Dirk Dougherty
8f114bb2ae am 2bf15756: 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 '2bf15756cc416644a4777d76a94947bee75d8b3b':
  Doc change: adjust description of NEW_OUTGOING_CALL.
 2013-05-29 15:25:32 -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
Svetoslav
6196cfdb52 Merge "Remove Auto-rotate screen setting if a required feature is missing." 2013-05-29 22:08:56 +00:00
John Spurlock
50ef7ab70a Docfix: remove confusing "disabled" link label. 
Change-Id: I1acb9c8c20b6cda0e6cfb2fc1e450f37e7cd4eeb
 2013-05-29 17:43:16 -04:00
John Spurlock
0ffefdf9fc Docfix: remove confusing "disabled" link label. 
Change-Id: I96ebc44fe69de60e187f200b5e9d0b5adc478c17
 2013-05-29 17:34:53 -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
16a90db8d7 am 897d98a7: am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev 
* commit '897d98a7530109bff8d73b3651d8884c76f54c42':
  Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
 2013-05-28 22:30:10 -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
Baligh Uddin
e3425ac426 am af1e512e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'af1e512e3f2b52e563e37c1635cbea06e87e0592':
  Import translations. DO NOT MERGE
 2013-05-28 20:44:52 -07:00
Baligh Uddin
b3db126dd4 Merge "Import translations. DO NOT MERGE" 2013-05-29 03:43:49 +00:00
Baligh Uddin
af1e512e3f Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-29 03:42:23 +00:00
Dirk Dougherty
367ce906c8 Doc change: adjust description of NEW_OUTGOING_CALL. 
Change-Id: If2bcfa7410759e08958029578a9b3d0a60a1de4e
 2013-05-28 17:59:38 -07:00
Dianne Hackborn
21d9b56692 Add more details about why a force stop is happening. 
Change-Id: Ia938cf6fc37ad22fc7447dc538968c7bd234be7d
 2013-05-28 17:46:59 -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
19c618dbce am c8a77735: am dea6e86d: am 3422ceb6: Merge "Bug fix for building the hover target list" 
* commit 'c8a777356267803be3e235b2fdaf807166fb46eb':
  Bug fix for building the hover target list
 2013-05-28 15:52:22 -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 d21f674c150aa26c8094d1418108649f53f810e6
bug 9109238
Change-Id: Ie1fc3d7420e6c401d3db29499d8846e6b70a61bb
 2013-05-28 15:28:24 -07:00
John Spurlock
883ffa243d Merge "Hideybars feature confirmation toast bar." 2013-05-28 22:23:17 +00:00
Chris Craik
1728bebe9a Merge "Support larger bitmaps in BitmapFactory.Options.inBitmap" 2013-05-28 21:31:54 +00:00
Jeff Brown
be16567567 am dcb8d876: am 79df1e65: am e2a281ca: Merge "Add additional Method that check whether a table is empty or not" 
* commit 'dcb8d876581f9bf77e51c5539ef68993870264d8':
  Add additional Method that check whether a table is empty or not
 2013-05-28 13:51:01 -07:00
Chris Craik
9f58361e98 Support larger bitmaps in BitmapFactory.Options.inBitmap 
bug:8121994

Adds a new distiction between bitmap size and the allocation
(pixel ref/buffer) used to store its data.

BitmapFactory.inBitmap will allow a bitmap to be reinitialized with
new data if the bitmap being decoded is (after sampleSize) equal or
smaller.

Change-Id: I747750a735c858882df3af74fca6cdc46f2a9f81
 2013-05-28 13:50:33 -07:00
Matthew Xie
67cc127186 am e7e6bf9f: am 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev 
* commit 'e7e6bf9f02a0a74f0a8d3812d2a3a3f3ec855086':
  Revert "Change GATT_FAILURE from 0 to 0x101"
 2013-05-28 13:50:13 -07:00
Matthew Xie
d78afea78d am 84e1afcc: am 413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev 
* commit '84e1afcccc328e7a52bfde16e824a3ed37889d1d':
  Change GATT_FAILURE from 0 to 0x101
 2013-05-28 13:50:09 -07:00
Dianne Hackborn
aa508bc6db am 23b07d55: am 43861f9d: am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()" 
* commit '23b07d5549bf38cfea388b439ac519670be6e7e2':
  Avoid IllegalArgumentException in Preference.java compareTo()
 2013-05-28 13:50:02 -07:00
Dianne Hackborn
bbf6ecc981 am 4e73e8a8: am 95b79966: am 0a40bef9: Merge "Fix CalendarView to show the month title properly." 
* commit '4e73e8a817ff99a19ba9ed6fa68754007731406d':
  Fix CalendarView to show the month title properly.
 2013-05-28 13:49:59 -07:00
Dianne Hackborn
f8b8521598 am 89eed125: am c7322005: am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed." 
* commit '89eed125590c6286fa64e9074e95196c8cc4bd27':
  Don't include flags in configuration change if their value hasn't changed.
 2013-05-28 13:49:56 -07:00
Dianne Hackborn
56798adf41 am 959b9b39: am fc09b326: am fee6d0cb: Merge "Fix documentation of requestCode parameter." 
* commit '959b9b39b4e488b643919fb7a58f2fbbdd70e573':
  Fix documentation of requestCode parameter.
 2013-05-28 13:49:53 -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