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

61952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Colonna
0fadbaa3d2 am 04169673: am 2ce6882b: Fixed problem where Face Unlock area was showing 
* commit '04169673b50dd9f16a6f53af089c702d66eb8009':
  Fixed problem where Face Unlock area was showing
 2011-10-13 20:06:12 -07:00
Brian Colonna
04169673b5 am 2ce6882b: Fixed problem where Face Unlock area was showing 
* commit '2ce6882bb498c93af114626daa79cfa4f3f4e366':
  Fixed problem where Face Unlock area was showing
 2011-10-13 20:03:55 -07:00
Brian Colonna
2ce6882bb4 Fixed problem where Face Unlock area was showing 
I introduced a bug cl https://android-git.corp.google.com/g/#/c/141926
that caused black box to hide lock pattern even when not using Face
Unlock.

Fixed by adding the corresponding check to make sure Face Unlock is
being used.

Change-Id: I9c429c99d7db4d1ab831080f23a1e10123dbfe3e
 2011-10-13 22:43:28 -04:00
John Grossman
55fcd0def0 Merge "AAH: Fix PID gain for HW clock recovery." into ics-aah 2011-10-13 19:17:35 -07:00
Brian Colonna
92ab14a60c am bc82c349: am 3505abf3: Merge "Fix 5451144: Poking wakelock upon fallback" into ics-mr0 
* commit 'bc82c349f1c3cd0c0340c61f876ed5af518b11f7':
  Fix 5451144: Poking wakelock upon fallback
 2011-10-13 18:24:01 -07:00
Brian Colonna
bc82c349f1 am 3505abf3: Merge "Fix 5451144: Poking wakelock upon fallback" into ics-mr0 
* commit '3505abf31df8dafab2c83ceb8f85b5694cac3b78':
  Fix 5451144: Poking wakelock upon fallback
 2011-10-13 18:21:50 -07:00
Brian Colonna
3505abf31d Merge "Fix 5451144: Poking wakelock upon fallback" into ics-mr0 2011-10-13 18:19:30 -07:00
Girts Folkmanis
68fbf32629 Merge "Disable output processing when opening serial port." into ics-aah 2011-10-13 17:46:56 -07:00
Wink Saville
325f308289 am d54bcad4: am 8a058cbf: Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0 
* commit 'd54bcad4bbb02eec47b26f6466bc01ff4e24f449':
  In releaseWifiLockLocked call noteReleaseWifiLock.
 2011-10-13 17:45:56 -07:00
Wink Saville
d54bcad4bb am 8a058cbf: Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0 
* commit '8a058cbf12c590db810fe8d9fab6f4f614909329':
  In releaseWifiLockLocked call noteReleaseWifiLock.
 2011-10-13 17:42:58 -07:00
Wink Saville
8a058cbf12 Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0 2011-10-13 17:40:01 -07:00
Girts Folkmanis
9c04f3a439 Disable output processing when opening serial port. 
If post processing is not disabled, we end up translating LF to CRLF, which
makes binary protocols sad.

Change-Id: I57d0fc74f5b92e23a0682336c2776428f39ff3d8
 2011-10-13 17:24:43 -07:00
Manuel Roman
f2608b71ad Merge changes I3a51e45a,I73b21022,I6a3984f9 into ics-aah 
* changes:
  Update aidl for new Broker API.
  aidl: All flattenable types now must also be parcelable.
  Update aidl to new APIs.
 2011-10-13 17:21:46 -07:00
Kenny Root
9b43d8e67c am bc883f4c: am 22dad40d: Merge "Add support for signature in getPackageArchiveInfo" into ics-mr0 
* commit 'bc883f4cf48ef1e0e533aba423d8ff3529010975':
  Add support for signature in getPackageArchiveInfo
 2011-10-13 17:14:12 -07:00
Kenny Root
bc883f4cf4 am 22dad40d: Merge "Add support for signature in getPackageArchiveInfo" into ics-mr0 
* commit '22dad40d3e8ce54a00f337ea06b9b0bbfbd3fd6b':
  Add support for signature in getPackageArchiveInfo
 2011-10-13 17:12:35 -07:00
Brian Colonna
9eeaaa39c3 Fix 5451144: Poking wakelock upon fallback 
Now poking the wakelock when Face Unlock goes to the fallback method.
Previously, the backup lock would stay up for a varying amount of
time depending on how long Face Unlock took before fallback.  The
backup is now consistently displayed for 5 seconds.

Also added comments to some older code.

Change-Id: I9f6bdd2d3015e7eb9cb90143737a3cdc87189993
 2011-10-13 20:11:57 -04:00
Kenny Root
22dad40d3e Merge "Add support for signature in getPackageArchiveInfo" into ics-mr0 2011-10-13 17:10:17 -07:00
Peter Ng
09205fc998 am ec2d58a0: (-s ours) am dcb4e158: (-s ours) Merge "Do Not Merge darker notification press state and divider" into ics-mr0 
* commit 'ec2d58a0b940683f5cda18d2970ba4e8002b0965':
  Do Not Merge darker notification press state and divider
 2011-10-13 16:59:52 -07:00
Peter Ng
ec2d58a0b9 am dcb4e158: (-s ours) Merge "Do Not Merge darker notification press state and divider" into ics-mr0 
* commit 'dcb4e158bcddb8266afaf863ae8832b92bed62a7':
  Do Not Merge darker notification press state and divider
 2011-10-13 16:58:03 -07:00
John Grossman
39722542b9 AAH: Fix PID gain for HW clock recovery. 
Before HW came in, when doing SW clock recovery, gain had been set to
produce a correction expressed in PPM from [-100, 100] PPM.  The HW
local clock HAL has been spec'ed to take a drive range from MIN_INT_16
to MAX_INT_16.  This changes the PID recovery loop to use a range from
MIN_INT_16 to MAX_INT_16, and adjusts the P and I gains to be the same
as they were before, but adjusted for the scale change.

Change-Id: I531175e5fbb20b7ba6ee06f457c5f4ad12c123ff
 2011-10-13 16:56:37 -07:00
Gilles Debunne
9f1fd14c03 am 19f4b66d: Merge "Bug 5228934: added a flag to disable the display of the soft input on focus" 
* commit '19f4b66ddc924e1828ddc4082dd381616f57ec06':
  Bug 5228934: added a flag to disable the display of the soft input on focus
 2011-10-13 16:56:21 -07:00
Peter Ng
dcb4e158bc Merge "Do Not Merge darker notification press state and divider" into ics-mr0 2011-10-13 16:56:01 -07:00
Wink Saville
ce0ea1f2b9 In releaseWifiLockLocked call noteReleaseWifiLock. 
Bug: 5452027
Change-Id: I45786a9cfe752f02a9c2e75e5b6f35bc5dfed6ae
 2011-10-13 16:55:20 -07:00
Gilles Debunne
19f4b66ddc Merge "Bug 5228934: added a flag to disable the display of the soft input on focus" 2011-10-13 16:54:23 -07:00
Martijn Coenen
4367e2c967 am d44d276f: am 19fa262c: Merge "Send ACTION_USER_PRESENT when provisioning is completed." into ics-mr0 
* commit 'd44d276f4116db2dac97b54ee808c5c274f0dfd2':
  Send ACTION_USER_PRESENT when provisioning is completed.
 2011-10-13 16:51:29 -07:00
Martijn Coenen
d44d276f41 am 19fa262c: Merge "Send ACTION_USER_PRESENT when provisioning is completed." into ics-mr0 
* commit '19fa262c52ddaf0e5ec200f4f7f21bda0d4b617b':
  Send ACTION_USER_PRESENT when provisioning is completed.
 2011-10-13 16:48:58 -07:00
Dianne Hackborn
fcf485177c am d09289ed: am 97e9ea98: Merge "Fix bug with CLEAR_TASK -- wouldn\'t clear the top activity." into ics-mr0 
* commit 'd09289ed80a56864c74024f8a2266a0c34c00d0b':
  Fix bug with CLEAR_TASK -- wouldn't clear the top activity.
 2011-10-13 16:47:27 -07:00
Martijn Coenen
19fa262c52 Merge "Send ACTION_USER_PRESENT when provisioning is completed." into ics-mr0 2011-10-13 16:47:02 -07:00
Dianne Hackborn
d09289ed80 am 97e9ea98: Merge "Fix bug with CLEAR_TASK -- wouldn\'t clear the top activity." into ics-mr0 
* commit '97e9ea98afac197722d7620d5fd09a8c06aafe3a':
  Fix bug with CLEAR_TASK -- wouldn't clear the top activity.
 2011-10-13 16:45:56 -07:00
Dianne Hackborn
97e9ea98af Merge "Fix bug with CLEAR_TASK -- wouldn't clear the top activity." into ics-mr0 2011-10-13 16:44:26 -07:00
Dave Santoro
a41d11256b am 4194f15e: am e6063299: Merge "Add hidden API for pre-authorizing URIs." into ics-mr0 
* commit '4194f15e16c833f78a33ea6286bfe0407649828b':
  Add hidden API for pre-authorizing URIs.
 2011-10-13 16:38:18 -07:00
Dave Santoro
4194f15e16 am e6063299: Merge "Add hidden API for pre-authorizing URIs." into ics-mr0 
* commit 'e6063299d874cc3b9d1fa71d0c3772c6ebe62e06':
  Add hidden API for pre-authorizing URIs.
 2011-10-13 16:34:17 -07:00
Dave Santoro
e6063299d8 Merge "Add hidden API for pre-authorizing URIs." into ics-mr0 2011-10-13 16:32:17 -07:00
Bart Sears
b8e543dc5c am 0272df85: am bcfe4152: Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0 
* commit '0272df85061304683a1fa9aa5825ba8dbf102841':
  Improve JavaDoc for WebView.loadData()
 2011-10-13 16:29:51 -07:00
Bart Sears
0272df8506 am bcfe4152: Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0 
* commit 'bcfe41529b7bd9f572a2eff31375dc9fdf35b518':
  Improve JavaDoc for WebView.loadData()
 2011-10-13 16:27:16 -07:00
Dianne Hackborn
eabd328dee Fix bug with CLEAR_TASK -- wouldn't clear the top activity. 
Maybe this will also fix bug #5144065 as well.

I doubt I am so lucky, though.

Change-Id: I60bf595d3eff79353fdd94b0f2a089e81218bc30
 2011-10-13 16:26:49 -07:00
Jim Miller
1f38ee39b0 am ee12e44b: am 6252a8b1: Merge "Fix 5386408: Send accessibility event when a recent app is removed." into ics-mr0 
* commit 'ee12e44b77a47f9b95fcb5b484e3d1b11649fcb9':
  Fix 5386408: Send  accessibility event when a recent app is removed.
 2011-10-13 16:26:13 -07:00
Bart Sears
bcfe41529b Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0 2011-10-13 16:25:29 -07:00
Jim Miller
ee12e44b77 am 6252a8b1: Merge "Fix 5386408: Send accessibility event when a recent app is removed." into ics-mr0 
* commit '6252a8b1167934d53fd76d5f0910d993390636ce':
  Fix 5386408: Send  accessibility event when a recent app is removed.
 2011-10-13 16:23:28 -07:00
Jim Miller
6252a8b116 Merge "Fix 5386408: Send accessibility event when a recent app is removed." into ics-mr0 2011-10-13 16:21:51 -07:00
Adam Powell
dd792b1f5f am fb99c533: am 50b15348: Merge "Bug 5312828 - Menu button not responding" into ics-mr0 
* commit 'fb99c53308955d34b3eadae325b7ed60576836f8':
  Bug 5312828 - Menu button not responding
 2011-10-13 16:17:45 -07:00
Adam Powell
fb99c53308 am 50b15348: Merge "Bug 5312828 - Menu button not responding" into ics-mr0 
* commit '50b15348c5b61472b5ed02434968b5a035765b63':
  Bug 5312828 - Menu button not responding
 2011-10-13 16:15:17 -07:00
Jason Sams
fdcce1719e am 3fda6ed3: am 43b57ec4: Fix error printing if no command string is set. 
* commit '3fda6ed3c751d959d93dc9fb6d3b65f3617d04f5':
  Fix error printing if no command string is set.
 2011-10-13 16:14:30 -07:00
Adam Powell
50b15348c5 Merge "Bug 5312828 - Menu button not responding" into ics-mr0 2011-10-13 16:13:55 -07:00
Jason Sams
3fda6ed3c7 am 43b57ec4: Fix error printing if no command string is set. 
* commit '43b57ec48ec7652addc11bbc9fef652c2394b7f5':
  Fix error printing if no command string is set.
 2011-10-13 16:13:07 -07:00
Jason Sams
43b57ec48e Fix error printing if no command string is set. 
Change-Id: I588c0d0a4e1b8f80c967ebfb6aff179a0cac4a36
 2011-10-13 16:05:27 -07:00
Peter Ng
453b37f66c Do Not Merge darker notification press state and divider 
Bug: 3329721
Change-Id: I77ec70dd75d6e8009fc2f06741520167b7d34a42
 2011-10-13 15:59:06 -07:00
Adam Powell
c6d51889c2 Bug 5312828 - Menu button not responding 
Increase tolerance for apps calling invalidateOptionsMenu at
inconvenient times.

Change-Id: I712b20002afd0f056c3f05b160c5fa9c2ef0b552
 2011-10-13 15:51:25 -07:00
Steve Block
33f962b22e Improve JavaDoc for WebView.loadData() 
Make clear that the charset specified in the mediatype portion of a data URL
overrides that specified in the HTML or XML document itself.

Bug: 5418915
Change-Id: Iff7305b6ac9e656d0fb7ed1b2ffe6fd0e21be49b
 2011-10-13 15:32:13 -07:00
Justin Ho
c8bfee3277 am bb290c89: am 846601a1: Merge "Revert "Updated volume rocker assets for ring notification icon"" into ics-mr0 
* commit 'bb290c891ef51d83c5fd855e24f1c74cdc182fef':
  Revert "Updated volume rocker assets for ring notification icon"
 2011-10-13 15:26:49 -07:00