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

60514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Gennis
fc62a3fda1 am f3292716: am 3780d380: Merge "SurfaceFlinger: fix the transform hint" into ics-factoryrom 
* commit 'f3292716b758b51d3849b3eb021eb176e78ea720':
  SurfaceFlinger: fix the transform hint
 2011-09-26 19:47:37 -07:00
Eric Fischer
7c44a16458 am a7717750: (-s ours) am 622abb73: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 
* commit 'a7717750227ddd5829161a3e4476c1fb0de3d2ad':
  Import revised translations. DO NOT MERGE
 2011-09-26 19:47:35 -07:00
Jamie Gennis
f3292716b7 am 3780d380: Merge "SurfaceFlinger: fix the transform hint" into ics-factoryrom 
* commit '3780d38010f50ccce508871058d54c1921936e0c':
  SurfaceFlinger: fix the transform hint
 2011-09-26 19:44:41 -07:00
Eric Fischer
a771775022 am 622abb73: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 
* commit '622abb73a9fa8253679de1ac22bca66ab055eef8':
  Import revised translations. DO NOT MERGE
 2011-09-26 19:44:28 -07:00
Peter Ng
8f013de5fc am 90ac4934: Merge "Transparent lockscreen green indicator icons in a step to remove them fully from pattern unlock" 
* commit '90ac4934c8c0d7c0febfa9f4fb30c5cb0334c9d8':
  Transparent lockscreen green indicator icons in a step to remove them fully from pattern unlock
 2011-09-26 19:29:05 -07:00
Peter Ng
90ac4934c8 Merge "Transparent lockscreen green indicator icons in a step to remove them fully from pattern unlock" 2011-09-26 19:27:07 -07:00
Chia-chi Yeh
54e24a9fc9 am 9d1c1835: Merge "VpnDialogs: revise UI layout." 
* commit '9d1c1835035222856a76d61a9c3edf8ce65207e4':
  VpnDialogs: revise UI layout.
 2011-09-26 19:18:16 -07:00
Christopher Tate
91268bf6b8 am 84da4e47: Merge "Use the new INSTALL_FROM_ADB Package Manager flag..." 
* commit '84da4e47e723bd27165da8dff735bd508e909610':
  Use the new INSTALL_FROM_ADB Package Manager flag...
 2011-09-26 19:18:00 -07:00
Peter Ng
4a5fe79336 am e7b40904: Merge "Vpn icon updated to a flat key and wifi updated to a two tone graphic" 
* commit 'e7b40904be006d1c79776942a9050aace43ac044':
  Vpn icon updated to a flat key and wifi updated to a two tone graphic
 2011-09-26 19:17:58 -07:00
Romain Guy
d44413fb1e am 1867a3cd: Merge "Do not blend opaque windows." 
* commit '1867a3cde6411cfa27d0339c973d94fe0287d1a8':
  Do not blend opaque windows.
 2011-09-26 19:17:49 -07:00
Mathias Agopian
0c3541a614 am 6098a216: Merge "Region cannot handle malformed Rects. Abort the Region op in that case." 
* commit '6098a2162a9dc0c315c2b524d1643c0e16daa940':
  Region cannot handle malformed Rects. Abort the Region op in that case.
 2011-09-26 19:17:42 -07:00
Jeff Sharkey
516e760ffa am ba8dea03: Merge "Overlay to configure data usage network types." 
* commit 'ba8dea03f3494abf87885469d53634d416bc860a':
  Overlay to configure data usage network types.
 2011-09-26 19:17:09 -07:00
Peter Ng
0a09207a22 Transparent lockscreen green indicator icons in a step to remove them fully from pattern unlock 
Bug: 5136097
Change-Id: I0bfcd2e8806161d816b3cc9248775accdcc457af
 2011-09-26 18:18:04 -07:00
Chia-chi Yeh
9d1c183503 Merge "VpnDialogs: revise UI layout." 2011-09-26 17:29:38 -07:00
Christopher Tate
84da4e47e7 Merge "Use the new INSTALL_FROM_ADB Package Manager flag..." 2011-09-26 17:12:01 -07:00
Peter Ng
e7b40904be Merge "Vpn icon updated to a flat key and wifi updated to a two tone graphic" 2011-09-26 17:02:06 -07:00
Peter Ng
51be3b2ed9 Vpn icon updated to a flat key and wifi updated to a two tone graphic 
Bug: 5155775
Change-Id: I302fa857185761c408a26b7360ab0db48e72642d
 2011-09-26 16:41:58 -07:00
Christopher Tate
ab63aa87c1 Use the new INSTALL_FROM_ADB Package Manager flag... 
...when installing an apk in the course of an 'adb restore' operation.

Fixes bug 5374597.

Change-Id: I8ddce0e015e3bab79432e82709d841887667c346
 2011-09-26 16:30:30 -07:00
Romain Guy
1867a3cde6 Merge "Do not blend opaque windows." 2011-09-26 16:13:01 -07:00
Mathias Agopian
6098a2162a Merge "Region cannot handle malformed Rects. Abort the Region op in that case." 2011-09-26 16:10:08 -07:00
Romain Guy
4941dea00a Do not blend opaque windows. 
This change ensures the wallpaper is rendered into an opaque surface
which avoids a glClear() in SurfaceFlinger. This should save quite
a bit of work on every frame when panning the workspace in launcher.

Change-Id: I9c1b8c324edf29826d5dbb1fb39d883e43375310
 2011-09-26 16:08:14 -07:00
Mathias Agopian
0ee06d116b Region cannot handle malformed Rects. Abort the Region op in that case. 
Bug: 5331198, 5334829
Change-Id: Ib1fdbf6fb291e7f1191ccfe16b5ff29d73e7a474
 2011-09-26 15:58:20 -07:00
Jeff Sharkey
ba8dea03f3 Merge "Overlay to configure data usage network types." 2011-09-26 15:34:06 -07:00
Jamie Gennis
3780d38010 Merge "SurfaceFlinger: fix the transform hint" into ics-factoryrom 2011-09-26 15:09:15 -07:00
Chia-chi Yeh
72fddaa5d9 VpnDialogs: revise UI layout. 
Also hide statistics when they are not available.

Bug: 5372746
Change-Id: Iceffc8732cd51461630127f4fd17d505bc8b05aa
 2011-09-26 15:07:49 -07:00
Justin Ho
ecc9afa524 am ece1d320: Merge "Fixed alignment on home icon Bug: 5348452" 
* commit 'ece1d32012c86d9327af8e2b51226715f1ce84e5':
  Fixed alignment on home icon Bug: 5348452
 2011-09-26 14:59:43 -07:00
Justin Ho
ece1d32012 Merge "Fixed alignment on home icon Bug: 5348452" 2011-09-26 14:57:56 -07:00
Eric Fischer
622abb73a9 Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 2011-09-26 14:55:58 -07:00
Eric Fischer
334c39be25 Import revised translations. DO NOT MERGE 
Change-Id: I3b5544d4e5739d08d1c3c6cc59dafe89de3b92c0
 2011-09-26 14:49:06 -07:00
Chet Haase
63c3ffac6b am f425ca97: Merge "Fix display list issue that was crashing an external app." 
* commit 'f425ca9772d5f722fc9a2569b474eb880fd89569':
  Fix display list issue that was crashing an external app.
 2011-09-26 14:48:20 -07:00
Chet Haase
f425ca9772 Merge "Fix display list issue that was crashing an external app." 2011-09-26 14:46:19 -07:00
Justin Ho
2e8e57eb3f Fixed alignment on home icon 
Bug: 5348452

Change-Id: I14fe5d27a7e9b6c1f9c9924cbcc30f9202dafa44
 2011-09-26 14:46:06 -07:00
Chet Haase
6e6db61809 Fix display list issue that was crashing an external app. 
The app was removing a View whilst in its onDraw() method. This meant
that we asked it for its display list and it invalidated that display list
(by removing itself) before it returned from onDraw(). We later attempted to
draw that invalid display list into its parent nad died in native code.

The fix is to check the state of the display list after the call to getDisplayList()
and to avoid doing further work with it if it's invalid.

Change-Id: I14a342b4fe79c8dce2626ff61237b447040e7f42
 2011-09-26 14:32:26 -07:00
Gilles Debunne
a61fd5eb71 am 52edaa9c: Merge "Bug 5250788: TextView gets slower as the text length grows" 
* commit '52edaa9cfb612bd20b0f718dc95e576f55d9367e':
  Bug 5250788: TextView gets slower as the text length grows
 2011-09-26 14:20:56 -07:00
Gilles Debunne
52edaa9cfb Merge "Bug 5250788: TextView gets slower as the text length grows" 2011-09-26 14:18:14 -07:00
Daniel Sandler
e213afdbcc am 71bfec44: am 61b645ab: Merge "Update all RSSIs whenever the connectivity changes." into ics-factoryrom 
* commit '71bfec448847d8585c8a789596525dc729350877':
  Update all RSSIs whenever the connectivity changes.
 2011-09-26 12:41:24 -07:00
Daniel Sandler
71bfec4488 am 61b645ab: Merge "Update all RSSIs whenever the connectivity changes." into ics-factoryrom 
* commit '61b645ab86ace1511593f1f1f46dfb62bf0ae8b9':
  Update all RSSIs whenever the connectivity changes.
 2011-09-26 12:39:01 -07:00
Daniel Sandler
61b645ab86 Merge "Update all RSSIs whenever the connectivity changes." into ics-factoryrom 2011-09-26 12:37:29 -07:00
Fabrice Di Meglio
98db742abc am 8013290d: Merge "Fix bug #5366547 TruncateAt.MARQUEE should be replaces with "two dot" ellipsis on hardware that dont support MARQUEE" 
* commit '8013290dd0e9d3eabc3611d7eca47aa50bdceed0':
  Fix bug #5366547 TruncateAt.MARQUEE should be replaces with "two dot" ellipsis on hardware that dont support MARQUEE
 2011-09-26 12:19:10 -07:00
Fabrice Di Meglio
4dad016de3 am 8eb34ed8: Merge "Fix bug #5344067 android.text.DynamicLayout.sStaticLayout can hold onto an Activity, potential memory leak" 
* commit '8eb34ed88cdc43408bb73a806d6e998782d5c9b9':
  Fix bug #5344067 android.text.DynamicLayout.sStaticLayout can hold onto an Activity, potential memory leak
 2011-09-26 12:19:08 -07:00
Fabrice Di Meglio
8013290dd0 Merge "Fix bug #5366547 TruncateAt.MARQUEE should be replaces with "two dot" ellipsis on hardware that dont support MARQUEE" 2011-09-26 12:16:41 -07:00
Fabrice Di Meglio
8eb34ed88c Merge "Fix bug #5344067 android.text.DynamicLayout.sStaticLayout can hold onto an Activity, potential memory leak" 2011-09-26 12:16:30 -07:00
The Android Open Source Project
0660e50294 am 4da465a0: Reconcile with ics-factoryrom-release 
* commit '4da465a056f7a7322a5a4a0f235fe20e525a6eae':
  Don't crash during full backup when CheckJNI is enabled
 2011-09-26 12:13:33 -07:00
The Android Open Source Project
4da465a056 Reconcile with ics-factoryrom-release 
Change-Id: I4096cbbfd0bae1f7c08c9731f522529d3895d2d8
 2011-09-26 12:11:29 -07:00
Ben Komalo
8725bb592e am 8154495f: am 69a6d537: Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom 
* commit '8154495fc7b09938709ded2d07e8f9419cc94be7':
  Enter minimal boot mode when booting encrypted
 2011-09-26 12:05:15 -07:00
Ben Komalo
8154495fc7 am 69a6d537: Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom 
* commit '69a6d537e6f29683f685ecb688f0b06b1c0b2b15':
  Enter minimal boot mode when booting encrypted
 2011-09-26 12:02:19 -07:00
Ben Komalo
69a6d537e6 Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom 2011-09-26 12:01:01 -07:00
Jason Sams
dca3baebf2 am d1a2f36b: Merge "Remove unused fields in ProgramRaster" 
* commit 'd1a2f36b834534f422a17fc2324f5af839f29862':
  Remove unused fields in ProgramRaster
 2011-09-26 11:58:45 -07:00
Jason Sams
d1a2f36b83 Merge "Remove unused fields in ProgramRaster" 2011-09-26 11:57:41 -07:00
Andreas Huber
b1b8d56b75 am d359b575: Merge "Properly connect to surface flinger in our shell tools" 
* commit 'd359b575f7cc0ac36caacf7bbdcaef3394830a25':
  Properly connect to surface flinger in our shell tools
 2011-09-26 11:28:19 -07:00