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

59803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
bb290c891e am 846601a1: Merge "Revert "Updated volume rocker assets for ring notification icon"" into ics-mr0 
* commit '846601a1627a3be8f87601c13b87a22a6dbfafb4':
  Revert "Updated volume rocker assets for ring notification icon"
 2011-10-13 15:25:17 -07:00
Justin Ho
846601a162 Merge "Revert "Updated volume rocker assets for ring notification icon"" into ics-mr0 2011-10-13 15:23:20 -07:00
Justin Ho
d0922340aa Revert "Updated volume rocker assets for ring notification icon" 
This reverts commit 56505a6e7983d03b051d451d6120f29ccce8e09e
 2011-10-13 15:22:53 -07:00
Justin Ho
0dc9937d4d am 210ccb81: Merge "Updated wifi in range status bar notification icon" into ics-mr0 
* commit '210ccb8110be9297acc94975d97156ee8ee2d61b':
  Updated wifi in range status bar notification icon
 2011-10-13 15:20:04 -07:00
Justin Ho
695d9b0a00 am b5e8a295: Merge "Updated volume rocker assets for ring notification icon" into ics-mr0 
* commit 'b5e8a2955a45ab9f5409a8227b96d75d01cdfa5d':
  Updated volume rocker assets for ring notification icon
 2011-10-13 15:20:02 -07:00
Justin Ho
c08e682d71 am 96ae383d: Merge "Updated speakerphone asset" into ics-mr0 
* commit '96ae383d9efbae8eb6a28d194de20ba03cb610e8':
  Updated speakerphone asset
 2011-10-13 15:20:01 -07:00
Justin Ho
d54b59e8a0 am 41f45e49: Merge "Updated stat_sys wifi icons" into ics-mr0 
* commit '41f45e4969565d21f7d49b2b1cf828e27af73efa':
  Updated stat_sys wifi icons
 2011-10-13 15:19:59 -07:00
Justin Ho
210ccb8110 Merge "Updated wifi in range status bar notification icon" into ics-mr0 2011-10-13 15:17:34 -07:00
Justin Ho
496e809458 am 86e12a82: Merge "Updated Systembar back and highlight assets Bug: 5411737" into ics-mr0 
* commit '86e12a82d2c25b04cbd2b51fb50b900b459593cd':
  Updated Systembar back and highlight assets Bug: 5411737
 2011-10-13 15:17:26 -07:00
Justin Ho
7c64cc76b6 am caea6473: Merge "Updated cut actionbar icon" into ics-mr0 
* commit 'caea6473b46618040c8a8e611618e2c39d3506bf':
  Updated cut actionbar icon
 2011-10-13 15:17:25 -07:00
Justin Ho
b5e8a2955a Merge "Updated volume rocker assets for ring notification icon" into ics-mr0 2011-10-13 15:17:22 -07:00
Justin Ho
96ae383d9e Merge "Updated speakerphone asset" into ics-mr0 2011-10-13 15:16:52 -07:00
Justin Ho
41f45e4969 Merge "Updated stat_sys wifi icons" into ics-mr0 2011-10-13 15:16:37 -07:00
Justin Ho
86e12a82d2 Merge "Updated Systembar back and highlight assets Bug: 5411737" into ics-mr0 2011-10-13 15:16:11 -07:00
Justin Ho
caea6473b4 Merge "Updated cut actionbar icon" into ics-mr0 2011-10-13 15:15:48 -07:00
Justin Ho
a197abdc52 Updated wifi in range status bar notification icon 
Change-Id: I5e91d14473908086848db552acec0df90e7104c2
 2011-10-13 15:13:44 -07:00
Justin Ho
56505a6e79 Updated volume rocker assets for ring notification icon 
Change-Id: Ibcdd8e88efaaba9e91a1b6959a83207c747b3195
 2011-10-13 15:12:09 -07:00
Justin Ho
874c2c487b Updated speakerphone asset 
Change-Id: I5c799853a8ad851670cc58c8b4052859d8363d93
 2011-10-13 15:10:41 -07:00
Justin Ho
719aeb5f17 Updated cut actionbar icon 
Change-Id: Ib523594be8b3923adc21c6bee2ea4522f4fded79
 2011-10-13 15:04:03 -07:00
Kenny Root
6ccd41265d Add support for signature in getPackageArchiveInfo 
GET_SIGNATURES was indicated as supported, but it never actually did
anything.

This is needed for the package verifier development sample.

Change-Id: I09ca6790cd8bf9435aa208c0711359b4d76fb278
 2011-10-13 14:57:31 -07:00
Gilles Debunne
cbdd245793 Merge "Bug 5428541: Check that span is still in text before deleting" 2011-10-13 14:23:37 -07:00