Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,111 Commits 3 Branches 0 Tags
c55e80defd6f2b7906c6d4bda063d0d4dcabff70
Commit Graph

21438 Commits

Author SHA1 Message Date
Steve Block
c55e80defd am cfece91c: Merge "Improve documentation for WebChromeClient.onCreateWindow()" 
* commit 'cfece91c1eb79cc0b686129ed622fe1d839e421e':
  Improve documentation for WebChromeClient.onCreateWindow()
 2011-10-17 02:33:21 -07:00
Steve Block
882f63b2f2 am 35934148: Merge "Clean up documentation for WebView.loadUrl()" 
* commit '35934148635e6c5f4dce75c305a54f741f991085':
  Clean up documentation for WebView.loadUrl()
 2011-10-17 02:33:19 -07:00
Steve Block
cfece91c1e Merge "Improve documentation for WebChromeClient.onCreateWindow()" 2011-10-17 02:30:41 -07:00
Steve Block
3593414863 Merge "Clean up documentation for WebView.loadUrl()" 2011-10-17 02:30:00 -07:00
Steve Block
f71dea025a Clean up documentation for WebView.loadUrl() 
Bug: 5461416
Change-Id: I3bb6ac4abab7def8e06de087c5ae7be906bc962e
 2011-10-17 10:29:03 +01:00
Jeff Brown
88e7723895 am aac01f69: Merge "Add a CrossProcessCursorWrapper. Bug: 5220669" 
* commit 'aac01f699f9f6ccf285bdec7e89ff864f180409d':
  Add a CrossProcessCursorWrapper. Bug: 5220669
 2011-10-14 21:10:04 -07:00
Jeff Brown
a9a1dc7dc2 am 04263dc5: Merge "AbstractWindowedCursor is not special." 
* commit '04263dc591b07a4d5a9b53163dcb421ccffd34d4':
  AbstractWindowedCursor is not special.
 2011-10-14 21:10:02 -07:00
Jeff Brown
975beeb43c am d0085108: Merge "Make default implementation of fillWindow typesafe. Bug: 5218310" 
* commit 'd00851082f913d834c3474e6af025d9574cd14b0':
  Make default implementation of fillWindow typesafe. Bug: 5218310
 2011-10-14 21:10:01 -07:00
Jeff Brown
f8b952f3e4 am a39a0553: Merge "Deprecate local-only CursorWindows." 
* commit 'a39a055304968e799c49e99b700399667eab006a':
  Deprecate local-only CursorWindows.
 2011-10-14 21:09:58 -07:00
Jeff Brown
aac01f699f Merge "Add a CrossProcessCursorWrapper. Bug: 5220669" 2011-10-14 21:06:22 -07:00
Jeff Brown
04263dc591 Merge "AbstractWindowedCursor is not special." 2011-10-14 21:06:15 -07:00
Jeff Brown
d00851082f Merge "Make default implementation of fillWindow typesafe. Bug: 5218310" 2011-10-14 21:06:08 -07:00
Jeff Brown
a39a055304 Merge "Deprecate local-only CursorWindows." 2011-10-14 21:05:58 -07:00
Romain Guy
fe077041ee am 436e270f: Merge "Disable hardware acceleration for apps in compatibility mode" 
* commit '436e270fbb607d62d59e3694ff46c87fa156f78b':
  Disable hardware acceleration for apps in compatibility mode
 2011-10-14 15:50:53 -07:00
Romain Guy
436e270fbb Merge "Disable hardware acceleration for apps in compatibility mode" 2011-10-14 15:48:40 -07:00
Romain Guy
856d4e1a87 Disable hardware acceleration for apps in compatibility mode 
Change-Id: I2d1c01a30c6fe6fff85c2a9bd6ee6de98e1ed422
 2011-10-14 15:47:55 -07:00
Martijn Coenen
2378ba1619 am fafc43b3: am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0 
* commit 'fafc43b349c6b4e8d77ce60f6cac7290cdacdd1a':
  Remove NfcFragment from activity when no longer sharing.
 2011-10-14 13:03:13 -07:00
Martijn Coenen
fafc43b349 am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0 
* commit '202b38cb71d123e4ebc8741643e84fa455ecd002':
  Remove NfcFragment from activity when no longer sharing.
 2011-10-14 13:00:45 -07:00
Martijn Coenen
202b38cb71 Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0 2011-10-14 12:57:34 -07:00
satok
3d9670ccc3 am 69db986c: am e6fee18d: Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it\'s removed." into ics-mr0 
* commit '69db986cf01c74094747f82758e229da9f007a74':
  Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed.
 2011-10-14 11:23:48 -07:00
Jim Miller
005e526682 am eecd9ac0: am 83e160d3: Fix build. 
* commit 'eecd9ac0fbe0335916b8f72a89d479dd64341988':
  Fix build.
 2011-10-14 11:23:47 -07:00
satok
69db986cf0 am e6fee18d: Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it\'s removed." into ics-mr0 
* commit 'e6fee18d16a86c266afef48f7705268435a99111':
  Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed.
 2011-10-14 11:16:57 -07:00
satok
e6fee18d16 Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed." into ics-mr0 2011-10-14 11:15:05 -07:00
Gilles Debunne
cc326fc48f am ae245d59: Merge "Bug 5420741: exception when rotating device while suggestion popup is visible" 
* commit 'ae245d59b384fb4e649d32a3475e4519fafa43ff':
  Bug 5420741: exception when rotating device while suggestion popup is visible
 2011-10-14 11:13:15 -07:00
Jim Miller
eecd9ac0fb am 83e160d3: Fix build. 
* commit '83e160d3b3ad839b0c2faf40f4477a2468098995':
  Fix build.
 2011-10-14 11:12:41 -07:00
Gilles Debunne
932cc3d07d am b9e78d96: Merge "Spell checher\'s language synced with keyboard." 
* commit 'b9e78d96b745341c6cd8be950480c0cb0a20974f':
  Spell checher's language synced with keyboard.
 2011-10-14 11:11:13 -07:00
Gilles Debunne
ae245d59b3 Merge "Bug 5420741: exception when rotating device while suggestion popup is visible" 2011-10-14 11:09:59 -07:00
Gilles Debunne
b9e78d96b7 Merge "Spell checher's language synced with keyboard." 2011-10-14 11:09:44 -07:00
Jim Miller
83e160d3b3 Fix build. 
Change-Id: Ifd5fe7933065f555f50ea91c4c301f87ca09dcdc
 2011-10-14 11:06:33 -07:00
Joe Fernandez
5377b3fac3 am 5a401ddb: am 471fa9d1: Merge "docs: add developer guide cross-references, Project ACRE, Round 2" into ics-mr0 
* commit '5a401ddbc89c99315b82b27e1554dbf5141137b4':
  docs: add developer guide cross-references, Project ACRE, Round 2
 2011-10-14 10:57:26 -07:00
Joe Fernandez
5a401ddbc8 am 471fa9d1: Merge "docs: add developer guide cross-references, Project ACRE, Round 2" into ics-mr0 
* commit '471fa9d10b4fa4da070c0ffb5fa5ea1354c8e6b8':
  docs: add developer guide cross-references, Project ACRE, Round 2
 2011-10-14 10:54:29 -07:00
Joe Fernandez
471fa9d10b Merge "docs: add developer guide cross-references, Project ACRE, Round 2" into ics-mr0 2011-10-14 10:52:33 -07:00
Amith Yamasani
b1f8610fc9 am 96307ff9: am 00005385: Merge "Use ringer assets for notification volume since the two volumes are tied." into ics-mr0 
* commit '96307ff948b92904833c4ba641e04913ec10c1c9':
  Use ringer assets for notification volume since the two volumes are tied.
 2011-10-14 10:35:35 -07:00
Amith Yamasani
96307ff948 am 00005385: Merge "Use ringer assets for notification volume since the two volumes are tied." into ics-mr0 
* commit '000053859290d322625dfcbdb0467fc34d5e55f4':
  Use ringer assets for notification volume since the two volumes are tied.
 2011-10-14 10:33:29 -07:00
Christopher Tate
8f4e49a8fe Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0 2011-10-14 10:33:13 -07:00
Amith Yamasani
0000538592 Merge "Use ringer assets for notification volume since the two volumes are tied." into ics-mr0 2011-10-14 10:30:43 -07:00
Jim Miller
ef21bacdd3 am 66d19b85: am 1a59c7e3: Merge "Fix 5358124: Better transport control visibility management in lock screen" into ics-mr0 
* commit '66d19b85b374fb32b22a2be2a435c42a6ad0f1f0':
  Fix 5358124: Better transport control visibility management in lock screen
 2011-10-14 10:22:36 -07:00
Jim Miller
66d19b85b3 am 1a59c7e3: Merge "Fix 5358124: Better transport control visibility management in lock screen" into ics-mr0 
* commit '1a59c7e3973cd2de23e45afde1a5e8fdd8a2d30f':
  Fix 5358124: Better transport control visibility management in lock screen
 2011-10-14 10:20:48 -07:00
Jim Miller
1a59c7e397 Merge "Fix 5358124: Better transport control visibility management in lock screen" into ics-mr0 2011-10-14 10:19:13 -07:00
Joe Fernandez
558459fe85 docs: add developer guide cross-references, Project ACRE, Round 2 
Change-Id: I39a534ae3a2a34b4dabc333a09961012ef911d3e
 2011-10-14 10:18:33 -07:00
John Reck
a566e90d01 am 61d3449d: am d82cc1de: Merge "Fixup JNI" into ics-mr0 
* commit '61d3449d1a135f17f8aa664f39f6cafcf595ba29':
  Fixup JNI
 2011-10-14 10:15:01 -07:00
John Reck
61d3449d1a am d82cc1de: Merge "Fixup JNI" into ics-mr0 
* commit 'd82cc1de848a678fa4bcaefdbc763307f3df4a75':
  Fixup JNI
 2011-10-14 10:12:14 -07:00
John Reck
d82cc1de84 Merge "Fixup JNI" into ics-mr0 2011-10-14 10:10:07 -07:00
Martijn Coenen
2ec83936a1 Remove NfcFragment from activity when no longer sharing. 
This fixes scenarios where the same activity sets, unsets
and re-sets an NdefMessage and/or callback.

Bug: 5454848
Change-Id: I5ed98047b9cfe90d2f48656d978f2d08bb4bf0cc
 2011-10-14 10:01:25 -07:00
satok
75e126f2df Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed. 
Bug: 5460262

Change-Id: I4ca71020a6d4b7057f60ca99944c479775cca8b7
 2011-10-15 01:24:44 +09:00
Jean-Michel Trivi
b0fc6e0285 am 76842baa: am 9ad680ca: Merge "Fix 5380695 Lockscreen transport control must reflect error state" into ics-mr0 
* commit '76842baa0f6d079bcb8933bb14a7a4dbb89db781':
  Fix 5380695 Lockscreen transport control must reflect error state
 2011-10-14 09:05:46 -07:00
Jean-Michel Trivi
76842baa0f am 9ad680ca: Merge "Fix 5380695 Lockscreen transport control must reflect error state" into ics-mr0 
* commit '9ad680ca2be19679c355de9526d79ded2887ea97':
  Fix 5380695 Lockscreen transport control must reflect error state
 2011-10-14 09:02:49 -07:00
Jean-Michel Trivi
9ad680ca2b Merge "Fix 5380695 Lockscreen transport control must reflect error state" into ics-mr0 2011-10-14 09:01:08 -07:00
Steve Block
89e00a90d5 Improve documentation for WebChromeClient.onCreateWindow() 
Bug: 5461416
Change-Id: I9beac56374fb3ce97da4b20fa5646b5b5f05bad9
 2011-10-14 16:29:01 +01:00
Mathew Inwood
dd4394328a am 772158a5: Merge "Allow setting of source bounds on global search intents." 
* commit '772158a596bc97694fa82e710b5cfbe8c6f40cdc':
  Allow setting of source bounds on global search intents.
 2011-10-14 06:37:16 -07:00