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

94936 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marco Nelissen
f8fae855b5 Merge "Fix typo" 2012-11-01 13:57:27 -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
Marco Nelissen
a4256d1d7b Fix typo 
Change-Id: I8c3797fb2d343ec6f25765fba49ac097e816d1cf
 2012-11-01 13:55:28 -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
Adam Powell
1dd84d5f2f Merge "Keyguard sliding challenge - fix overeager touch interception" into jb-mr1-lockscreen-dev 2012-11-01 13:51:52 -07:00
Adam Powell
c238af5112 Keyguard sliding challenge - fix overeager touch interception 
Bug 7458287

Change-Id: I31f196539eecab1df5835e8ac1a76d9732a332fe
 2012-11-01 13:47:02 -07:00
Danielle Millett
998a504ca9 Merge "Showing message when max attempts are hit in face unlock fixes b/7306168" into jb-mr1-lockscreen-dev 2012-11-01 13:45:28 -07:00
Brian Colonna
d4a3e5d711 Only suppressing FUL on boot if selected fixes b/7338965 
FUL is suppressed when first booted and unsuppressed when the user
leaves keyguard (by logging in or turning the screen off).  However,
if the user managed to enter the phone without going through
keyguard (security set to none, or initial device setup), FUL was
not being unsuppressed and it would not show up the first time the
user tried to use it.

This fix only suppresses FUL on first boot if it is the selected
security method.  Therefore, it is not suppressed the first time it
is used after setting it up.

Change-Id: I766bbce31ce3939de97661623fe3b8d3fa29c20d
 2012-11-01 16:20:24 -04:00
Daniel Sandler
16d9092314 Show "wrong password" on password screen, not "wrong PIN" 
Bug: 7452916
Change-Id: Ib31335837834dbf47bd55230a526151a502d9467
 2012-11-01 16:19:14 -04:00
Daniel Sandler
6a64ac56b7 Restore incorrect-PIN lockouts. 
Bug: 7433439
Change-Id: I0262172db7c150aa9e73b932cc43a691f3ef9444
 2012-11-01 16:19:13 -04:00
Joe Malin
ac294abb40 Revision to Notifications API guide 
Change-Id: I52229dfdff3649e03a1fbce91234c8b2a544502a
 2012-11-01 12:57:58 -07:00
Zhihai Xu
86bde7b482 am eddc88fb: am 9ae23b7d: am 0de49148: Merge "Fix for BluetoothAdapter.getAddress() when BT is off on some devices" into jb-mr1-dev 
* commit 'eddc88fbe59c6d26f833d0f37b13a475325ef4fa':
  Fix for BluetoothAdapter.getAddress() when BT is off on some devices
 2012-11-01 12:50:47 -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
09452829e6 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:31 -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
Svetoslav Ganov
8f7e1be4b1 Merge "Addressing comments in 74bdd21629681528dbe7f3ea363d99c8514e026b." into jb-mr1-lockscreen-dev 2012-11-01 12:30:39 -07:00
Svetoslav Ganov
0f87a72d59 Addressing comments in 74bdd21629681528dbe7f3ea363d99c8514e026b. 
Change-Id: I807733dabc18bc8894c777d19c4d0e3ca809476c
 2012-11-01 12:14:53 -07:00
Danielle Millett
1625e87e60 Showing message when max attempts are hit in face unlock fixes b/7306168 
Added a check in pattern and PIN to showed the face unlock max attempts
failure message if that had been reached.  The max attempts can only
be true if face unlock is enabled so it doesn't need to also check if it's
enabled.

Change-Id: If8a26498961d79fa6a647abc923c72f0af407e61
 2012-11-01 15:00:12 -04:00
Scott Main
14a4702739 am 18ab5540: am df55c297: am 56a3ce03: Merge "docs: update description for location permissions bug: 6996667" into jb-mr1-dev 
* commit '18ab55402f437f56930f64e813c4c2ae74fa5860':
  docs: update description for location permissions bug: 6996667
 2012-11-01 11:59:32 -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
1e44e96e22 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:51:26 -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
331b552734 am aabe4bb4: am 9c0010f8: am 998d03bd: Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev 
* commit 'aabe4bb4776c21592db7e0714b3fec960b6778c7':
  A new clock widget to create lock screen appwidgets
 2012-11-01 11:45:40 -07:00
Adam Cohen
9767597a74 Merge "Stripping dead API related to keyguard widgets" into jb-mr1-lockscreen-dev 2012-11-01 11:31:35 -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
Adam Powell
757d0d88ef Merge "Keyguard tablet/portrait fix for HUGE security views" into jb-mr1-lockscreen-dev 2012-11-01 11:26:34 -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
40daf33c02 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:25:49 -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
Adam Powell
5ee6ba6158 Keyguard tablet/portrait fix for HUGE security views 
Integrate from proto app

Bug 7453420

Change-Id: I3dca6e4d96c319c17ee52e13616c15db085b1c97
 2012-11-01 11:22:55 -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
22d17c984a docs: misc changes for new manifest attributes, 
including fix for bug 7443821
bug 7442263

Change-Id: I20b712bf2b0379c70ff28682025d6f30817a6c36
 2012-11-01 10:39:41 -07:00
Scott Main
b27e95778a am 9e413a3e: am 985e9b8d: am 8761e143: docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing 
* commit '9e413a3e78b2e65f4e4e4f230f086775a7512296':
  docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing
 2012-11-01 10:06:52 -07:00
John Spurlock
22ad682ad7 Merge "Cancel camera launch on screen off." into jb-mr1-lockscreen-dev 2012-11-01 10:05:40 -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
John Spurlock
dbe24b7def Cancel camera launch on screen off. 
Bug: 7452793
Change-Id: Ic043a0076154d2ce4dcb0b26bae3958c35a6cd67
 2012-11-01 13:01:05 -04:00
Scott Main
89c359c8ee 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:58 -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
Daniel Sandler
62e9c05774 Merge "Show the keyboard less aggressively." into jb-mr1-lockscreen-dev 2012-11-01 09:56:17 -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
f63ee450b4 am dddeb53f: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'dddeb53fd61c76b4e2f694f77c67ce821feef74f':
 2012-11-01 07:54:51 -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
John Spurlock
6e36f1019c Fix launcher flash during secure camera transition. 
Bug:7452928
Change-Id: I8b7d9bdb14addefb9e9ed71a45d438418b3e21dd
 2012-11-01 09:15:53 -04: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
Danielle Millett
080471e410 Merge "Updating isShowing during onResume()" into jb-mr1-lockscreen-dev 2012-10-31 21:44:05 -07:00
Xia Wang
e6f2f6cffd am 33185d4f: am f1e32af5: am c86e8dff: Merge "Fix WiFi stress test" into jb-mr1-dev 
* commit '33185d4f68b533e1289d1dcc1d88e43fe8462450':
  Fix WiFi stress test
 2012-10-31 21:26:11 -07:00