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

61925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
679f6c614a am 0dc9937d: am 210ccb81: Merge "Updated wifi in range status bar notification icon" into ics-mr0 
* commit '0dc9937d4d9ae0a0c216fe661a1ecb3e985a53e4':
  Updated wifi in range status bar notification icon
 2011-10-13 15:22:38 -07:00
Justin Ho
81f9650627 am 695d9b0a: am b5e8a295: Merge "Updated volume rocker assets for ring notification icon" into ics-mr0 
* commit '695d9b0a00246b5b2fec4fafb1283f45831f492e':
  Updated volume rocker assets for ring notification icon
 2011-10-13 15:22:36 -07:00
Justin Ho
25b29e13d2 am c08e682d: am 96ae383d: Merge "Updated speakerphone asset" into ics-mr0 
* commit 'c08e682d71865e6c99c969d96ce313bae61a754e':
  Updated speakerphone asset
 2011-10-13 15:22:34 -07:00
Justin Ho
b6883f9449 am d54b59e8: am 41f45e49: Merge "Updated stat_sys wifi icons" into ics-mr0 
* commit 'd54b59e8a04ad9ca68dbdfdb096a2a4a26cc8d3c':
  Updated stat_sys wifi icons
 2011-10-13 15:22:33 -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
d932eeba8c am 496e8094: am 86e12a82: Merge "Updated Systembar back and highlight assets Bug: 5411737" into ics-mr0 
* commit '496e8094584a12c9e8979665a2a136d014a8aa7d':
  Updated Systembar back and highlight assets Bug: 5411737
 2011-10-13 15:19:21 -07:00
Justin Ho
b4540ba2c5 am 7c64cc76: am caea6473: Merge "Updated cut actionbar icon" into ics-mr0 
* commit '7c64cc76b62d6c86b84dc1d77c6ba3ac74c74715':
  Updated cut actionbar icon
 2011-10-13 15:19:19 -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