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

63113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
ad79297a41 am d732efa2: am b2aa672f: Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1 
* commit 'd732efa2972eaaa22ff921c39744ec969598bcd0':
  Revert "IME action (done, next...) correctly handled"
 2011-12-01 11:59:07 -08:00
Bill Gruber
92a2f5fd6a am 715a3c52: am 92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0 
* commit '715a3c52ccd896265b4e57835d196bf7a2a17437':
  Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766
 2011-12-01 11:56:55 -08:00
Scott Main
42e4ecc727 am a8fa89f7: am 8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0 
* commit 'a8fa89f7f4e658c41dba466b10459208d673bc3a':
  docs: dashboard update for 12/1
 2011-12-01 11:56:54 -08:00
Bill Gruber
715a3c52cc am 92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0 
* commit '92ad16d342aa4d39bad33600161b3799b84716f3':
  Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766
 2011-12-01 11:54:57 -08:00
Scott Main
a8fa89f7f4 am 8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0 
* commit '8f3993b12b52ac5d94d84376ec4f42b130018429':
  docs: dashboard update for 12/1
 2011-12-01 11:54:55 -08:00
Bill Gruber
92ad16d342 Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0 2011-12-01 11:53:23 -08:00
Scott Main
8f3993b12b Merge "docs: dashboard update for 12/1" into ics-mr0 2011-12-01 11:53:17 -08:00
Svetoslav Ganov
36bcdb535e Fix memory leaks in the accessibility layer. 
The AccessibilityServiceConnection chache should be shared
between all interrogating threads.

bug:5664337

Change-Id: I151041d0b358e87ac47ea5c1c258f90a8b252420
 2011-12-01 11:50:42 -08:00
Bill Gruber
0c2d3c5120 Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 
IAB doc update: CSV import feature
Also fixed Bug 5221766

Change-Id: I40b8057dae10067c8cc9aa7506564c0033efc2fe
 2011-12-01 11:46:59 -08:00
Amith Yamasani
52976f04d8 am e9b0608c: Merge "No clicking on volume icon in volume dialog." into ics-mr1 
* commit 'e9b0608c76bd19356f3141358ffdf134b7a9700f':
  No clicking on volume icon in volume dialog.
 2011-12-01 11:37:32 -08:00
Amith Yamasani
e9b0608c76 Merge "No clicking on volume icon in volume dialog." into ics-mr1 2011-12-01 11:35:30 -08:00
Daniel Sandler
488529506f Add copious navigation bar info to SystemUI dumps. 
Bug: 5549288
Change-Id: I8556584e6abd22912d55dccc27ccebb6602b1bcb
 2011-12-01 14:34:23 -05:00
Jeff Sharkey
276642baf1 Uniform rethrowing of NDC exceptions. 
Change-Id: I7e8b050f09ef0d3aebd5b5a72f856eb86dd25935
 2011-12-01 11:24:24 -08:00
Scott Main
075bd9eb93 am 4f926932: am acf1038a: docs: remove broken link from renderscript docs bug: 5696178 
* commit '4f9269323b2d8d945d33f9bd79d8b8c3ab6bc3b0':
  docs: remove broken link from renderscript docs bug: 5696178
 2011-12-01 11:23:15 -08:00
Scott Main
4f9269323b am acf1038a: docs: remove broken link from renderscript docs bug: 5696178 
* commit 'acf1038a260d7b2a3bb6b36058da47041c8ec173':
  docs: remove broken link from renderscript docs bug: 5696178
 2011-12-01 11:20:03 -08:00
Scott Main
acf1038a26 docs: remove broken link from renderscript docs 
bug: 5696178

Change-Id: I78285ac67749fb3936e359968d28bbeb539ea7dc
 2011-12-01 11:11:08 -08:00
Scott Main
a0fd284e03 docs: dashboard update for 12/1 
Change-Id: If5323832093a90cf151f4103df810281687407d0
 2011-12-01 10:58:14 -08:00
Chet Haase
de5b3a0933 Merge "Protect code in ViewPropertyAnimator from potential null deref" 2011-12-01 10:35:18 -08:00
Gilles Debunne
4fec974c2f am 0433c157: Merge "TextViews keep focus after Done" into ics-mr1 
* commit '0433c157141b9122f6c61498e909770f1db27c7c':
  TextViews keep focus after Done
 2011-12-01 10:24:23 -08:00
Gilles Debunne
d732efa297 am b2aa672f: Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1 
* commit 'b2aa672f24ea0d746f3b96c24e376d5e2c041dc3':
  Revert "IME action (done, next...) correctly handled"
 2011-12-01 10:24:21 -08:00
Andreas Huber
f8ebb32d1f am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1 
* commit '10526a0bfe070ac4d1e550a81ed68be35d261b16':
  Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
 2011-12-01 10:22:19 -08:00
Gilles Debunne
0433c15714 Merge "TextViews keep focus after Done" into ics-mr1 2011-12-01 10:22:15 -08:00
Gilles Debunne
b2aa672f24 Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1 2011-12-01 10:21:59 -08:00
Andreas Huber
10526a0bfe am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1 
* commit '2c2ed7bef931f43dc0701ab723beb0cbed2cb630':
  Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
 2011-12-01 10:20:09 -08:00
Andreas Huber
2c2ed7bef9 Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1 2011-12-01 10:18:19 -08:00
Andreas Huber
1fc2e60d59 Fixes a typo in AVIExtractor that would advertise the wrong video dimensions 
Change-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab
related-to-bug: 5696324
 2011-12-01 10:02:37 -08:00
Robert Greenwalt
89b262990f am c8e643a8: am 22d5d7b6: Merge "Fix state synchronization problem." into ics-mr1 
* commit 'c8e643a86345ef7e2807946107062c9d8635455d':
  Fix state synchronization problem.
 2011-12-01 09:46:14 -08:00
Robert Greenwalt
c8e643a863 am 22d5d7b6: Merge "Fix state synchronization problem." into ics-mr1 
* commit '22d5d7b6e865e36eb3e057bc27d339d56c292d20':
  Fix state synchronization problem.
 2011-12-01 09:44:12 -08:00
Hong Teng
63149c81ad Fixd for 5490443 Native crash while exporting a video 
- Add new onError callback to PreviewProgressListener, which is
used to indicate video editor application for the error that has occurred during
priviewing.
With this modification, the application must implement the onError method,
and then VideoEditorPreviewTest.java is changed accordingly.

Change-Id: I15610b8907fcf8bd35a3c69ad7c07b5175a6e309
 2011-12-01 09:43:42 -08:00
Robert Greenwalt
22d5d7b6e8 Merge "Fix state synchronization problem." into ics-mr1 2011-12-01 09:42:13 -08:00
Gilles Debunne
64901d4eb0 Better handles' visibility test 
Checking if the hotspot position is visible instead
of checking if it is part of the clipped visible rectangle.

Bug 5638710

Patch set 2: synchronize static variables you will.
Patch set 3: renaming and refactored the while loop.
Patch set 4: synchronize you will (again)
Patch set 5: parent

Change-Id: I330510f491c85f910fc61598936113ad07d304e4
 2011-12-01 09:09:09 -08:00
Ben Murdoch
9c8fc9c620 am fc00b6aa: am 90ea4c4d: Merge "Fix crash with HTML5 video." into ics-mr1 
* commit 'fc00b6aac4a5f9222d36b7db5209bca9b63b55d6':
  Fix crash with HTML5 video.
 2011-12-01 09:08:00 -08:00
Kenny Root
ad757e9b36 Fix free_cache to actually work 
This broke with some other path-related changes, so it was scanning for
/data/*/cache instead of /data/data/*/cache

Also remove redundant call to restat

Bug: 5686310
Change-Id: Id1661f0f1337858fc9ead53c56ab7557f421c591
 2011-12-01 09:07:55 -08:00
Ben Murdoch
fc00b6aac4 am 90ea4c4d: Merge "Fix crash with HTML5 video." into ics-mr1 
* commit '90ea4c4d30ccafb51e024ab3c34a4655d06eec4c':
  Fix crash with HTML5 video.
 2011-12-01 09:05:55 -08:00
Ben Murdoch
90ea4c4d30 Merge "Fix crash with HTML5 video." into ics-mr1 2011-12-01 09:03:22 -08:00
Chet Haase
0c6d83cc56 Protect code in ViewPropertyAnimator from potential null deref 
The monkeys threw a NullPointerException in ViewPropertyAnimator, from
calling into a data structure that should have been not null. Not sure what
weird onkey-driven timing issue caused the problem, but protecting the null
deref is easy and safe.

Issue 5626496

Change-Id: I902b510db60a8a85f776f48582ae0326522a9400
 2011-12-01 08:40:05 -08:00
Narayan Kamath
67ae6bc83c Simplify the implementation of AudioPlaybackHandler. 
Now uses a queue of runnables, one per synthesis. Also
introduce an abstraction that wraps AudioTrack that implements
the blocking semantics that we desire.

bug:5680699

Change-Id: I34a1248ff05766a7d9b3002055fb5b24aa9f230b
 2011-12-01 16:30:26 +00:00
The Android Automerger
74bdd8ba05 merge in ics-mr1-release history after reset to ics-mr1 2011-12-01 06:46:19 -08:00
Daniel Sandler
d2a28b3ee0 am 859bc015: (-s ours) am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1 
* commit '859bc0153e37a7eb65216c0a5f7ea46f5559b453':
  Put screensavers back in the icebox for now. DO NOT MERGE.
 2011-12-01 06:33:07 -08:00
Daniel Sandler
859bc0153e am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1 
* commit '2a40d0d92b208021b492e9af3d944720cbf269fc':
  Put screensavers back in the icebox for now. DO NOT MERGE.
 2011-12-01 06:31:09 -08:00
Daniel Sandler
2a40d0d92b Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1 2011-12-01 06:29:53 -08:00
Ben Murdoch
d3f18b805e Fix crash with HTML5 video. 
Add missing check for native HTTP stack inside
CookieManager.getCookie(WebAddress) and
CookieManager.setCookie(WebAddress) - private APIs that now
will throw an exception as the legacy cookie table no longer
exists with WebViewDatabase version 11.

Bug: 5690908
Change-Id: I51ae848d03b04d6021d314dda4a199675e38ab02
 2011-12-01 13:43:41 +00:00
Bart Sears
51340e0fb7 am 5a4e807a: am 41a5774a: Merge "fix position of WebTextView on scrolling layers" into ics-mr1 
* commit '5a4e807af8661d35e27157fa224a8e4db0e66f7c':
  fix position of WebTextView on scrolling layers
 2011-11-30 22:33:24 -08:00
Bart Sears
5a4e807af8 am 41a5774a: Merge "fix position of WebTextView on scrolling layers" into ics-mr1 
* commit '41a5774a99215025628b83db54c45f84b876678e':
  fix position of WebTextView on scrolling layers
 2011-11-30 22:31:08 -08:00
Bart Sears
41a5774a99 Merge "fix position of WebTextView on scrolling layers" into ics-mr1 2011-11-30 22:29:16 -08:00
Adam Cohen
bd573a3813 am 2a163f61: am 557a1772: Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)" into ics-mr1 
* commit '2a163f6171c06d9bbee9ce49fad478336210d37d':
  Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)
 2011-11-30 21:14:53 -08:00
Adam Cohen
2a163f6171 am 557a1772: Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)" into ics-mr1 
* commit '557a1772f676480da75fff81ff38d6e896fce0a2':
  Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)
 2011-11-30 21:13:04 -08:00
Adam Cohen
557a1772f6 Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)" into ics-mr1 2011-11-30 21:10:27 -08:00
Dianne Hackborn
4d774e0ac2 am f5fd08d6: am a1240184: Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1 
* commit 'f5fd08d64959f23ba87f4da4771ca511b05a6be0':
  Fix issue #5433192 and maybe #5433192
 2011-11-30 20:53:33 -08:00
Dianne Hackborn
f5fd08d649 am a1240184: Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1 
* commit 'a1240184efd1d4391540a6e3e9cae50d56d05cb2':
  Fix issue #5433192 and maybe #5433192
 2011-11-30 20:50:57 -08:00