Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,772 Commits 3 Branches 0 Tags
ed85b04ebdf2ab60bb312a8cbb94aad0633572ba
Commit Graph

24467 Commits

Author SHA1 Message Date
George Mount
ed85b04ebd am 8502ab91: am daceb30b: Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev 
* commit '8502ab91bdd8ed34eeebed2daac90dea7b3da0ea':
  Cancel handler for JS unload handler prevents hang.
 2012-08-02 16:33:30 -07:00
George Mount
daceb30bf5 Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev 2012-08-02 16:28:03 -07:00
George Mount
df9cae4de3 Cancel handler for JS unload handler prevents hang. 
Bug 6803309
 When the alert dialog raised by the JS unload handler was pressed
 outside the alert region, it was canceled and no response was
 sent back to WebViewCore. This captures the cancel event so that
 WebViewCore doesn't hang.

Change-Id: I0c125e759a252a803c2c77aa9533adef7fa82d3d
 2012-08-02 15:14:39 -07:00
Craig Mautner
c3edff71bf am d844e4f2: am 2a642a45: Merge "Refactor DisplayManagerService to be functional." into jb-mr1-dev 
* commit 'd844e4f285348ede6e4f40e71d727e2fe4866c3e':
  Refactor DisplayManagerService to be functional.
 2012-08-02 15:10:46 -07:00
rich cannings
3cfe6d5cef am 8c968174: am 9866d60e: Merge "Pass URLs to package verifiers" into jb-mr1-dev 
* commit '8c96817480863aff8554f95da4f2151b0e9ee5e9':
  Pass URLs to package verifiers
 2012-08-02 15:10:40 -07:00
Adam Powell
446b54565a am 0f5a749c: am b1758cf8: Merge "Make MediaRouteButton focusable by default" into jb-mr1-dev 
* commit '0f5a749c60d489683112fe6cf5220d1a576582ca':
  Make MediaRouteButton focusable by default
 2012-08-02 15:10:32 -07:00
George Mount
12b7b7fea8 am be38cccd: am ed9960ff: Merge "Don\'t restart input in the middle of a batch." into jb-mr1-dev 
* commit 'be38cccd91e12576ed994719b6b83371c5749bb9':
  Don't restart input in the middle of a batch.
 2012-08-02 15:10:28 -07:00
Craig Mautner
7f24ce696a am ccafb1ad: am 437a0fbd: Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev 
* commit 'ccafb1ad5d60d70baa7f4fbf155e906261e42953':
  Introduce multiple displays with DisplayContent.
 2012-08-02 15:08:51 -07:00
Craig Mautner
2a642a450a Merge "Refactor DisplayManagerService to be functional." into jb-mr1-dev 2012-08-02 13:16:13 -07:00
rich cannings
9866d60ea4 Merge "Pass URLs to package verifiers" into jb-mr1-dev 2012-08-02 12:57:11 -07:00
Adam Powell
b1758cf8cd Merge "Make MediaRouteButton focusable by default" into jb-mr1-dev 2012-08-02 11:28:45 -07:00
rich cannings
24713907fe Pass URLs to package verifiers 
This change passes the originating URL and accompanied referrer to
package verifiers, when available.

Bug: 6544677
Change-Id: If9ff6663ad7f3426b7aea2aceb1413b689788138
 2012-08-02 11:26:47 -07:00
Adam Powell
e468187870 Make MediaRouteButton focusable by default 
Bug 6921236

Add a default contentDescription for MediaRouteButton.

Add long-press "cheat sheet" support to MediaRouteButtons created by
MediaRouteActionProvider for use in the action bar to match standard
action button behavior.

Change-Id: I313cfcb2349210765b084c3388095de4624009e8
 2012-08-02 11:23:55 -07:00
Craig Mautner
4f67ba6ba4 Refactor DisplayManagerService to be functional. 
Change-Id: Ieac1eca172be5dc5db45302d3afa26188acd4d6d
 2012-08-02 11:23:00 -07:00
George Mount
a99dbde643 Don't restart input in the middle of a batch. 
Bug 6854156
 setComposingText is in the middle of a batch and it was resetting
 the InputConnection. When the batch ended, it was closing a
 batch that wasn't open on the new InputConnection. The reset
 turns out not to be necessary anymore -- the LatinIME respects
 the content when setComposingText fails to change anything.

Change-Id: If3352b32ed7b3c90c8dcb3d5ff8d308e82849d85
 2012-08-02 09:36:06 -07:00
Craig Mautner
437a0fbd57 Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev 2012-08-02 09:20:14 -07:00
Craig Mautner
59c009776d Introduce multiple displays with DisplayContent. 
Fix a couple of bugs that turned up.
Remove touch/focus from display. Add iterators for access.
Respond to comments. Remove TODOs, and some deviceId parameters.

Change-Id: Idcdb4f1979aa7b14634d450fd0333d6eff26994d
 2012-08-02 08:47:44 -07:00
Dianne Hackborn
145d27da15 am 23e6a909: am a7ce1551: Merge "Add API to turn on HW drawing in IMEs." into jb-mr1-dev 
* commit '23e6a9098ad464e1c80614b0f2664f29c075b945':
  Add API to turn on HW drawing in IMEs.
 2012-08-01 19:20:14 -07:00
Dianne Hackborn
a7ce1551a6 Merge "Add API to turn on HW drawing in IMEs." into jb-mr1-dev 2012-08-01 19:05:52 -07:00
Dianne Hackborn
836531b0c4 Add API to turn on HW drawing in IMEs. 
Change-Id: Ib6a8bda46223ce1153f32834daf02a820d16136e
 2012-08-01 19:00:38 -07:00
Chris Wren
bc26dc75c3 am c9d737dd: am 45aaa4a8: am 790474ba: am f11e0e71: Merge "Add missing docs to notification style rebuilder functions." into jb-dev 
* commit 'c9d737dd8c5085d1a5717caa03a7d3d907d8afd1':
  Add missing docs to notification style rebuilder functions.
 2012-08-01 14:56:06 -07:00
Robert Greenwalt
412ebf4624 am d0378f4d: am 6c5cec88: am 6b6ce6bf: am a5637bac: Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName" 
* commit 'd0378f4dddbff8173c21a263e458ca965cfc4a74':
  Telephony: Add HSPAP to getTcpBufferSizesPropName
 2012-08-01 14:55:57 -07:00
Jeff Sharkey
231b2814c5 am 2a036091: am 6a916ed0: Merge "Add trimToSize() to public API." into jb-mr1-dev 
* commit '2a036091420674a56fb2e4634950b9d917d1b7b2':
  Add trimToSize() to public API.
 2012-08-01 14:53:14 -07:00
Teng-Hui Zhu
cf737484a8 am ca6b44f8: am 3a680382: Merge "Add license info to the HTML5Video files." into jb-mr1-dev 
* commit 'ca6b44f8a9c78002f1826d49ced350287831dba4':
  Add license info to the HTML5Video files.
 2012-08-01 14:53:10 -07:00
Dianne Hackborn
7be6374428 am 791039d6: am e6184f83: Merge "Start moving away from DisplayMetrics.DENSITY_DEVICE." into jb-mr1-dev 
* commit '791039d68ce505057bd2c7a730be85b419f6d024':
  Start moving away from DisplayMetrics.DENSITY_DEVICE.
 2012-08-01 14:53:06 -07:00
Chris Wren
45aaa4a8f4 am 790474ba: am f11e0e71: Merge "Add missing docs to notification style rebuilder functions." into jb-dev 
* commit '790474ba3a2fb149090ced7d38247aed6f6a2d59':
  Add missing docs to notification style rebuilder functions.
 2012-08-01 14:48:56 -07:00
Robert Greenwalt
6c5cec881a am 6b6ce6bf: am a5637bac: Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName" 
* commit '6b6ce6bfce56c2f3ce007b33d3f834f8dd62b626':
  Telephony: Add HSPAP to getTcpBufferSizesPropName
 2012-08-01 14:48:34 -07:00
Jeff Sharkey
6a916ed0c0 Merge "Add trimToSize() to public API." into jb-mr1-dev 2012-08-01 14:34:47 -07:00
Jeff Sharkey
d96b585f5c Add trimToSize() to public API. 
Bug: 6602490
Bug: http://code.google.com/p/android/issues/detail?id=35349
Change-Id: Ib3bc7fee05bb0edc375ebee1c40a1d7bd82e2a17
 2012-08-01 14:20:04 -07:00
Teng-Hui Zhu
3a68038249 Merge "Add license info to the HTML5Video files." into jb-mr1-dev 2012-08-01 14:19:46 -07:00
Teng-Hui Zhu
778029e5c6 Add license info to the HTML5Video files. 
Change-Id: I44775bcdcc48d2c024b086098e140dae92f53339
 2012-08-01 13:59:39 -07:00
Chris Wren
790474ba3a am f11e0e71: Merge "Add missing docs to notification style rebuilder functions." into jb-dev 
* commit 'f11e0e7176489f5213acaa7e36c677882854cb8d':
  Add missing docs to notification style rebuilder functions.
 2012-08-01 13:04:02 -07:00
Robert Greenwalt
6b6ce6bfce am a5637bac: Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName" 
* commit 'a5637bac23611a985696c92b49f93964f435ecb5':
  Telephony: Add HSPAP to getTcpBufferSizesPropName
 2012-08-01 12:14:33 -07:00
Chris Wren
0bd664dab4 Add missing docs to notification style rebuilder functions. 
Bug: 6914726
Change-Id: I13efae036610523ec6f83696d3337054e79856aa
 2012-08-01 15:06:56 -04:00
Dianne Hackborn
908aecc3a6 Start moving away from DisplayMetrics.DENSITY_DEVICE. 
This puts in most of the infrastructure needed to allow us to
switch between different densities at run time.  The main remaining
uses of the global are to initialize the Bitmap object (not sure
what to do about that since it doesn't have anything passed in
the constructor to get this information from), and being able to
load drawables if we need a different density than what was preloaded
by zygote.

Change-Id: Ifdbfd6b7a5c59e6aa22e63b95b78d96af3d96848
 2012-08-01 10:54:39 -07:00
Craig Mautner
893eacc591 am 4186f85d: am 28e000ef: Merge "Remove debugging for b6829431." into jb-mr1-dev 
* commit '4186f85ddecc9d95aa130eb10bedbd2ef457c5b0':
  Remove debugging for b6829431.
 2012-08-01 10:29:01 -07:00
Craig Mautner
28e000ef72 Merge "Remove debugging for b6829431." into jb-mr1-dev 2012-08-01 10:04:38 -07:00
Craig Mautner
1c43719c47 Remove debugging for b6829431. 
Change-Id: If7da858722d5d0a5e7db2bc249d454bdee1ec94e
 2012-08-01 10:01:16 -07:00
Dianne Hackborn
d31bf5948f am 00840827: am 40e5df95: Merge "Make AtomicFile a public API. It\'s about time!" into jb-mr1-dev 
* commit '008408277933afb23a95e080b09eed07d2575eda':
  Make AtomicFile a public API.  It's about time!
 2012-07-31 18:15:26 -07:00
Dianne Hackborn
40e5df95ff Merge "Make AtomicFile a public API. It's about time!" into jb-mr1-dev 2012-07-31 18:11:03 -07:00
Dianne Hackborn
39606a007a Make AtomicFile a public API. It's about time! 
Change-Id: Ib34e294747405b7ab709cb0bbb2d9a0cc80ce86a
 2012-07-31 17:54:52 -07:00
Jeff Sharkey
a50393faf5 am 37f0fbf3: am 24d19fb6: Revert "API to adjust network stats." 
* commit '37f0fbf35260e96cdb699326be63bf19ec4d567d':
  Revert "API to adjust network stats."
 2012-07-31 17:23:00 -07:00
Jeff Sharkey
24d19fb6ab Revert "API to adjust network stats." 2012-07-31 17:11:07 -07:00
Adam Powell
72b7c53c92 am 015b2c1e: am 8ab8fbbf: Merge "Don\'t let ScrollView intercept touch events if it can\'t scroll." into jb-mr1-dev 
* commit '015b2c1e0b9a9d0b3defb2958931b04386128590':
  Don't let ScrollView intercept touch events if it can't scroll.
 2012-07-31 16:46:01 -07:00
Adam Powell
0278c2fcba Don't let ScrollView intercept touch events if it can't scroll. 
Bug 6872104

Change-Id: Iee643e052acc37485a8ec45b7af8be0783fb1a95
 2012-07-31 16:39:32 -07:00
Fabrice Di Meglio
d8a7893698 am ffbacd8c: am fba3bf97: Merge "Improve Toast RTL support" into jb-mr1-dev 
* commit 'ffbacd8ce51544ce45d93e7009487d741569b724':
  Improve Toast RTL support
 2012-07-31 12:30:25 -07:00
Fabrice Di Meglio
fba3bf97d4 Merge "Improve Toast RTL support" into jb-mr1-dev 2012-07-31 12:26:52 -07:00
Jeff Sharkey
16ef577917 Merge "API to adjust network stats. DO NOT MERGE." into jb-mr1-dev 2012-07-31 12:09:54 -07:00
Jeff Sharkey
e7ed1ce4c8 API to adjust network stats. DO NOT MERGE. 
Enables system apps to correctly account network usage performed on
behalf of another application.

Bug: 6695246
Change-Id: I39e243afd57936b6b30157a6ca511a17b6c55c39
 2012-07-31 11:45:17 -07:00
Kenny Root
285345ff5c am a8e77099: am e23ae144: am fa74f7e0: am bba948dc: Merge "Delay AccountManagerService initialization" into jb-dev 
* commit 'a8e770991e8659d775d97f603e8f1a542aa0229e':
  Delay AccountManagerService initialization
 2012-07-31 11:23:22 -07:00