ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
40,971 Commits 2 Branches 0 Tags 54 MiB
4738b8bee0
Commit Graph

40971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
4738b8bee0 am 510180f1: am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1 
* commit '510180f162dee3ae5416a98caa07f58a754f4b3f':
  Add support for retrieving location information in mp4/3gpp files
 2011-11-11 15:34:21 +00:00
Akwasi Boateng
fea0c08ea5 am cb0db030: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp 
* commit 'cb0db0306b5849a35d3d99eea1b34ce019c6f0d8':
  Make the overridden ImageView#setVisibility remotable
  Clamp non-monotonic stats instead of dropping.
  DO NOT MERGE. Fix leak in LayoutTransition
  Fix lastVisible/global rects
  Fix Wimax-less build.
  Fix leak in LayoutTransition
  Deferring wallpaper update to improve workspace scrolling (issue 5506959)
  Terminate EGL when an app goes in the background
  boot animation is dithered and scaled
  Fix NdefRecord byte-stream constructor.
  PopupWindow dismiss() can get into a recursive loop.
  Fold WiMAX state into the mobile RSSI.
  Remove dedicated wimax icon to fix RSSI layout.
 2011-11-11 15:34:19 +00:00
Jamie Gennis
147a91395b am 0c71e5ed: am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0 
* commit '0c71e5ed820350a4ae0517dc73d1f46cd3534b55':
  SystemUI: Disable HW acceleration for status bar
 2011-11-11 15:34:19 +00:00
James Dong
e23eb3e23f am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1 
* commit '08e42967b9e459b7beb22e859f1f1eba0546741b':
  Add support for retrieving location information in mp4/3gpp files
 2011-11-11 15:28:32 +00:00
Akwasi Boateng
19353c4193 Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp 2011-11-11 15:20:20 +00:00
Svetoslav Ganov
5965359aef am d00e75e9: am 7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0 
* commit 'd00e75e94d1aa5cee740a06a4ce760e49016f7f6':
  PopupWindow dismiss() can get into a recursive loop.
 2011-11-11 15:12:58 +00:00
Chet Haase
b8ed17f5f1 am ab51626f: am 30f03ac6: (-s ours) DO NOT MERGE. Fix leak in LayoutTransition 
* commit 'ab51626f22259e27ef376cbbc1d127524a57459d':
  DO NOT MERGE. Fix leak in LayoutTransition
 2011-11-11 15:12:56 +00:00
Jamie Gennis
509ec438cf am 787e2c27: am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0 
* commit '787e2c276a5645ffbaddc5c23f4deb66d182e80d':
  SystemUI: Disable HW acceleration for status bar
 2011-11-11 15:12:55 +00:00
Jeff Sharkey
6a025c40de am 51c00a57: Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1 
* commit '51c00a57f4f956b4b0ce9562fa571b475ee6f6ae':
  Clamp non-monotonic stats instead of dropping.
 2011-11-11 15:12:51 +00:00
Daniel Sandler
d9887d464d am 992e77af: Merge "Fold WiMAX state into the mobile RSSI." into ics-mr1 
* commit '992e77af1168ddce232b9b7702d01e5ccc7a249b':
  Fold WiMAX state into the mobile RSSI.
 2011-11-11 15:12:49 +00:00
Daniel Sandler
f150b45d11 am 8b50bd8c: Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1 
* commit '8b50bd8c9ba594e2516014fcc4b950b8deb36312':
  Remove dedicated wimax icon to fix RSSI layout.
 2011-11-11 15:12:48 +00:00
Adam Powell
d43a2ef564 am 0ddcad0b: Merge "Make the overridden ImageView#setVisibility remotable" into ics-mr1 
* commit '0ddcad0b4e203fe56aeca74547b13f6063ccb13b':
  Make the overridden ImageView#setVisibility remotable
 2011-11-11 15:12:46 +00:00
Adam Cohen
9e9ac8c334 am d562d300: Merge "Deferring wallpaper update to improve workspace scrolling (issue 5506959)" into ics-mr1 
* commit 'd562d300cde63ae023f09fc3c7ded0988dead5d1':
  Deferring wallpaper update to improve workspace scrolling (issue 5506959)
 2011-11-11 15:12:45 +00:00
John Reck
571668ac49 am 9490fe40: Merge "Fix lastVisible/global rects" into ics-mr1 
* commit '9490fe4095171b9af380812b895101f8142d3cd5':
  Fix lastVisible/global rects
 2011-11-11 15:12:41 +00:00
Martijn Coenen
86f9d8af31 am 99898de9: Merge "Fix NdefRecord byte-stream constructor." into ics-mr1 
* commit '99898de902c36687be126b33ee8a4858d26871ac':
  Fix NdefRecord byte-stream constructor.
 2011-11-11 15:12:36 +00:00
Chet Haase
7ea9cec879 am 692fda9d: Merge "Fix leak in LayoutTransition" into ics-mr1 
* commit '692fda9da31e2a25fd295140ec0d8b6cd0a934ee':
  Fix leak in LayoutTransition
 2011-11-11 15:12:35 +00:00
Robert Greenwalt
bd6f283b2a am 7c9f8005: Merge "Fix Wimax-less build." into ics-mr1 
* commit '7c9f8005e20af0bb741e36d8239f301371ba5f7f':
  Fix Wimax-less build.
 2011-11-11 15:12:33 +00:00
Romain Guy
07432365ce am 50a66f0e: Merge "Terminate EGL when an app goes in the background" into ics-mr1 
* commit '50a66f0e9c5a85a6af4a99eb66656a69eba24572':
  Terminate EGL when an app goes in the background
 2011-11-11 15:12:31 +00:00
Mathias Agopian
87e69f0aba am de62d9cb: Merge "boot animation is dithered and scaled" into ics-mr1 
* commit 'de62d9cbe00d0fcac24af9a3d89ba7a125e56eaa':
  boot animation is dithered and scaled
 2011-11-11 15:12:28 +00:00
Jamie Gennis
ad9bb6df07 am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0 
* commit 'ca5c881374d051361eb5f9a191d51b5716ef2366':
  SystemUI: Disable HW acceleration for status bar
 2011-11-11 14:46:21 +00:00
James Dong
714fb46074 Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1 2011-11-11 01:44:06 -08:00
Svetoslav Ganov
aefd78ef93 am 7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0 
* commit '7b8bec280f20e8a5863d8214bbc195497335eba6':
  PopupWindow dismiss() can get into a recursive loop.
 2011-11-11 08:02:27 +00:00
Chet Haase
131f20c4cf am 30f03ac6: (-s ours) DO NOT MERGE. Fix leak in LayoutTransition 
* commit '30f03ac650f2ffaafe9cc49942a4a8a7858dbd88':
  DO NOT MERGE. Fix leak in LayoutTransition
 2011-11-11 08:02:27 +00:00
Jamie Gennis
255d499dec am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0 
* commit 'ca5c881374d051361eb5f9a191d51b5716ef2366':
  SystemUI: Disable HW acceleration for status bar
 2011-11-11 08:02:26 +00:00
Svetoslav Ganov
3e3f24f8e3 Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0 2011-11-11 00:00:02 -08:00
Jeff Sharkey
a162bb66c6 Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1 2011-11-10 20:31:03 -08:00
Daniel Sandler
1e89f681d1 Merge "Fold WiMAX state into the mobile RSSI." into ics-mr1 2011-11-10 20:16:47 -08:00
Daniel Sandler
d8423837ea Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1 2011-11-10 20:16:38 -08:00
Adam Powell
e50cb437f5 Merge "Make the overridden ImageView#setVisibility remotable" into ics-mr1 2011-11-10 19:56:03 -08:00
Adam Cohen
f9f56a90aa Merge "Deferring wallpaper update to improve workspace scrolling (issue 5506959)" into ics-mr1 2011-11-10 19:27:58 -08:00
John Reck
4a5f7a4de3 Merge "Fix lastVisible/global rects" into ics-mr1 2011-11-10 17:58:27 -08:00
Martijn Coenen
e87dd1ae87 Merge "Fix NdefRecord byte-stream constructor." into ics-mr1 2011-11-10 17:40:20 -08:00
Chet Haase
5fc70b4d6d Merge "Fix leak in LayoutTransition" into ics-mr1 2011-11-10 17:33:31 -08:00
Robert Greenwalt
ed91a59dbe Merge "Fix Wimax-less build." into ics-mr1 2011-11-10 17:22:14 -08:00
Romain Guy
c58b9999e1 Merge "Terminate EGL when an app goes in the background" into ics-mr1 2011-11-10 17:10:41 -08:00
Romain Guy
4725e2ca80 Terminate EGL when an app goes in the background 
This does not happen on high end gfx devices. This happens
only if only one EGL context is initialized in the current
process.

Change-Id: Ibd1737efdf84eef8a84108b05795440d1ae9964e
 2011-11-10 16:44:49 -08:00
Mathias Agopian
6bb9013ea2 Merge "boot animation is dithered and scaled" into ics-mr1 2011-11-10 16:38:42 -08:00
James Dong
2ba4e4d8a3 Merge "Adds handler type 'sbtl' to support subtitles in various containers." 2011-11-10 16:14:56 -08:00
Stephen Hines
f7d898e4df Merge "Fix setTimeZone() and use it properly in RSTest/rstime." 2011-11-10 16:09:29 -08:00
Jamie Gennis
a371380db0 Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0 2011-11-10 16:06:12 -08:00
Glenn Kasten
10a526d053 Merge "Fix log message" 2011-11-10 15:14:12 -08:00
Romain Guy
41ef83cc6f am f1062114: am a3cc20ff: Merge "Initialize egl_cache with an app writeable file" into ics-mr1 
* commit 'f1062114874f1cf46de479031d9ad3ad3cae1131':
  Initialize egl_cache with an app writeable file
 2011-11-10 23:06:29 +00:00
Romain Guy
de25e3a977 am a3cc20ff: Merge "Initialize egl_cache with an app writeable file" into ics-mr1 
* commit 'a3cc20fff073bd3ca588f1e61f0f7034aecf3ebb':
  Initialize egl_cache with an app writeable file
 2011-11-10 23:03:45 +00:00
Romain Guy
97e78957ae Merge "Initialize egl_cache with an app writeable file" into ics-mr1 2011-11-10 15:02:07 -08:00
The Android Open Source Project
9146e0a32f Reconcile with ics-mr1-release 
Change-Id: I86cac837a23dff6367af0e69d07ad3983845ff1e
 2011-11-10 14:53:51 -08:00
Jeff Brown
ffe281cef9 am 71ed608e: am 88089ccc: Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1 
* commit '71ed608ea7cfb349bba06c5f6bb17b525a4fd964':
  Wake on volume key when in dock. Bug: 5580373
 2011-11-10 22:50:19 +00:00
Peter Ng
421f3ac7e0 am f52df796: am 15843aa5: Merge "lock pattern width spec set to max" into ics-mr1 
* commit 'f52df7961f29a2f508fb7421f8cd9c95b9b409aa':
  lock pattern width spec set to max
 2011-11-10 22:50:16 +00:00
Jeff Brown
46fd7f769a am 88089ccc: Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1 
* commit '88089ccc79ee7ba5f48ade9bb73a99cf05f6ec62':
  Wake on volume key when in dock. Bug: 5580373
 2011-11-10 22:42:49 +00:00
Jeff Brown
6d751cea72 Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1 2011-11-10 14:40:48 -08:00
The Android Open Source Project
a73769f296 Reconcile with ics-mr0-release 
Change-Id: I16a4177148eb8ce12f14af9628c9f5143ba0b836
 2011-11-10 14:35:36 -08:00