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

91858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victoria Lease
1b414c7e8c am 07fcfef2: am 1e701979: Merge "fix NLP for COARSE applications, build FLP with SDK" into jb-mr1-dev 
* commit '07fcfef27d0cc64a12a1a04879456c8a155e2993':
  fix NLP for COARSE applications, build FLP with SDK
 2012-11-01 15:12:40 -07:00
Victoria Lease
07fcfef27d am 1e701979: Merge "fix NLP for COARSE applications, build FLP with SDK" into jb-mr1-dev 
* commit '1e701979a031f42ee0fa0a07b151f6c61314e2e4':
  fix NLP for COARSE applications, build FLP with SDK
 2012-11-01 15:10:47 -07:00
Victoria Lease
1e701979a0 Merge "fix NLP for COARSE applications, build FLP with SDK" into jb-mr1-dev 2012-11-01 15:07:56 -07:00
Svetoslav Ganov
49c2756b1c am b3ec0639: am 7e1a45d8: Merge "Fix accessibility API injection." into jb-mr1-dev 
* commit 'b3ec0639a942792517bff62498b58bce4bd5dc91':
  Fix accessibility API injection.
 2012-11-01 14:55:26 -07:00
Svetoslav Ganov
b3ec0639a9 am 7e1a45d8: Merge "Fix accessibility API injection." into jb-mr1-dev 
* commit '7e1a45d8af9d02fc552d65f2abcaefe3096b2c9c':
  Fix accessibility API injection.
 2012-11-01 14:52:28 -07:00
Svetoslav Ganov
7e1a45d8af Merge "Fix accessibility API injection." into jb-mr1-dev 2012-11-01 14:49:20 -07:00
Chris Craik
7f92d516a9 am 7494f0c0: am a84c9639: Merge "Avoid tesselation path when useCenter is set" into jb-mr1-dev 
* commit '7494f0c04b1abd010207ee5c7e8c9aff6d69c956':
  Avoid tesselation path when useCenter is set
 2012-11-01 14:40:04 -07:00
Chris Craik
7494f0c04b am a84c9639: Merge "Avoid tesselation path when useCenter is set" into jb-mr1-dev 
* commit 'a84c963936bf23ac4aaec3b17cd70ce50906b24a':
  Avoid tesselation path when useCenter is set
 2012-11-01 14:37:07 -07:00
Chris Craik
a84c963936 Merge "Avoid tesselation path when useCenter is set" into jb-mr1-dev 2012-11-01 14:33:58 -07:00
Robert Ly
72789bdcff am 1fcc8f48: am f9e7b618: am 93a9a0a2: am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs 
* commit '1fcc8f486d02f354361e877f13061be622d218e2':
  docs: google market -> google play
 2012-11-01 14:28:25 -07:00
Robert Ly
1fcc8f486d am f9e7b618: am 93a9a0a2: am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs 
* commit 'f9e7b61867316057f80a92804da0b5800bd4c01a':
  docs: google market -> google play
 2012-11-01 14:26:19 -07:00
alanv
992ceefbcf Fix accessibility API injection. 
Also adds a heartbeat check so that if something does go wrong while adding
the JavaScript APIs, we don't attempt to use the JavaScript-based screen
reader.

Bug: 7450237
Change-Id: Ifbce77cf93115f658386c520b8226941607b2afe
 2012-11-01 14:25:50 -07:00
Robert Ly
f9e7b61867 am 93a9a0a2: am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs 
* commit '93a9a0a2bc2173d942f2c37d0751a9e4df8ecb24':
  docs: google market -> google play
 2012-11-01 14:23:30 -07:00
Robert Ly
93a9a0a2bc am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs 
* commit '0fc15da00597c5a017c1d8eed8f34064c702e4c2':
  docs: google market -> google play
 2012-11-01 14:19:18 -07:00
Robert Ly
0fc15da005 am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs 
* commit '677c1e14fbd991a46b5496d0873b7ca155fd71fb':
  docs: google market -> google play
 2012-11-01 14:16:47 -07:00
Robert Ly
677c1e14fb Merge "docs: google market -> google play" into jb-dev-docs 2012-11-01 14:14:26 -07:00
Joe Malin
53ed134cda am 48464f15: am 1f177cb8: am e639d67a: am d2e16346: am ac294abb: Revision to Notifications API guide 
* commit '48464f15f9f4ea77aa19a521635afbd8376b9098':
  Revision to Notifications API guide
 2012-11-01 14:08:52 -07:00
Joe Malin
48464f15f9 am 1f177cb8: am e639d67a: am d2e16346: am ac294abb: Revision to Notifications API guide 
* commit '1f177cb87a87b26fe302298f96197766ebddaf96':
  Revision to Notifications API guide
 2012-11-01 14:06:12 -07:00
Joe Malin
1f177cb87a am e639d67a: am d2e16346: am ac294abb: Revision to Notifications API guide 
* commit 'e639d67aeb0e2758f2480c25e8ab007918701ed3':
  Revision to Notifications API guide
 2012-11-01 14:00:54 -07:00
Joe Malin
e639d67aeb am d2e16346: am ac294abb: Revision to Notifications API guide 
* commit 'd2e163461ee8aa79d4560f38e924a7edc44ad4dd':
  Revision to Notifications API guide
 2012-11-01 13:58:02 -07:00
Victoria Lease
779b77455f fix NLP for COARSE applications, build FLP with SDK 
In this commit, we provide a means for unbundled location providers
to attach an EXTRA_NO_GPS_LOCATION to the Locations that they report.

We also build FusedLocation against the SDK rather than the internal
tree.

Used in conjunction with I394ded497b8de40d1f85618bff282553cdf378cb
to fix NLP for applications with only ACCESS_COARSE_LOCATION
permission.

Bug: 7453355
Change-Id: Ie696f7abff9ef5237740ab87fe9f537a1c812c54
 2012-11-01 13:55:36 -07:00
Joe Malin
d2e163461e am ac294abb: Revision to Notifications API guide 
* commit 'ac294abb40483fc734e22833371d95cbb161ec87':
  Revision to Notifications API guide
 2012-11-01 13:55:08 -07:00
Joe Malin
ac294abb40 Revision to Notifications API guide 
Change-Id: I52229dfdff3649e03a1fbce91234c8b2a544502a
 2012-11-01 12:57:58 -07:00
Zhihai Xu
eddc88fbe5 am 9ae23b7d: am 0de49148: Merge "Fix for BluetoothAdapter.getAddress() when BT is off on some devices" into jb-mr1-dev 
* commit '9ae23b7d2215de2737fb3752ad9af19bbe07388c':
  Fix for BluetoothAdapter.getAddress() when BT is off on some devices
 2012-11-01 12:47:49 -07:00
Zhihai Xu
9ae23b7d22 am 0de49148: Merge "Fix for BluetoothAdapter.getAddress() when BT is off on some devices" into jb-mr1-dev 
* commit '0de49148f07c7f0b3b45cec0ef502db4b9163711':
  Fix for BluetoothAdapter.getAddress() when BT is off on some devices
 2012-11-01 12:45:01 -07:00
Zhihai Xu
0de49148f0 Merge "Fix for BluetoothAdapter.getAddress() when BT is off on some devices" into jb-mr1-dev 2012-11-01 12:43:28 -07:00
Scott Main
18ab55402f am df55c297: am 56a3ce03: Merge "docs: update description for location permissions bug: 6996667" into jb-mr1-dev 
* commit 'df55c2979edbc8a91a24cc1c3967300937b37645':
  docs: update description for location permissions bug: 6996667
 2012-11-01 11:56:13 -07:00
Scott Main
df55c2979e am 56a3ce03: Merge "docs: update description for location permissions bug: 6996667" into jb-mr1-dev 
* commit '56a3ce038eb03a527b475779d7abf694da1879bc':
  docs: update description for location permissions bug: 6996667
 2012-11-01 11:54:15 -07:00
Scott Main
56a3ce038e Merge "docs: update description for location permissions bug: 6996667" into jb-mr1-dev 2012-11-01 11:47:44 -07:00
Romain Guy
aabe4bb477 am 9c0010f8: am 998d03bd: Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev 
* commit '9c0010f856d623845b20a7dd13c024023626623c':
  A new clock widget to create lock screen appwidgets
 2012-11-01 11:28:13 -07:00
Chris Craik
7fae5216d2 Avoid tesselation path when useCenter is set 
bug:7458300

The tesselation path doesn't handle sharp joins.

Change-Id: I28bf03f3b72fc584a205daa40934dda17031098f
 2012-11-01 11:27:03 -07:00
Romain Guy
9c0010f856 am 998d03bd: Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev 
* commit '998d03bd943053741bab17a8ef0abb355f6bc3ae':
  A new clock widget to create lock screen appwidgets
 2012-11-01 11:26:10 -07:00
Romain Guy
998d03bd94 Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev 2012-11-01 11:23:17 -07:00
Scott Main
277b352d9f docs: update description for location permissions 
bug: 6996667

Change-Id: I3b5d706d98b56386a88b33a343721ff7432063b9
 2012-11-01 10:55:02 -07:00
Scott Main
9e413a3e78 am 985e9b8d: am 8761e143: docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing 
* commit '985e9b8d49ea613d902368bb4a4777ed269802a3':
  docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing
 2012-11-01 10:04:51 -07:00
Scott Main
985e9b8d49 am 8761e143: docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing 
* commit '8761e143c987fc48d854818988cde44700c9f602':
  docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing
 2012-11-01 09:58:40 -07:00
Scott Main
8761e143c9 docs: Clarify the callback mechanisms for LocationRequest 
and clarify horizontal geofencing

Change-Id: I8ff264d7a12c8ec3c79854e008aeeb5f922ad459
 2012-11-01 09:54:15 -07:00
The Android Open Source Project
dddeb53fd6 Reconcile with jb-mr1-release - do not merge 
Change-Id: I412cbce1e453fb33c6706c8b194957e6b36eff58
 2012-11-01 07:52:02 -07:00
Zhihai Xu
d31c32217c Fix for BluetoothAdapter.getAddress() when BT is off on some devices 
There are two problem, 1.If we have wrong bluetooth address in
global settings db, we never will update it 2. We need enable bluetooth
to get the bluetooth address for some devices. For 1, we fix it by add
a valid flag in global setting db, this flag will be set when we stored
correct address and name to db. We only load the name and address from
global setting db when this valid flag is set during power up.
For2. we will read BT address after bluetooth is at ON state.
bug 7440409

Change-Id: Ic4740b3f0b2fcd214c7ca8393f7331c140eec66d
 2012-11-01 02:19:08 -07:00
Xia Wang
33185d4f68 am f1e32af5: am c86e8dff: Merge "Fix WiFi stress test" into jb-mr1-dev 
* commit 'f1e32af5ae629a1a0f73ee12aa6390ea9e527d32':
  Fix WiFi stress test
 2012-10-31 21:23:31 -07:00
Xia Wang
f1e32af5ae am c86e8dff: Merge "Fix WiFi stress test" into jb-mr1-dev 
* commit 'c86e8dffd04804f7f975c80325bc3ae70e7e972a':
  Fix WiFi stress test
 2012-10-31 21:20:38 -07:00
Xia Wang
c86e8dffd0 Merge "Fix WiFi stress test" into jb-mr1-dev 2012-10-31 21:18:36 -07:00
Michael Jurka
345c0fa06c am 40d90211: am c8dc8eb3: Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev 
* commit '40d90211fe038219ef6595a8d56e5d9b390e2f89':
  Use new keyguard appwidget picker
 2012-10-31 20:35:57 -07:00
Adam Powell
65d33bacd7 am 302b6819: am 077105ba: Merge "Fix some drag behavior bugs in keyguard" into jb-mr1-lockscreen-dev 
* commit '302b6819cdedefff5d7ec74133bf73a461eab99f':
  Fix some drag behavior bugs in keyguard
 2012-10-31 20:35:53 -07:00
Chet Haase
c854c1019d am 437e1a9c: am 4f721f10: am fe28ff0d: Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev 
* commit '437e1a9c5bbb7929e5379813888edee489c09e70':
 2012-10-31 20:35:50 -07:00
Jeff Brown
ae8de95cf2 am ba16031a: am 409c89c3: am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev 
* commit 'ba16031aa15713ea2ed979d40be02b7ca99d4990':
 2012-10-31 20:35:46 -07:00
Raph Levien
65a33ecd50 am 19d7cc38: am 688d0381: am c01d1045: Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev 
* commit '19d7cc3814c59fcedb7d181c3fb17b3e8bb4ed00':
 2012-10-31 20:35:42 -07:00
Baligh Uddin
011ab04ec2 am 28ce2ed9: am 4bce83ee: am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev 
* commit '28ce2ed9ba8148626cecfec5b6501847f5c1e3e0':
 2012-10-31 20:35:39 -07:00
Baligh Uddin
11b7ec201d am 7960244c: am 13d02d04: am 83e9187d: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 
* commit '7960244c499049e231043e760452f32070ae8493':
 2012-10-31 20:35:36 -07:00
Baligh Uddin
277f8639b9 am 7a767180: am 47f52d75: am a68aa4e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7a7671807c9d0ffafb4a70335d9adfc81b723ed6':
 2012-10-31 20:35:31 -07:00