Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,941 Commits 3 Branches 0 Tags
42e4ecc7277bb568971c701e14ac2f97da7b4d02
Commit Graph

61941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Scott Main
8f3993b12b Merge "docs: dashboard update for 12/1" into ics-mr0 2011-12-01 11:53:17 -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
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
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
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
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
Robert Greenwalt
22d5d7b6e8 Merge "Fix state synchronization problem." into ics-mr1 2011-12-01 09:42:13 -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
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
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
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
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
Dianne Hackborn
a1240184ef Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1 2011-11-30 20:49:21 -08:00
Dianne Hackborn
e0f085d4b8 Fix issue #5433192 and maybe #5433192 
5433192: Factory reset device: compatibility screen is the first...
...screen before setup wizard

Don't show compat mode dialog if compat mode is unknown (which happens
early in boot before an activity is shown for example).  Also make sure
to update status any time the current focus app token changes, so we
correctly update every time switching apps.

5651152 [Stingray] change zoom/strech setting icon won't go away

This is probably also fixed by updating when the app token changes.

Change-Id: Ibe9bd6277166230d5d96689741b78325ea099d57
 2011-11-30 18:41:15 -08:00
satok
b7dda6d34b am b94a7fb3: Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1 
* commit 'b94a7fb3d7483e8b47e4f0229fc7abff10a6572d':
  Fix ConcurrentModificationException in TextServicesManagerService
 2011-11-30 17:39:12 -08:00
satok
b94a7fb3d7 Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1 2011-11-30 17:37:52 -08:00
Winson Chung
7cef80fd39 Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357) 
Change-Id: Ide1822e19045f093c0c1c088839caa5cc8aea287
 2011-11-30 17:34:25 -08:00
Svetoslav Ganov
26f7a81f40 am d8ec8db5: Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1 
* commit 'd8ec8db5e0f227e4f63e948acb78d829f5ad30c8':
  Fixing memory leaks in the accessiiblity layer.
 2011-11-30 16:59:46 -08:00
Svetoslav Ganov
d8ec8db5e0 Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1 2011-11-30 16:56:41 -08:00
Michael Kolb
5da91bd674 fix position of WebTextView on scrolling layers 
Bug: 5677828

    depends on CL: 152845

Change-Id: Ia6fce3ef64954d99fe044e801d7f083055c8b880
 2011-11-30 16:15:18 -08:00
Gilles Debunne
647944897f TextViews keep focus after Done 
Otherwise the ViewRoot tries to focus something else and as a result
it will scroll back to the top of a form with many fields, which is
annoying.

Change-Id: I1de10f76fe4b82bc4097fc13c629450d6f999fd0
 2011-11-30 15:45:30 -08:00
Gilles Debunne
8bfcd133a2 Revert "IME action (done, next...) correctly handled" 
This reverts commit efbad5fb90.
 2011-11-30 15:40:28 -08:00
Amith Yamasani
2b0acc90ae No clicking on volume icon in volume dialog. 
Don't disable volume slider when it hits zero.
Show correct icon for Silent mode in Power menu.

Bug: 5586083
Change-Id: Iaa957fc08e314e0de1c007dfc967a1d960080aab
 2011-11-30 15:28:43 -08:00
Robert Greenwalt
645c80654f Fix state synchronization problem. 
Don't report that we're disconnected immediately if we're disconnecting when another
disconnect comes in.  Remove this behavior from the default handler and add a catch
all "yeah, we're disconnected already" to the inactive state.

bug:5568633
Change-Id: Iff7ccde2069b47f8ad8255f3bca0292b80041388
 2011-11-30 15:07:30 -08:00
Dianne Hackborn
2fc9467e9a am 88f10c6c: Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1 
* commit '88f10c6ce5a97b1990934148deb8ed6aa6ef7a48':
  Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?
 2011-11-30 14:15:55 -08:00
Dianne Hackborn
a5b8883b0d am f8d20bd6: Merge "Turn off debug log." into ics-mr1 
* commit 'f8d20bd6495883e98e23827a2e5ed03766fe483b':
  Turn off debug log.
 2011-11-30 14:13:42 -08:00
Dianne Hackborn
88f10c6ce5 Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1 2011-11-30 14:12:44 -08:00
Dianne Hackborn
f8d20bd649 Merge "Turn off debug log." into ics-mr1 2011-11-30 14:11:17 -08:00
Romain Guy
937925f569 am 7797cae2: Merge "Cache drawable constant states instead of drawables Bug #5678369" into ics-mr1 
* commit '7797cae2564eccf6d817b06d8116bd9cdc8e9ed4':
  Cache drawable constant states instead of drawables Bug #5678369
 2011-11-30 14:09:21 -08:00
Romain Guy
7797cae256 Merge "Cache drawable constant states instead of drawables Bug #5678369" into ics-mr1 2011-11-30 14:07:34 -08:00
Mathias Agopian
e2970700e9 am e8ba2aba: Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1 
* commit 'e8ba2aba934e3767d2081007bba93bad68566d22':
  add a way to access the version string of the h/w implementation of EGL
 2011-11-30 13:54:46 -08:00
Mathias Agopian
e8ba2aba93 Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1 2011-11-30 13:52:21 -08:00
Daniel Sandler
d2b22a885a Put screensavers back in the icebox for now. DO NOT MERGE. 
Bug: 5689684
Change-Id: I3a5291c3520bb43e35d55714f1522e4ae7f6e63c
 2011-11-30 15:47:36 -05:00
Daniel Sandler
7413d49bfa am 865b9802: Merge "Expanding NotificationManager\'s event logging." into ics-mr1 
* commit '865b98024fb5fa21854feb578b8816bbb72120ba':
  Expanding NotificationManager's event logging.
 2011-11-30 11:55:50 -08:00